[SCM] Debian packaging for swt-gtk. branch, master, updated. debian/3.4.2-3-16-g6a0e829
Adrian Perez
adrianperez-guest at alioth.debian.org
Wed Dec 2 19:06:13 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Debian packaging for swt-gtk.".
The branch, master has been updated
via 6a0e829256e04e6a92a314a338483018952bb5fa (commit)
via 138697bde85a4158c5d106ae3c0d0d4aa2dda78b (commit)
via 0a3f850e24cad4b963bd8f17cc5d61fc84281088 (commit)
via c42f87ee85a11abe7dd41c70adcd530359ff2d77 (commit)
via 59f29b2bbc6b37817160250e769a43452915d9f4 (commit)
via 956cc169874e0cfc969b3230d5a3a21c7db5b3f7 (commit)
via 7f1db9c0e35a3581d0f38a46d353b23ab21e0799 (commit)
via 9ad52cbcbae2128160977b1ea83aa9bf981953e1 (commit)
via 360b0fdb9e44d0a05195d26854a3c820627098b3 (commit)
via 1e55d56bee30949021c5fc9e1cd3d60aa029dd54 (commit)
via 3ad58a8e4e7fd46167d681324fea6fe9018aa9b5 (commit)
via eec95a127b43eb9a8456d23822de84fc6ffe1690 (commit)
via d179ae3d6edec569ca110434e94a0e6ac50e1c62 (commit)
via 41711a1a99367d5b26cc7f07064949fc45b59adc (commit)
via a0edaa509c59af296334bec1182c39d2f7c3670a (commit)
from 0106a62ed0208ceae353e7e90e4825951f0593ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6a0e829256e04e6a92a314a338483018952bb5fa
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Wed Dec 2 13:33:59 2009 -0500
Refresh 64-bits patch again
commit 138697bde85a4158c5d106ae3c0d0d4aa2dda78b
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Nov 30 23:19:20 2009 -0500
debian/changelog: Prepare snapshot
commit 0a3f850e24cad4b963bd8f17cc5d61fc84281088
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Tue Oct 27 12:13:13 2009 -0500
Fix default-java path
commit c42f87ee85a11abe7dd41c70adcd530359ff2d77
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Tue Oct 27 11:43:32 2009 -0500
Refresh makefile patch
commit 59f29b2bbc6b37817160250e769a43452915d9f4
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Tue Oct 27 11:23:02 2009 -0500
Update changelog
commit 956cc169874e0cfc969b3230d5a3a21c7db5b3f7
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Tue Oct 27 11:20:31 2009 -0500
Refresh 64 bits patch
commit 7f1db9c0e35a3581d0f38a46d353b23ab21e0799
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:52:53 2009 -0500
Update debian/copyright. TODO: check triple-licensing
commit 9ad52cbcbae2128160977b1ea83aa9bf981953e1
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:42:03 2009 -0500
Update inter-package dependencies in debian/control
commit 360b0fdb9e44d0a05195d26854a3c820627098b3
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:39:28 2009 -0500
Update RELEASE in debian/Makefile
commit 1e55d56bee30949021c5fc9e1cd3d60aa029dd54
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:38:42 2009 -0500
Update alternatives
commit 3ad58a8e4e7fd46167d681324fea6fe9018aa9b5
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:36:23 2009 -0500
Rename files under debian for new version
commit eec95a127b43eb9a8456d23822de84fc6ffe1690
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:30:23 2009 -0500
Bump binary package versions in name
commit d179ae3d6edec569ca110434e94a0e6ac50e1c62
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:29:22 2009 -0500
Add new release to changelog
commit 41711a1a99367d5b26cc7f07064949fc45b59adc
Merge: 0106a62ed0208ceae353e7e90e4825951f0593ab a0edaa509c59af296334bec1182c39d2f7c3670a
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:26:50 2009 -0500
Merge commit 'upstream/3.5.1'
commit a0edaa509c59af296334bec1182c39d2f7c3670a
Author: Adrian Perez <adrianperez.deb at gmail.com>
Date: Mon Oct 26 18:26:47 2009 -0500
Imported Upstream version 3.5.1
-----------------------------------------------------------------------
Summary of changes:
about.html | 13 +
atk.c | 495 +-
atk_stats.c | 86 +-
atk_stats.h | 86 +-
atk_structs.c | 464 +-
atk_structs.h | 2 +-
build.sh | 32 +-
build.xml | 10 +
c.c | 317 +-
c_stats.c | 70 +-
c_stats.h | 70 +-
c_structs.c | 2 +-
c_structs.h | 2 +-
cairo.c | 456 +-
cairo.h | 2 +-
cairo_custom.h | 2 +-
cairo_stats.c | 14 +-
cairo_stats.h | 14 +-
cairo_structs.c | 8 +-
cairo_structs.h | 2 +-
callback.c | 394 +-
callback.h | 6 +-
cde.c | 70 +-
cde_stats.c | 2 +-
cde_stats.h | 2 +-
cde_structs.c | 8 +-
cde_structs.h | 2 +-
debian/Makefile | 2 +-
debian/changelog | 11 +
debian/control | 29 +-
debian/copyright | 5 +
.../{libswt-gtk-3.4-java => libswt-gtk-3.5-java} | 0
...ni.install => libswt-cairo-gtk-3.5-jni.install} | 0
...-jni.install => libswt-glx-gtk-3.5-jni.install} | 0
...ni.install => libswt-gnome-gtk-3.5-jni.install} | 0
....4-java.install => libswt-gtk-3.5-java.install} | 0
...-java.postinst => libswt-gtk-3.5-java.postinst} | 8 +-
...tk-3.4-java.prerm => libswt-gtk-3.5-java.prerm} | 6 +-
...-3.4-jni.install => libswt-gtk-3.5-jni.install} | 0
....install => libswt-mozilla-gtk-3.5-jni.install} | 0
debian/patches/64/{arch64.diff => x86_64.diff} |50791 ++++++--------------
debian/patches/common/01-make_linux.patch | 48 +-
debian/rules | 2 +-
glx.c | 82 +-
glx_stats.c | 2 +-
glx_stats.h | 2 +-
glx_structs.c | 8 +-
glx_structs.h | 2 +-
gnome.c | 147 +-
gnome_stats.c | 2 +-
gnome_stats.h | 2 +-
gnome_structs.c | 26 +-
gnome_structs.h | 2 +-
make_common.mak | 6 +-
make_linux.mak | 29 +-
make_solaris.mak | 94 +-
make_linux.mak => make_solaris_x86.mak | 50 +-
nsIScriptContext.h | 468 +
nsIScriptGlobalObject.h | 196 +
org/eclipse/swt/SWT.java | 119 +-
org/eclipse/swt/accessibility/ACC.java | 4 +-
org/eclipse/swt/accessibility/Accessible.java | 11 +-
.../swt/accessibility/AccessibleFactory.java | 3 +-
.../swt/accessibility/AccessibleListener.java | 2 +-
.../swt/accessibility/AccessibleObject.java | 39 +-
.../swt/accessibility/AccessibleTextListener.java | 2 +-
org/eclipse/swt/awt/SWT_AWT.java | 10 +-
org/eclipse/swt/browser/AppFileLocProvider.java | 31 +-
org/eclipse/swt/browser/AuthenticationEvent.java | 69 +
.../swt/browser/AuthenticationListener.java | 56 +
org/eclipse/swt/browser/Browser.java | 224 +-
org/eclipse/swt/browser/BrowserFunction.java | 192 +
org/eclipse/swt/browser/CloseWindowListener.java | 2 +-
org/eclipse/swt/browser/Download.java | 8 +-
org/eclipse/swt/browser/Download_1_8.java | 6 +
org/eclipse/swt/browser/External.java | 590 +
.../{DownloadFactory.java => ExternalFactory.java} | 20 +-
org/eclipse/swt/browser/FilePicker.java | 26 +-
.../swt/browser/HelperAppLauncherDialog.java | 2 +-
.../browser/HelperAppLauncherDialogFactory.java | 5 +-
.../swt/browser/HelperAppLauncherDialog_1_9.java | 6 +
org/eclipse/swt/browser/LocationEvent.java | 13 +-
org/eclipse/swt/browser/LocationListener.java | 2 +-
org/eclipse/swt/browser/Mozilla.java | 1163 +-
org/eclipse/swt/browser/MozillaDelegate.java | 33 +-
org/eclipse/swt/browser/ProgressEvent.java | 13 +-
org/eclipse/swt/browser/ProgressListener.java | 2 +-
org/eclipse/swt/browser/PromptDialog.java | 138 +
org/eclipse/swt/browser/PromptService2.java | 400 +-
org/eclipse/swt/browser/StatusTextEvent.java | 13 +-
org/eclipse/swt/browser/TitleEvent.java | 13 +-
org/eclipse/swt/browser/TitleListener.java | 2 +-
org/eclipse/swt/browser/WebBrowser.java | 205 +-
org/eclipse/swt/browser/WindowEvent.java | 13 +-
org/eclipse/swt/custom/CBanner.java | 25 +-
org/eclipse/swt/custom/CCombo.java | 34 +-
org/eclipse/swt/custom/CLabel.java | 32 +-
org/eclipse/swt/custom/CTabFolder.java | 156 +-
org/eclipse/swt/custom/CTabFolder2Listener.java | 2 +-
org/eclipse/swt/custom/CTabItem.java | 32 +-
.../{CTabFolderAdapter.java => CaretEvent.java} | 28 +-
...BidiSegmentListener.java => CaretListener.java} | 27 +-
org/eclipse/swt/custom/ST.java | 9 +
org/eclipse/swt/custom/SashForm.java | 21 +-
org/eclipse/swt/custom/SashFormLayout.java | 7 +-
org/eclipse/swt/custom/ScrolledComposite.java | 14 +-
.../swt/custom/ScrolledCompositeLayout.java | 2 +-
org/eclipse/swt/custom/StyledText.java | 1749 +-
org/eclipse/swt/custom/StyledTextListener.java | 6 +
org/eclipse/swt/custom/StyledTextRenderer.java | 87 +-
org/eclipse/swt/custom/TableCursor.java | 29 +-
org/eclipse/swt/custom/TableTree.java | 8 +-
org/eclipse/swt/custom/TextChangeListener.java | 2 +-
org/eclipse/swt/custom/ViewForm.java | 14 +-
org/eclipse/swt/custom/ViewFormLayout.java | 17 +-
org/eclipse/swt/dnd/Clipboard.java | 3 +-
org/eclipse/swt/dnd/DNDEvent.java | 4 +-
org/eclipse/swt/dnd/DragSource.java | 4 +-
org/eclipse/swt/dnd/DragSourceEvent.java | 41 +-
org/eclipse/swt/dnd/DragSourceListener.java | 3 +-
org/eclipse/swt/dnd/DropTarget.java | 15 +-
org/eclipse/swt/dnd/DropTargetEvent.java | 31 +-
org/eclipse/swt/dnd/DropTargetListener.java | 2 +-
org/eclipse/swt/dnd/FileTransfer.java | 53 +-
org/eclipse/swt/dnd/ImageTransfer.java | 10 +-
org/eclipse/swt/dnd/URLTransfer.java | 3 +-
org/eclipse/swt/events/ArmListener.java | 2 +-
org/eclipse/swt/events/ControlListener.java | 2 +-
org/eclipse/swt/events/DisposeListener.java | 2 +-
org/eclipse/swt/events/FocusListener.java | 2 +-
org/eclipse/swt/events/HelpListener.java | 2 +-
org/eclipse/swt/events/KeyListener.java | 2 +-
org/eclipse/swt/events/ModifyListener.java | 2 +-
org/eclipse/swt/events/MouseEvent.java | 4 +-
org/eclipse/swt/events/MouseListener.java | 2 +-
org/eclipse/swt/events/MouseMoveListener.java | 2 +-
org/eclipse/swt/events/MouseTrackListener.java | 2 +-
org/eclipse/swt/events/PaintListener.java | 2 +-
org/eclipse/swt/events/TraverseListener.java | 2 +-
org/eclipse/swt/graphics/Device.java | 23 +-
org/eclipse/swt/graphics/DeviceData.java | 2 +-
org/eclipse/swt/graphics/Drawable.java | 4 +-
org/eclipse/swt/graphics/FontData.java | 4 +-
org/eclipse/swt/graphics/GC.java | 91 +-
org/eclipse/swt/graphics/GCData.java | 3 +-
org/eclipse/swt/graphics/Image.java | 12 +-
org/eclipse/swt/graphics/ImageData.java | 63 +-
org/eclipse/swt/graphics/ImageLoaderListener.java | 2 +-
org/eclipse/swt/graphics/Rectangle.java | 2 +-
org/eclipse/swt/graphics/TextLayout.java | 25 +-
org/eclipse/swt/graphics/TextStyle.java | 97 +-
org/eclipse/swt/internal/C.java | 96 +-
.../swt/internal/CloneableCompatibility.java | 2 +-
org/eclipse/swt/internal/Converter.java | 2 +-
org/eclipse/swt/internal/LONG.java | 3 +-
org/eclipse/swt/internal/Library.java | 71 +-
org/eclipse/swt/internal/Lock.java | 4 +-
org/eclipse/swt/internal/SWTEventListener.java | 2 +-
org/eclipse/swt/internal/SWTEventObject.java | 2 +-
org/eclipse/swt/internal/SWTMessages.properties | 10 +-
.../swt/internal/SerializableCompatibility.java | 2 +-
.../swt/internal/accessibility/gtk/ATK.java | 32 +-
.../internal/accessibility/gtk/AtkActionIface.java | 8 +-
.../accessibility/gtk/AtkComponentIface.java | 15 +-
.../accessibility/gtk/AtkHypertextIface.java | 5 +-
.../internal/accessibility/gtk/AtkObjectClass.java | 25 +-
.../accessibility/gtk/AtkObjectFactoryClass.java | 5 +-
.../accessibility/gtk/AtkSelectionIface.java | 10 +-
.../internal/accessibility/gtk/AtkTextIface.java | 22 +-
.../internal/accessibility/gtk/GtkAccessible.java | 3 +-
org/eclipse/swt/internal/cairo/Cairo.java | 245 +-
.../swt/internal/cairo/cairo_font_extents_t.java | 2 +-
.../swt/internal/cairo/cairo_path_data_t.java | 4 +-
org/eclipse/swt/internal/cairo/cairo_path_t.java | 3 +-
.../swt/internal/cairo/cairo_text_extents_t.java | 2 +-
org/eclipse/swt/internal/cde/CDE.java | 50 +-
org/eclipse/swt/internal/cde/DtActionArg.java | 3 +-
org/eclipse/swt/internal/gnome/GNOME.java | 50 +-
.../internal/gnome/GnomeVFSMimeApplication.java | 9 +-
org/eclipse/swt/internal/gtk/GInterfaceInfo.java | 5 +-
org/eclipse/swt/internal/gtk/GObjectClass.java | 9 +-
org/eclipse/swt/internal/gtk/GTypeInfo.java | 12 +-
org/eclipse/swt/internal/gtk/GTypeQuery.java | 6 +-
org/eclipse/swt/internal/gtk/GdkColor.java | 6 +-
org/eclipse/swt/internal/gtk/GdkDragContext.java | 29 +-
org/eclipse/swt/internal/gtk/GdkEvent.java | 3 +-
org/eclipse/swt/internal/gtk/GdkEventAny.java | 4 +-
org/eclipse/swt/internal/gtk/GdkEventButton.java | 13 +-
org/eclipse/swt/internal/gtk/GdkEventCrossing.java | 8 +-
org/eclipse/swt/internal/gtk/GdkEventExpose.java | 10 +-
org/eclipse/swt/internal/gtk/GdkEventFocus.java | 5 +-
org/eclipse/swt/internal/gtk/GdkEventKey.java | 13 +-
org/eclipse/swt/internal/gtk/GdkEventMotion.java | 13 +-
org/eclipse/swt/internal/gtk/GdkEventScroll.java | 12 +-
.../swt/internal/gtk/GdkEventVisibility.java | 5 +-
.../swt/internal/gtk/GdkEventWindowState.java | 3 +-
org/eclipse/swt/internal/gtk/GdkGCValues.java | 26 +-
org/eclipse/swt/internal/gtk/GdkImage.java | 14 +-
org/eclipse/swt/internal/gtk/GdkRectangle.java | 6 +-
org/eclipse/swt/internal/gtk/GdkVisual.java | 16 +-
org/eclipse/swt/internal/gtk/GdkWindowAttr.java | 8 +-
org/eclipse/swt/internal/gtk/GtkAdjustment.java | 8 +-
.../swt/internal/gtk/GtkCellRendererClass.java | 4 +-
.../swt/internal/gtk/GtkColorSelectionDialog.java | 6 +-
org/eclipse/swt/internal/gtk/GtkCombo.java | 4 +-
org/eclipse/swt/internal/gtk/GtkFileSelection.java | 22 +-
org/eclipse/swt/internal/gtk/GtkFixed.java | 3 +-
org/eclipse/swt/internal/gtk/GtkSelectionData.java | 8 +-
org/eclipse/swt/internal/gtk/GtkTargetEntry.java | 5 +-
org/eclipse/swt/internal/gtk/GtkTargetPair.java | 5 +-
org/eclipse/swt/internal/gtk/GtkWidgetClass.java | 64 +-
org/eclipse/swt/internal/gtk/OS.java | 3637 ++-
org/eclipse/swt/internal/gtk/PangoAttrColor.java | 5 +-
org/eclipse/swt/internal/gtk/PangoAttribute.java | 3 +-
org/eclipse/swt/internal/gtk/PangoItem.java | 8 +-
org/eclipse/swt/internal/gtk/PangoLayoutLine.java | 2 +
org/eclipse/swt/internal/gtk/PangoLayoutRun.java | 4 +-
org/eclipse/swt/internal/gtk/XAnyEvent.java | 4 +-
org/eclipse/swt/internal/gtk/XButtonEvent.java | 2 +-
.../swt/internal/gtk/XClientMessageEvent.java | 6 +-
org/eclipse/swt/internal/gtk/XCrossingEvent.java | 8 +-
org/eclipse/swt/internal/gtk/XEvent.java | 2 +-
org/eclipse/swt/internal/gtk/XExposeEvent.java | 2 +-
.../swt/internal/gtk/XFocusChangeEvent.java | 2 +-
org/eclipse/swt/internal/gtk/XVisibilityEvent.java | 2 +-
org/eclipse/swt/internal/gtk/XWindowChanges.java | 2 +-
org/eclipse/swt/internal/image/GIFFileFormat.java | 38 +-
org/eclipse/swt/internal/image/JPEGAppn.java | 2 +-
.../image/JPEGArithmeticConditioningTable.java | 2 +-
org/eclipse/swt/internal/image/JPEGComment.java | 2 +-
org/eclipse/swt/internal/image/JPEGDecoder.java | 9 +-
org/eclipse/swt/internal/image/JPEGEndOfImage.java | 2 +-
.../swt/internal/image/JPEGFixedSizeSegment.java | 2 +-
.../swt/internal/image/JPEGRestartInterval.java | 2 +-
org/eclipse/swt/internal/image/JPEGSegment.java | 2 +-
.../swt/internal/image/JPEGStartOfImage.java | 2 +-
.../internal/image/JPEGVariableSizeSegment.java | 2 +-
org/eclipse/swt/internal/image/LZWNode.java | 2 +-
.../swt/internal/image/PngFileReadState.java | 2 +-
.../internal/image/TIFFModifiedHuffmanCodec.java | 2 +-
.../swt/internal/image/TIFFRandomFileAccess.java | 2 +-
org/eclipse/swt/internal/mozilla/XPCOM.java | 2295 +-
org/eclipse/swt/internal/mozilla/XPCOMInit.java | 39 -
org/eclipse/swt/internal/mozilla/XPCOMObject.java | 31 +-
.../mozilla/{ => init}/GREVersionRange.java | 11 +-
.../swt/internal/mozilla/init/XPCOMInit.java | 71 +
...ersionRange.java => nsDynamicFunctionLoad.java} | 13 +-
org/eclipse/swt/internal/mozilla/nsIAppShell.java | 150 +-
...WeakReference.java => nsIBadCertListener2.java} | 18 +-
.../swt/internal/mozilla/nsIBaseWindow.java | 278 +-
.../swt/internal/mozilla/nsICategoryManager.java | 134 +-
.../internal/mozilla/nsICertOverrideService.java | 73 +
...PrefService.java => nsICertificateDialogs.java} | 40 +-
.../{nsIAuthInformation.java => nsIClassInfo.java} | 72 +-
.../internal/mozilla/nsIComponentRegistrar.java | 182 +-
org/eclipse/swt/internal/mozilla/nsICookie.java | 200 +-
.../swt/internal/mozilla/nsICookieManager.java | 110 +-
.../{nsIMemory.java => nsICookieService.java} | 37 +-
...rviceManager.java => nsICookieService_1_9.java} | 30 +-
org/eclipse/swt/internal/mozilla/nsID.java | 17 +-
org/eclipse/swt/internal/mozilla/nsIDOMEvent.java | 176 +-
.../swt/internal/mozilla/nsIDOMEventTarget.java | 110 +-
.../swt/internal/mozilla/nsIDOMKeyEvent.java | 598 +-
.../swt/internal/mozilla/nsIDOMMouseEvent.java | 174 +-
.../swt/internal/mozilla/nsIDOMUIEvent.java | 110 +-
.../internal/mozilla/nsIDOMWindowCollection.java | 110 +-
org/eclipse/swt/internal/mozilla/nsIDataType.java | 73 +
.../swt/internal/mozilla/nsIDirectoryService.java | 110 +-
.../mozilla/nsIDirectoryServiceProvider.java | 94 +-
org/eclipse/swt/internal/mozilla/nsIDocShell.java | 538 +-
.../swt/internal/mozilla/nsIDocShell_1_8.java | 634 +-
.../swt/internal/mozilla/nsIDocShell_1_9.java | 347 -
.../internal/mozilla/nsIEmbeddingSiteWindow.java | 162 +-
org/eclipse/swt/internal/mozilla/nsIFactory.java | 102 +-
org/eclipse/swt/internal/mozilla/nsIFile.java | 454 +-
.../swt/internal/mozilla/nsIFilePicker_1_8.java | 236 +-
.../swt/internal/mozilla/nsIHelperAppLauncher.java | 158 +-
.../mozilla/nsIHelperAppLauncherDialog_1_9.java | 2 +-
.../internal/mozilla/nsIHelperAppLauncher_1_8.java | 158 +-
.../internal/mozilla/nsIHelperAppLauncher_1_9.java | 166 +-
org/eclipse/swt/internal/mozilla/nsIIOService.java | 166 +-
.../swt/internal/mozilla/nsIInputStream.java | 126 +-
.../swt/internal/mozilla/nsIJSContextStack.java | 118 +-
org/eclipse/swt/internal/mozilla/nsILocalFile.java | 222 +-
org/eclipse/swt/internal/mozilla/nsIMemory.java | 126 +-
.../swt/internal/mozilla/nsIObserverService.java | 118 +-
.../swt/internal/mozilla/nsIPrefBranch.java | 242 +-
org/eclipse/swt/internal/mozilla/nsIPrincipal.java | 143 +
.../swt/internal/mozilla/nsIProgressDialog.java | 126 +-
.../internal/mozilla/nsIProgressDialog_1_8.java | 138 +-
.../swt/internal/mozilla/nsIPromptService.java | 226 +-
.../swt/internal/mozilla/nsIPromptService2.java | 102 +-
.../swt/internal/mozilla/nsIProperties.java | 122 +-
org/eclipse/swt/internal/mozilla/nsIRequest.java | 200 +-
.../{nsIWebBrowserFocus.java => nsISSLStatus.java} | 48 +-
.../mozilla/nsIScriptSecurityManager_1_9.java | 159 +
.../mozilla/nsIScriptSecurityManager_1_9_1.java | 159 +
.../mozilla/nsISecurityCheckedComponent.java | 33 +
.../{nsIFactory.java => nsISerializable.java} | 100 +-
.../swt/internal/mozilla/nsIServiceManager.java | 118 +-
.../swt/internal/mozilla/nsISimpleEnumerator.java | 102 +-
org/eclipse/swt/internal/mozilla/nsISupports.java | 17 +-
org/eclipse/swt/internal/mozilla/nsIURI.java | 294 +-
.../internal/mozilla/nsIURIContentListener.java | 150 +-
.../mozilla/{nsIURI.java => nsIVariant.java} | 294 +-
.../swt/internal/mozilla/nsIWebBrowserChrome.java | 272 +-
...erviceProvider.java => nsIWebBrowserSetup.java} | 110 +-
...ectoryService.java => nsIWebBrowserStream.java} | 108 +-
.../swt/internal/mozilla/nsIWebNavigation.java | 238 +-
.../swt/internal/mozilla/nsIWebProgress.java | 158 +-
.../swt/internal/mozilla/nsIWindowCreator2.java | 98 +-
.../swt/internal/mozilla/nsIWritableVariant.java | 141 +
org/eclipse/swt/internal/mozilla/nsIX509Cert.java | 203 +
.../{nsIAppShell.java => nsIX509CertValidity.java} | 148 +-
.../internal/mozilla/nsIXPCSecurityManager.java | 79 +
org/eclipse/swt/internal/opengl/glx/GLX.java | 61 +-
.../swt/internal/opengl/glx/XVisualInfo.java | 4 +-
org/eclipse/swt/opengl/GLCanvas.java | 7 +-
org/eclipse/swt/opengl/GLData.java | 10 +-
org/eclipse/swt/printing/PrintDialog.java | 118 +-
org/eclipse/swt/printing/Printer.java | 57 +-
org/eclipse/swt/printing/PrinterData.java | 26 +-
org/eclipse/swt/widgets/Button.java | 5 +-
org/eclipse/swt/widgets/Caret.java | 3 +-
org/eclipse/swt/widgets/ColorDialog.java | 4 +-
org/eclipse/swt/widgets/Combo.java | 17 +-
org/eclipse/swt/widgets/Composite.java | 23 +-
org/eclipse/swt/widgets/Control.java | 135 +-
org/eclipse/swt/widgets/CoolBar.java | 95 +-
org/eclipse/swt/widgets/CoolItem.java | 9 +-
org/eclipse/swt/widgets/DateTime.java | 77 +-
org/eclipse/swt/widgets/Decorations.java | 5 +-
org/eclipse/swt/widgets/Dialog.java | 13 +-
org/eclipse/swt/widgets/DirectoryDialog.java | 20 +-
org/eclipse/swt/widgets/Display.java | 216 +-
org/eclipse/swt/widgets/ExpandBar.java | 24 +-
org/eclipse/swt/widgets/ExpandItem.java | 18 +-
org/eclipse/swt/widgets/FileDialog.java | 177 +-
org/eclipse/swt/widgets/FontDialog.java | 4 +-
org/eclipse/swt/widgets/Group.java | 3 +-
org/eclipse/swt/widgets/IME.java | 19 +-
org/eclipse/swt/widgets/Label.java | 76 +-
org/eclipse/swt/widgets/Link.java | 8 +-
org/eclipse/swt/widgets/List.java | 3 +-
org/eclipse/swt/widgets/Menu.java | 10 +-
org/eclipse/swt/widgets/MenuItem.java | 3 +-
org/eclipse/swt/widgets/MessageBox.java | 46 +-
org/eclipse/swt/widgets/ProgressBar.java | 4 +-
org/eclipse/swt/widgets/Sash.java | 4 +-
org/eclipse/swt/widgets/Scale.java | 3 +-
org/eclipse/swt/widgets/ScrollBar.java | 3 +-
org/eclipse/swt/widgets/Scrollable.java | 3 +-
org/eclipse/swt/widgets/Shell.java | 135 +-
org/eclipse/swt/widgets/Slider.java | 3 +-
org/eclipse/swt/widgets/Spinner.java | 15 +-
org/eclipse/swt/widgets/Synchronizer.java | 5 +-
org/eclipse/swt/widgets/TabFolder.java | 5 +-
org/eclipse/swt/widgets/TabItem.java | 30 +-
org/eclipse/swt/widgets/Table.java | 103 +-
org/eclipse/swt/widgets/TableColumn.java | 37 +-
org/eclipse/swt/widgets/TableItem.java | 3 +-
org/eclipse/swt/widgets/Text.java | 144 +-
org/eclipse/swt/widgets/ToolBar.java | 98 +-
org/eclipse/swt/widgets/ToolItem.java | 47 +-
org/eclipse/swt/widgets/ToolTip.java | 27 +-
org/eclipse/swt/widgets/Tracker.java | 4 +-
org/eclipse/swt/widgets/Tray.java | 3 +-
org/eclipse/swt/widgets/TrayItem.java | 190 +-
org/eclipse/swt/widgets/Tree.java | 87 +-
org/eclipse/swt/widgets/TreeColumn.java | 37 +-
org/eclipse/swt/widgets/TreeItem.java | 33 +-
org/eclipse/swt/widgets/Widget.java | 50 +-
os.c | 8783 ++--
os_custom.c | 44 +-
os_custom.h | 20 +-
os_stats.c | 401 +-
os_stats.h | 397 +-
os_structs.c | 1054 +-
swt.h | 122 +-
swt_awt.c | 26 +-
version.txt | 2 +-
xpcom.cpp | 5717 ++-
xpcom.h | 19 +-
xpcom_custom.cpp | 54 +-
.../internal/image/LZWNode.java => xpcom_custom.h | 15 +-
xpcom_stats.cpp | 1180 +-
xpcom_stats.h | 1176 +-
xpcom_structs.cpp | 36 +-
xpcom_structs.h | 14 +-
xpcominit.cpp | 36 +-
xpcominit_stats.cpp | 8 +-
xpcominit_stats.h | 8 +-
xpcominit_structs.cpp | 14 +-
xpcominit_structs.h | 2 +-
394 files changed, 48856 insertions(+), 51876 deletions(-)
diff --git a/about.html b/about.html
index c102741..ea2d22d 100644
--- a/about.html
+++ b/about.html
@@ -106,6 +106,19 @@ work is provided for debugging purposes so there is no need to reverse engineer
conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at
<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
+<h4>XULRunner 1.9 (subset, derivative work)</h4>
+
+The libraries swt-xulrunner-gtk-xxxx.dll, swt-mozilla-gtk-xxxx.dll, and swt-mozilla-gcc3-gtk-xxxx.dll (where "xxxx" is the version number) contain a small portion of XULRunner 1.9 content (header files)
+that have been modified from the Original Code provided by mozilla.org, and whose Initial Developer is Netscape Communications Corporation. Use of this code is governed by
+the terms and conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="./about_files/mpl-v11.txt">mpl-v11.txt</a>)
+and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.
+<p>The changed files are:
+<ul>
+ <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h</code>
+ <li>org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h</code>
+</ul>
+Changes to the original files were made by SWT on April 7, 2009 and are marked with trailing comment <em>"//SWT-20090407"</em>.
+
<h4>Cairo Binding</h4>
<p>The "Cairo Binding" is a binding to the Cairo API. The Content may include any or all of the following files:</p>
diff --git a/about_files/IJG_README b/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/about_files/about_cairo.html b/about_files/about_cairo.html
old mode 100755
new mode 100644
diff --git a/about_files/lgpl-v21.txt b/about_files/lgpl-v21.txt
old mode 100755
new mode 100644
diff --git a/about_files/mpl-v11.txt b/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/about_files/pixman-licenses.txt b/about_files/pixman-licenses.txt
old mode 100755
new mode 100644
diff --git a/atk.c b/atk.c
index 8169839..b663012 100644
--- a/atk.c
+++ b/atk.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -44,72 +44,72 @@ JNIEXPORT jint JNICALL ATK_NATIVE(AtkObjectFactory_1sizeof)
#endif
#ifndef NO__1ATK_1ACTION_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1ATK_1ACTION_1GET_1IFACE_FUNC);
- rc = (jint)ATK_ACTION_GET_IFACE(arg0);
+ rc = (jintLong)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 jint JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC);
- rc = (jint)ATK_COMPONENT_GET_IFACE(arg0);
+ rc = (jintLong)ATK_COMPONENT_GET_IFACE(arg0);
ATK_NATIVE_EXIT(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC);
return rc;
}
#endif
#ifndef NO__1ATK_1OBJECT_1FACTORY_1CLASS
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC);
- rc = (jint)ATK_OBJECT_FACTORY_CLASS(arg0);
+ rc = (jintLong)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 jint JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC);
- rc = (jint)ATK_SELECTION_GET_IFACE(arg0);
+ rc = (jintLong)ATK_SELECTION_GET_IFACE(arg0);
ATK_NATIVE_EXIT(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC);
return rc;
}
#endif
#ifndef NO__1ATK_1TEXT_1GET_1IFACE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC);
- rc = (jint)ATK_TEXT_GET_IFACE(arg0);
+ rc = (jintLong)ATK_TEXT_GET_IFACE(arg0);
ATK_NATIVE_EXIT(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1ACCESSIBLE
-JNIEXPORT jint JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC);
- rc = (jint)GTK_ACCESSIBLE(arg0);
+ rc = (jintLong)GTK_ACCESSIBLE(arg0);
ATK_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC);
return rc;
}
@@ -117,7 +117,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
#ifndef NO__1atk_1focus_1tracker_1notify
JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1focus_1tracker_1notify)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
ATK_NATIVE_ENTER(env, that, _1atk_1focus_1tracker_1notify_FUNC);
atk_focus_tracker_notify((AtkObject *)arg0);
@@ -126,36 +126,36 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1focus_1tracker_1notify)
#endif
#ifndef NO__1atk_1get_1default_1registry
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1get_1default_1registry_FUNC);
- rc = (jint)atk_get_default_registry();
+ rc = (jintLong)atk_get_default_registry();
ATK_NATIVE_EXIT(env, that, _1atk_1get_1default_1registry_FUNC);
return rc;
}
#endif
#ifndef NO__1atk_1object_1factory_1create_1accessible
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
- rc = (jint)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
+ rc = (jintLong)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
return rc;
}
#endif
#ifndef NO__1atk_1object_1factory_1get_1accessible_1type
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1get_1accessible_1type_FUNC);
- rc = (jint)atk_object_factory_get_accessible_type((AtkObjectFactory *)arg0);
+ rc = (jintLong)atk_object_factory_get_accessible_type((AtkObjectFactory *)arg0);
ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1get_1accessible_1type_FUNC);
return rc;
}
@@ -163,7 +163,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
#ifndef NO__1atk_1object_1initialize
JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1initialize)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
ATK_NATIVE_ENTER(env, that, _1atk_1object_1initialize_FUNC);
atk_object_initialize((AtkObject *)arg0, (gpointer)arg1);
@@ -172,24 +172,24 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1initialize)
#endif
#ifndef NO__1atk_1object_1ref_1relation_1set
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
- rc = (jint)atk_object_ref_relation_set((AtkObject *)arg0);
+ rc = (jintLong)atk_object_ref_relation_set((AtkObject *)arg0);
ATK_NATIVE_EXIT(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
return rc;
}
#endif
#ifndef NO__1atk_1registry_1get_1factory
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1registry_1get_1factory_FUNC);
- rc = (jint)atk_registry_get_factory((AtkRegistry *)arg0, (GType)arg1);
+ rc = (jintLong)atk_registry_get_factory((AtkRegistry *)arg0, (GType)arg1);
ATK_NATIVE_EXIT(env, that, _1atk_1registry_1get_1factory_FUNC);
return rc;
}
@@ -197,7 +197,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
#ifndef NO__1atk_1registry_1set_1factory_1type
JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1registry_1set_1factory_1type)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
ATK_NATIVE_ENTER(env, that, _1atk_1registry_1set_1factory_1type_FUNC);
atk_registry_set_factory_type((AtkRegistry *)arg0, (GType)arg1, (GType)arg2);
@@ -207,7 +207,7 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1registry_1set_1factory_1type)
#ifndef NO__1atk_1relation_1set_1get_1n_1relations
JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1n_1relations)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1n_1relations_FUNC);
@@ -218,12 +218,12 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1n_1relations)
#endif
#ifndef NO__1atk_1relation_1set_1get_1relation
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
- rc = (jint)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
+ rc = (jintLong)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
ATK_NATIVE_EXIT(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
return rc;
}
@@ -231,7 +231,7 @@ JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
#ifndef NO__1atk_1relation_1set_1remove
JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1relation_1set_1remove)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1remove_FUNC);
atk_relation_set_remove((AtkRelationSet *)arg0, (AtkRelation *)arg1);
@@ -241,7 +241,7 @@ JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1relation_1set_1remove)
#ifndef NO__1atk_1state_1set_1add_1state
JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jboolean rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1add_1state_FUNC);
@@ -252,236 +252,467 @@ JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state)
#endif
#ifndef NO__1atk_1state_1set_1new
-JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1new_FUNC);
- rc = (jint)atk_state_set_new();
+ rc = (jintLong)atk_state_set_new();
ATK_NATIVE_EXIT(env, that, _1atk_1state_1set_1new_FUNC);
return rc;
}
#endif
-#ifndef NO__1call__II
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#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
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, _1call__II_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1);
+#else
+ 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
+ ATK_NATIVE_EXIT(env, that, _1call__JJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1call__III
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__III)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#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
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, _1call__III_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1, arg2);
+#else
+ 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
+ ATK_NATIVE_EXIT(env, that, _1call__JJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1call__IIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#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
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, _1call__IIII_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
+#else
+ 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
+ ATK_NATIVE_EXIT(env, that, _1call__JJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1call__IIIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1call__IIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
+#endif
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, _1call__IIIII_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4);
+#else
+ ATK_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC);
+#endif
+ rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4);
+#ifndef JNI64
ATK_NATIVE_EXIT(env, that, _1call__IIIII_FUNC);
+#else
+ ATK_NATIVE_EXIT(env, that, _1call__JJJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1call__IIIIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#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
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, _1call__IIIIII_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
+#else
+ 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
+ ATK_NATIVE_EXIT(env, that, _1call__JJJJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1call__IIIIIII
-JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO__1call__IIIIIII) && !defined(JNI64)) || (!defined(NO__1call__JJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#else
+JNIEXPORT jintLong JNICALL ATK_NATIVE(_1call__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
+#endif
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, _1call__IIIIIII_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+#else
+ ATK_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC);
+#endif
+ rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
ATK_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC);
+#else
+ ATK_NATIVE_EXIT(env, that, _1call__JJJJJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#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 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
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#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 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
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#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 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
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#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 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
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
{
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#else
+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#endif
if (arg1) getAtkObjectFactoryClassFields(env, arg1, (AtkObjectFactoryClass *)arg0);
+#ifndef JNI64
ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#else
+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#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 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
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC);
+#else
+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC);
+#endif
if (arg0) setAtkObjectFactoryClassFields(env, arg0, (AtkObjectFactoryClass *)arg1);
+#ifndef JNI64
ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC);
+#else
+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#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 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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC);
+#else
+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC);
+#endif
if (arg0) setGtkAccessibleFields(env, arg0, (GtkAccessible *)arg1);
+#ifndef JNI64
ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC);
+#else
+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC);
+#endif
}
#endif
diff --git a/atk_stats.c b/atk_stats.c
index ce2e268..0527eda 100644
--- a/atk_stats.c
+++ b/atk_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -42,27 +42,111 @@ char * ATK_nativeFunctionNames[] = {
"_1atk_1relation_1set_1remove",
"_1atk_1state_1set_1add_1state",
"_1atk_1state_1set_1new",
+#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__IIIII",
+#else
+ "_1call__JJJJJ",
+#endif
+#ifndef JNI64
"_1call__IIIIII",
+#else
+ "_1call__JJJJJJ",
+#endif
+#ifndef JNI64
"_1call__IIIIIII",
+#else
+ "_1call__JJJJJJJ",
+#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_AtkComponentIface_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_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_AtkObjectFactoryClass_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_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_AtkTextIface_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_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_AtkComponentIface_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_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_AtkObjectFactoryClass_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_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_AtkTextIface_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J",
+#endif
};
#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
diff --git a/atk_stats.h b/atk_stats.h
index d46b0b6..d4680ab 100644
--- a/atk_stats.h
+++ b/atk_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -50,25 +50,109 @@ typedef enum {
_1atk_1relation_1set_1remove_FUNC,
_1atk_1state_1set_1add_1state_FUNC,
_1atk_1state_1set_1new_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__IIIII_FUNC,
+#else
+ _1call__JJJJJ_FUNC,
+#endif
+#ifndef JNI64
_1call__IIIIII_FUNC,
+#else
+ _1call__JJJJJJ_FUNC,
+#endif
+#ifndef JNI64
_1call__IIIIIII_FUNC,
+#else
+ _1call__JJJJJJJ_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_AtkComponentIface_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_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_AtkObjectFactoryClass_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_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_AtkTextIface_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_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_AtkComponentIface_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_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_AtkObjectFactoryClass_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_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_AtkTextIface_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC,
+#endif
} ATK_FUNCS;
diff --git a/atk_structs.c b/atk_structs.c
index 41c50a9..cd9a5ed 100644
--- a/atk_structs.c
+++ b/atk_structs.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -29,36 +29,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");
- AtkActionIfaceFc.get_n_actions = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_n_actions", "I");
- AtkActionIfaceFc.get_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_description", "I");
- AtkActionIfaceFc.get_name = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_name", "I");
- AtkActionIfaceFc.get_keybinding = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_keybinding", "I");
- AtkActionIfaceFc.set_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "set_description", "I");
+ 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.cached = 1;
}
AtkActionIface *getAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct)
{
if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject);
- lpStruct->do_action = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.do_action);
- lpStruct->get_n_actions = (gint (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_n_actions);
- lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_description);
- lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_name);
- lpStruct->get_keybinding = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_keybinding);
- lpStruct->set_description = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.set_description);
+ 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 = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description);
+ lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name);
+ lpStruct->get_keybinding = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding);
+ lpStruct->set_description = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.set_description);
return lpStruct;
}
void setAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct)
{
if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.do_action, (jint)lpStruct->do_action);
- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_n_actions, (jint)lpStruct->get_n_actions);
- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_description, (jint)lpStruct->get_description);
- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_name, (jint)lpStruct->get_name);
- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_keybinding, (jint)lpStruct->get_keybinding);
- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.set_description, (jint)lpStruct->set_description);
+ (*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);
}
#endif
@@ -75,57 +75,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");
- AtkComponentIfaceFc.contains = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "contains", "I");
- AtkComponentIfaceFc.ref_accessible_at_point = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "ref_accessible_at_point", "I");
- AtkComponentIfaceFc.get_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_extents", "I");
- AtkComponentIfaceFc.get_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_position", "I");
- AtkComponentIfaceFc.get_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_size", "I");
- AtkComponentIfaceFc.grab_focus = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "grab_focus", "I");
- AtkComponentIfaceFc.remove_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "remove_focus_handler", "I");
- AtkComponentIfaceFc.set_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_extents", "I");
- AtkComponentIfaceFc.set_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_position", "I");
- AtkComponentIfaceFc.set_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_size", "I");
- AtkComponentIfaceFc.get_layer = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_layer", "I");
- AtkComponentIfaceFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_mdi_zorder", "I");
+ 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.cached = 1;
}
AtkComponentIface *getAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct)
{
if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject);
- lpStruct->add_focus_handler = (guint (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
- lpStruct->contains = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.contains);
- lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
- lpStruct->get_extents = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_extents);
- lpStruct->get_position = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_position);
- lpStruct->get_size = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_size);
- lpStruct->grab_focus = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.grab_focus);
- lpStruct->remove_focus_handler = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
- lpStruct->set_extents = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_extents);
- lpStruct->set_position = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_position);
- lpStruct->set_size = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_size);
- lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_layer);
- lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
+ 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);
return lpStruct;
}
void setAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct)
{
if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.add_focus_handler, (jint)lpStruct->add_focus_handler);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.contains, (jint)lpStruct->contains);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point, (jint)lpStruct->ref_accessible_at_point);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_extents, (jint)lpStruct->get_extents);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_position, (jint)lpStruct->get_position);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_size, (jint)lpStruct->get_size);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.grab_focus, (jint)lpStruct->grab_focus);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler, (jint)lpStruct->remove_focus_handler);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_extents, (jint)lpStruct->set_extents);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_position, (jint)lpStruct->set_position);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_size, (jint)lpStruct->set_size);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_layer, (jint)lpStruct->get_layer);
- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder, (jint)lpStruct->get_mdi_zorder);
+ (*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);
}
#endif
@@ -142,27 +142,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");
- AtkHypertextIfaceFc.get_n_links = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_n_links", "I");
- AtkHypertextIfaceFc.get_link_index = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link_index", "I");
+ 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.cached = 1;
}
AtkHypertextIface *getAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct)
{
if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject);
- lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_link);
- lpStruct->get_n_links = (gint (*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
- lpStruct->get_link_index = (gint (*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
+ 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);
return lpStruct;
}
void setAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct)
{
if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_link, (jint)lpStruct->get_link);
- (*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_n_links, (jint)lpStruct->get_n_links);
- (*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_link_index, (jint)lpStruct->get_link_index);
+ (*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);
}
#endif
@@ -179,87 +179,87 @@ 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");
- AtkObjectClassFc.get_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_description", "I");
- AtkObjectClassFc.get_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_parent", "I");
- AtkObjectClassFc.get_n_children = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_n_children", "I");
- AtkObjectClassFc.ref_child = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_child", "I");
- AtkObjectClassFc.get_index_in_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_index_in_parent", "I");
- AtkObjectClassFc.ref_relation_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_relation_set", "I");
- AtkObjectClassFc.get_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_role", "I");
- AtkObjectClassFc.get_layer = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_layer", "I");
- AtkObjectClassFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_mdi_zorder", "I");
- AtkObjectClassFc.ref_state_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_state_set", "I");
- AtkObjectClassFc.set_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_name", "I");
- AtkObjectClassFc.set_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_description", "I");
- AtkObjectClassFc.set_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_parent", "I");
- AtkObjectClassFc.set_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_role", "I");
- AtkObjectClassFc.connect_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "connect_property_change_handler", "I");
- AtkObjectClassFc.remove_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "remove_property_change_handler", "I");
- AtkObjectClassFc.initialize = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "initialize", "I");
- AtkObjectClassFc.children_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "children_changed", "I");
- AtkObjectClassFc.focus_event = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "focus_event", "I");
- AtkObjectClassFc.property_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "property_change", "I");
- AtkObjectClassFc.state_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "state_change", "I");
- AtkObjectClassFc.visible_data_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "visible_data_changed", "I");
+ 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.cached = 1;
}
AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
{
if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
- lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_name);
- lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_description);
- lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_parent);
- lpStruct->get_n_children = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_n_children);
- lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_child);
- lpStruct->get_index_in_parent = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
- lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_relation_set);
- lpStruct->get_role = (AtkRole (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_role);
- lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_layer);
- lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
- lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_state_set);
- lpStruct->set_name = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_name);
- lpStruct->set_description = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_description);
- lpStruct->set_parent = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_parent);
- lpStruct->set_role = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_role);
- lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
- lpStruct->remove_property_change_handler = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
- lpStruct->initialize = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.initialize);
- lpStruct->children_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.children_changed);
- lpStruct->focus_event = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.focus_event);
- lpStruct->property_change = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.property_change);
- lpStruct->state_change = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.state_change);
- lpStruct->visible_data_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.visible_data_changed);
+ lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name);
+ lpStruct->get_description = (G_CONST_RETURN 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);
return lpStruct;
}
void setAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
{
if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_name, (jint)lpStruct->get_name);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_description, (jint)lpStruct->get_description);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_parent, (jint)lpStruct->get_parent);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_n_children, (jint)lpStruct->get_n_children);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_child, (jint)lpStruct->ref_child);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_index_in_parent, (jint)lpStruct->get_index_in_parent);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_relation_set, (jint)lpStruct->ref_relation_set);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_role, (jint)lpStruct->get_role);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_layer, (jint)lpStruct->get_layer);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_mdi_zorder, (jint)lpStruct->get_mdi_zorder);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_state_set, (jint)lpStruct->ref_state_set);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_name, (jint)lpStruct->set_name);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_description, (jint)lpStruct->set_description);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_parent, (jint)lpStruct->set_parent);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_role, (jint)lpStruct->set_role);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.connect_property_change_handler, (jint)lpStruct->connect_property_change_handler);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.remove_property_change_handler, (jint)lpStruct->remove_property_change_handler);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.initialize, (jint)lpStruct->initialize);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.children_changed, (jint)lpStruct->children_changed);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.focus_event, (jint)lpStruct->focus_event);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.property_change, (jint)lpStruct->property_change);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.state_change, (jint)lpStruct->state_change);
- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.visible_data_changed, (jint)lpStruct->visible_data_changed);
+ (*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);
}
#endif
@@ -276,27 +276,27 @@ void cacheAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject)
{
if (AtkObjectFactoryClassFc.cached) return;
AtkObjectFactoryClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
- AtkObjectFactoryClassFc.create_accessible = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "create_accessible", "I");
- AtkObjectFactoryClassFc.invalidate = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "invalidate", "I");
- AtkObjectFactoryClassFc.get_accessible_type = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "get_accessible_type", "I");
+ AtkObjectFactoryClassFc.create_accessible = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "create_accessible", I_J);
+ AtkObjectFactoryClassFc.invalidate = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "invalidate", I_J);
+ AtkObjectFactoryClassFc.get_accessible_type = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "get_accessible_type", I_J);
AtkObjectFactoryClassFc.cached = 1;
}
AtkObjectFactoryClass *getAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
{
if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
- lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
- lpStruct->invalidate = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
- lpStruct->get_accessible_type = (GType (*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
+ lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
+ lpStruct->invalidate = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
+ lpStruct->get_accessible_type = (GType (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
return lpStruct;
}
void setAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
{
if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.create_accessible, (jint)lpStruct->create_accessible);
- (*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.invalidate, (jint)lpStruct->invalidate);
- (*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type, (jint)lpStruct->get_accessible_type);
+ (*env)->SetIntLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible, (jintLong)lpStruct->create_accessible);
+ (*env)->SetIntLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate, (jintLong)lpStruct->invalidate);
+ (*env)->SetIntLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type, (jintLong)lpStruct->get_accessible_type);
}
#endif
@@ -313,42 +313,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");
- AtkSelectionIfaceFc.clear_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "clear_selection", "I");
- AtkSelectionIfaceFc.ref_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "ref_selection", "I");
- AtkSelectionIfaceFc.get_selection_count = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "get_selection_count", "I");
- AtkSelectionIfaceFc.is_child_selected = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "is_child_selected", "I");
- AtkSelectionIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "remove_selection", "I");
- AtkSelectionIfaceFc.select_all_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "select_all_selection", "I");
- AtkSelectionIfaceFc.selection_changed = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "selection_changed", "I");
+ 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.cached = 1;
}
AtkSelectionIface *getAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct)
{
if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject);
- lpStruct->add_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.add_selection);
- lpStruct->clear_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
- lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
- lpStruct->get_selection_count = (gint (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
- lpStruct->is_child_selected = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
- lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
- lpStruct->select_all_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
- lpStruct->selection_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
+ 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);
return lpStruct;
}
void setAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct)
{
if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.add_selection, (jint)lpStruct->add_selection);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.clear_selection, (jint)lpStruct->clear_selection);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.ref_selection, (jint)lpStruct->ref_selection);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.get_selection_count, (jint)lpStruct->get_selection_count);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.is_child_selected, (jint)lpStruct->is_child_selected);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.remove_selection, (jint)lpStruct->remove_selection);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.select_all_selection, (jint)lpStruct->select_all_selection);
- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.selection_changed, (jint)lpStruct->selection_changed);
+ (*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);
}
#endif
@@ -365,78 +365,78 @@ 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");
- AtkTextIfaceFc.get_text_after_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_after_offset", "I");
- AtkTextIfaceFc.get_text_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_at_offset", "I");
- AtkTextIfaceFc.get_character_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_at_offset", "I");
- AtkTextIfaceFc.get_text_before_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_before_offset", "I");
- AtkTextIfaceFc.get_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_caret_offset", "I");
- AtkTextIfaceFc.get_run_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_run_attributes", "I");
- AtkTextIfaceFc.get_default_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_default_attributes", "I");
- AtkTextIfaceFc.get_character_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_extents", "I");
- AtkTextIfaceFc.get_character_count = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_count", "I");
- AtkTextIfaceFc.get_offset_at_point = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_offset_at_point", "I");
- AtkTextIfaceFc.get_n_selections = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_n_selections", "I");
- AtkTextIfaceFc.get_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_selection", "I");
- AtkTextIfaceFc.add_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "add_selection", "I");
- AtkTextIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "remove_selection", "I");
- AtkTextIfaceFc.set_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_selection", "I");
- AtkTextIfaceFc.set_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_caret_offset", "I");
- AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", "I");
- AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", "I");
- AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", "I");
+ 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.cached = 1;
}
AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
{
if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
- lpStruct->get_text = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text);
- lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
- lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
- lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
- lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
- lpStruct->get_caret_offset = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
- lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
- lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
- lpStruct->get_character_extents = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_extents);
- lpStruct->get_character_count = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_count);
- lpStruct->get_offset_at_point = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
- lpStruct->get_n_selections = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_n_selections);
- lpStruct->get_selection = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_selection);
- lpStruct->add_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.add_selection);
- lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.remove_selection);
- lpStruct->set_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.set_selection);
- lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
- lpStruct->text_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_changed);
- lpStruct->text_caret_moved = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
- lpStruct->text_selection_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
+ 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);
return lpStruct;
}
void setAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
{
if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text, (jint)lpStruct->get_text);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_after_offset, (jint)lpStruct->get_text_after_offset);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_at_offset, (jint)lpStruct->get_text_at_offset);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_at_offset, (jint)lpStruct->get_character_at_offset);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_before_offset, (jint)lpStruct->get_text_before_offset);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_caret_offset, (jint)lpStruct->get_caret_offset);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_run_attributes, (jint)lpStruct->get_run_attributes);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_default_attributes, (jint)lpStruct->get_default_attributes);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_extents, (jint)lpStruct->get_character_extents);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_count, (jint)lpStruct->get_character_count);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_offset_at_point, (jint)lpStruct->get_offset_at_point);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_n_selections, (jint)lpStruct->get_n_selections);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_selection, (jint)lpStruct->get_selection);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.add_selection, (jint)lpStruct->add_selection);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.remove_selection, (jint)lpStruct->remove_selection);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.set_selection, (jint)lpStruct->set_selection);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.set_caret_offset, (jint)lpStruct->set_caret_offset);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_changed, (jint)lpStruct->text_changed);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jint)lpStruct->text_caret_moved);
- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jint)lpStruct->text_selection_changed);
+ (*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);
}
#endif
@@ -453,21 +453,21 @@ void cacheGtkAccessibleFields(JNIEnv *env, jobject lpObject)
{
if (GtkAccessibleFc.cached) return;
GtkAccessibleFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkAccessibleFc.widget = (*env)->GetFieldID(env, GtkAccessibleFc.clazz, "widget", "I");
+ GtkAccessibleFc.widget = (*env)->GetFieldID(env, GtkAccessibleFc.clazz, "widget", I_J);
GtkAccessibleFc.cached = 1;
}
GtkAccessible *getGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct)
{
if (!GtkAccessibleFc.cached) cacheGtkAccessibleFields(env, lpObject);
- lpStruct->widget = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkAccessibleFc.widget);
+ lpStruct->widget = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkAccessibleFc.widget);
return lpStruct;
}
void setGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct)
{
if (!GtkAccessibleFc.cached) cacheGtkAccessibleFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkAccessibleFc.widget, (jint)lpStruct->widget);
+ (*env)->SetIntLongField(env, lpObject, GtkAccessibleFc.widget, (jintLong)lpStruct->widget);
}
#endif
diff --git a/atk_structs.h b/atk_structs.h
index 91eb020..85e11a8 100644
--- a/atk_structs.h
+++ b/atk_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
diff --git a/build.sh b/build.sh
index b052c77..1431d6d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#*******************************************************************************
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -14,6 +14,8 @@
cd `dirname $0`
+MAKE_TYPE=make
+
if [ "${JAVA_HOME}" = "" ]; then
echo "Please set JAVA_HOME to point at a JRE."
fi
@@ -29,7 +31,15 @@ fi
case $OS in
"SunOS")
SWT_OS=solaris
+ PROC=`uname -i`
MAKEFILE=make_solaris.mak
+ if uname -p > /dev/null 2>&1; then
+ MODEL=`uname -p`
+ fi
+ if [ ${MODEL} = 'i386' ]; then
+ MAKEFILE=make_solaris_x86.mak
+ MAKE_TYPE=gmake
+ fi
;;
"FreeBSD")
SWT_OS=freebsd
@@ -43,8 +53,8 @@ esac
# Determine which CPU type we are building for
if [ "${MODEL}" = "" ]; then
- if uname -p > /dev/null 2>&1; then
- MODEL=`uname -p`
+ if uname -i > /dev/null 2>&1; then
+ MODEL=`uname -i`
else
MODEL=`uname -m`
fi
@@ -66,7 +76,7 @@ esac
# For 64-bit CPUs, we have a switch
if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
- SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
+ SWT_PTR_CFLAGS=-DJNI64
export SWT_PTR_CFLAGS
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
@@ -104,11 +114,11 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
export MOZILLA_LIBS
MAKE_MOZILLA=make_mozilla
elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
- MOZILLA_INCLUDES=`pkg-config --cflags libxul`
- MOZILLA_LIBS=`pkg-config --libs libxul`
- export MOZILLA_INCLUDES
- export MOZILLA_LIBS
- MAKE_MOZILLA=make_mozilla
+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
+ XULRUNNER_LIBS=`pkg-config --libs libxul`
+ export XULRUNNER_INCLUDES
+ export XULRUNNER_LIBS
+ MAKE_MOZILLA=make_xulrunner
else
echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM"
echo " *** Mozilla embedding support will not be compiled."
@@ -140,7 +150,7 @@ if [ "x${OUTPUT_DIR}" = "x" ]; then
fi
if [ "x${1}" = "xclean" ]; then
- make -f $MAKEFILE clean
+ ${MAKE_TYPE} -f $MAKEFILE clean
else
- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
+ ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
fi
diff --git a/build.xml b/build.xml
index d540cc1..1c64217 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
+ Copyright (c) 2009 IBM Corporation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ IBM Corporation - initial API and implementation
+ -->
<project default="build_gtk_lib" basedir="../../..">
diff --git a/c.c b/c.c
index 1e1bced..15cfa51 100644
--- a/c.c
+++ b/c.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL C_NATIVE(PTR_1sizeof)
#ifndef NO_free
JNIEXPORT void JNICALL C_NATIVE(free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
C_NATIVE_ENTER(env, that, free_FUNC);
free((void *)arg0);
@@ -38,14 +38,14 @@ JNIEXPORT void JNICALL C_NATIVE(free)
#endif
#ifndef NO_getenv
-JNIEXPORT jint JNICALL C_NATIVE(getenv)
+JNIEXPORT jintLong JNICALL C_NATIVE(getenv)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
C_NATIVE_ENTER(env, that, getenv_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)getenv((const char *)lparg0);
+ rc = (jintLong)getenv((const char *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
C_NATIVE_EXIT(env, that, getenv_FUNC);
@@ -54,33 +54,51 @@ fail:
#endif
#ifndef NO_malloc
-JNIEXPORT jint JNICALL C_NATIVE(malloc)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL C_NATIVE(malloc)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
C_NATIVE_ENTER(env, that, malloc_FUNC);
- rc = (jint)malloc(arg0);
+ rc = (jintLong)malloc(arg0);
C_NATIVE_EXIT(env, that, malloc_FUNC);
return rc;
}
#endif
-#ifndef NO_memmove__III
-JNIEXPORT void JNICALL C_NATIVE(memmove__III)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#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 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
-#ifndef NO_memmove__I_3BI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3BI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -99,16 +117,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(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
-#ifndef NO_memmove__I_3CI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3CI)
- (JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -127,16 +156,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(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
-#ifndef NO_memmove__I_3DI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3DI)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -155,16 +195,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(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
-#ifndef NO_memmove__I_3FI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3FI)
- (JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -183,16 +234,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(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
-#ifndef NO_memmove__I_3II
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3II)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -211,16 +273,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(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
-#ifndef NO_memmove__I_3JI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3JI)
- (JNIEnv *env, jclass that, jint arg0, jlongArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -239,16 +312,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(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
-#ifndef NO_memmove__I_3SI
-JNIEXPORT void JNICALL C_NATIVE(memmove__I_3SI)
- (JNIEnv *env, jclass that, jint arg0, jshortArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
@@ -267,16 +351,27 @@ fail:
{
if (arg1 && lparg1) (*env)->ReleaseShortArrayElements(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
-#ifndef NO_memmove___3BII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3BII)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
+#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
{
jbyte *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3BII_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3BJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -295,17 +390,28 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(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
-#ifndef NO_memmove___3B_3CI
-JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CI)
- (JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jint arg2)
+#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
{
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
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -328,16 +434,27 @@ fail:
if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(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
-#ifndef NO_memmove___3CII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3CII)
- (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2)
+#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
{
jchar *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3CII_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3CJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -356,16 +473,27 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(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
-#ifndef NO_memmove___3DII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3DII)
- (JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
+#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
{
jdouble *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3DII_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -384,16 +512,27 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(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
-#ifndef NO_memmove___3FII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3FII)
- (JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jint arg2)
+#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
{
jfloat *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3FII_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3FJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -412,16 +551,27 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(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
-#ifndef NO_memmove___3III
-JNIEXPORT void JNICALL C_NATIVE(memmove___3III)
- (JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
+#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
{
jint *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3III_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3IJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -440,17 +590,28 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(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
-#ifndef NO_memmove___3I_3BI
-JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BI)
- (JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2)
+#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
{
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;
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -471,16 +632,27 @@ fail:
if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(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
-#ifndef NO_memmove___3JII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3JII)
- (JNIEnv *env, jclass that, jlongArray arg0, jint arg1, jint arg2)
+#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
{
jlong *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3JII_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3JJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -499,16 +671,27 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(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
-#ifndef NO_memmove___3SII
-JNIEXPORT void JNICALL C_NATIVE(memmove___3SII)
- (JNIEnv *env, jclass that, jshortArray arg0, jint arg1, jint arg2)
+#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
{
jshort *lparg0=NULL;
+#ifndef JNI64
C_NATIVE_ENTER(env, that, memmove___3SII_FUNC);
+#else
+ C_NATIVE_ENTER(env, that, memmove___3SJJ_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -527,17 +710,21 @@ fail:
{
if (arg0 && lparg0) (*env)->ReleaseShortArrayElements(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 jint JNICALL C_NATIVE(memset)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL C_NATIVE(memset)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
C_NATIVE_ENTER(env, that, memset_FUNC);
- rc = (jint)memset((void *)arg0, arg1, (size_t)arg2);
+ rc = (jintLong)memset((void *)arg0, arg1, (size_t)arg2);
C_NATIVE_EXIT(env, that, memset_FUNC);
return rc;
}
@@ -545,7 +732,7 @@ JNIEXPORT jint JNICALL C_NATIVE(memset)
#ifndef NO_strlen
JNIEXPORT jint JNICALL C_NATIVE(strlen)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
C_NATIVE_ENTER(env, that, strlen_FUNC);
diff --git a/c_stats.c b/c_stats.c
index 277ee15..ee4a74d 100644
--- a/c_stats.c
+++ b/c_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,23 +21,91 @@ 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",
"strlen",
};
diff --git a/c_stats.h b/c_stats.h
index 48fc03e..cc34b1c 100644
--- a/c_stats.h
+++ b/c_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,23 +29,91 @@ 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,
strlen_FUNC,
} C_FUNCS;
diff --git a/c_structs.c b/c_structs.c
index e8aa336..dc2a847 100644
--- a/c_structs.c
+++ b/c_structs.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/c_structs.h b/c_structs.h
index 6f33244..7796b83 100644
--- a/c_structs.h
+++ b/c_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/cairo.c b/cairo.c
index 5a6516f..cbdd5b1 100644
--- a/cairo.c
+++ b/cairo.c
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
@@ -39,7 +39,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1append_1path_FUNC);
cairo_append_path((cairo_t *)arg0, (cairo_path_t *)arg1);
@@ -49,7 +49,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1append_1path)
#ifndef NO__1cairo_1arc
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -59,7 +59,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, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -69,7 +69,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc_1negative)
#ifndef NO__1cairo_1clip
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_FUNC);
cairo_clip((cairo_t *)arg0);
@@ -79,7 +79,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip)
#ifndef NO__1cairo_1clip_1preserve
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip_1preserve)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_1preserve_FUNC);
cairo_clip_preserve((cairo_t *)arg0);
@@ -89,7 +89,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip_1preserve)
#ifndef NO__1cairo_1close_1path
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1close_1path)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1close_1path_FUNC);
cairo_close_path((cairo_t *)arg0);
@@ -99,7 +99,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1page_FUNC);
cairo_copy_page((cairo_t *)arg0);
@@ -108,36 +108,36 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1copy_1page)
#endif
#ifndef NO__1cairo_1copy_1path
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1copy_1path)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1copy_1path)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_FUNC);
- rc = (jint)cairo_copy_path((cairo_t *)arg0);
+ rc = (jintLong)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 jint JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_1flat_FUNC);
- rc = (jint)cairo_copy_path_flat((cairo_t *)arg0);
+ rc = (jintLong)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 jint JNICALL Cairo_NATIVE(_1cairo_1create)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1create)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1create_FUNC);
- rc = (jint)cairo_create((cairo_surface_t *)arg0);
+ rc = (jintLong)cairo_create((cairo_surface_t *)arg0);
Cairo_NATIVE_EXIT(env, that, _1cairo_1create_FUNC);
return rc;
}
@@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1create)
#ifndef NO__1cairo_1curve_1to
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -155,7 +155,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to)
#ifndef NO__1cairo_1destroy
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1destroy_FUNC);
cairo_destroy((cairo_t *)arg0);
@@ -165,7 +165,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy)
#ifndef NO__1cairo_1device_1to_1user
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1device_1to_1user)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -182,7 +182,7 @@ fail:
#ifndef NO__1cairo_1device_1to_1user_1distance
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1device_1to_1user_1distance)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -199,7 +199,7 @@ fail:
#ifndef NO__1cairo_1fill
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_FUNC);
cairo_fill((cairo_t *)arg0);
@@ -209,7 +209,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill)
#ifndef NO__1cairo_1fill_1extents
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1extents)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -232,7 +232,7 @@ fail:
#ifndef NO__1cairo_1fill_1preserve
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1preserve)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_1preserve_FUNC);
cairo_fill_preserve((cairo_t *)arg0);
@@ -242,7 +242,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1preserve)
#ifndef NO__1cairo_1font_1extents
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1extents)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
cairo_font_extents_t _arg1, *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1extents_FUNC);
@@ -255,12 +255,12 @@ fail:
#endif
#ifndef NO__1cairo_1font_1options_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1create_FUNC);
- rc = (jint)cairo_font_options_create();
+ rc = (jintLong)cairo_font_options_create();
Cairo_NATIVE_EXIT(env, that, _1cairo_1font_1options_1create_FUNC);
return rc;
}
@@ -268,7 +268,7 @@ JNIEXPORT jint 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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1destroy_FUNC);
cairo_font_options_destroy((cairo_font_options_t *)arg0);
@@ -278,7 +278,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1get_1antialias_FUNC);
@@ -290,7 +290,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -300,7 +300,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1antialias_FUNC);
@@ -312,7 +312,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, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -329,7 +329,7 @@ fail:
#ifndef NO__1cairo_1get_1fill_1rule
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1fill_1rule_FUNC);
@@ -340,12 +340,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule)
#endif
#ifndef NO__1cairo_1get_1font_1face
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1face_FUNC);
- rc = (jint)cairo_get_font_face((cairo_t *)arg0);
+ rc = (jintLong)cairo_get_font_face((cairo_t *)arg0);
Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1font_1face_FUNC);
return rc;
}
@@ -353,7 +353,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
#ifndef NO__1cairo_1get_1font_1matrix
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1matrix)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1matrix_FUNC);
@@ -367,7 +367,7 @@ fail:
#ifndef NO__1cairo_1get_1font_1options
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1options)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1options_FUNC);
cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
@@ -377,7 +377,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1options)
#ifndef NO__1cairo_1get_1line_1cap
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1cap)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1cap_FUNC);
@@ -389,7 +389,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1cap)
#ifndef NO__1cairo_1get_1line_1join
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1join)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1join_FUNC);
@@ -401,7 +401,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1join)
#ifndef NO__1cairo_1get_1line_1width
JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1line_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jdouble rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1width_FUNC);
@@ -413,7 +413,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1line_1width)
#ifndef NO__1cairo_1get_1matrix
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1matrix)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1matrix_FUNC);
@@ -427,7 +427,7 @@ fail:
#ifndef NO__1cairo_1get_1miter_1limit
JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1miter_1limit)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jdouble rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1miter_1limit_FUNC);
@@ -439,7 +439,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1miter_1limit)
#ifndef NO__1cairo_1get_1operator
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1operator_FUNC);
@@ -450,24 +450,24 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator)
#endif
#ifndef NO__1cairo_1get_1source
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1source)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1source)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1source_FUNC);
- rc = (jint)cairo_get_source((cairo_t *)arg0);
+ rc = (jintLong)cairo_get_source((cairo_t *)arg0);
Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1source_FUNC);
return rc;
}
#endif
#ifndef NO__1cairo_1get_1target
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1target)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1get_1target)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1target_FUNC);
- rc = (jint)cairo_get_target((cairo_t *)arg0);
+ rc = (jintLong)cairo_get_target((cairo_t *)arg0);
Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1target_FUNC);
return rc;
}
@@ -475,7 +475,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1target)
#ifndef NO__1cairo_1get_1tolerance
JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jdouble rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1tolerance_FUNC);
@@ -487,7 +487,7 @@ JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance)
#ifndef NO__1cairo_1glyph_1extents
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1extents)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1glyph_1extents_FUNC);
cairo_glyph_extents((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2, (cairo_text_extents_t *)arg3);
@@ -497,7 +497,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1extents)
#ifndef NO__1cairo_1glyph_1path
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1path)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1glyph_1path_FUNC);
cairo_glyph_path((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2);
@@ -507,7 +507,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1path)
#ifndef NO__1cairo_1identity_1matrix
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1identity_1matrix_FUNC);
cairo_identity_matrix((cairo_t *)arg0);
@@ -516,24 +516,24 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix)
#endif
#ifndef NO__1cairo_1image_1surface_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create)
(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_FUNC);
- rc = (jint)cairo_image_surface_create(arg0, arg1, arg2);
+ rc = (jintLong)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_1create_1for_1data
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_1for_1data_FUNC);
- rc = (jint)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
+ rc = (jintLong)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
Cairo_NATIVE_EXIT(env, that, _1cairo_1image_1surface_1create_1for_1data_FUNC);
return rc;
}
@@ -541,7 +541,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
#ifndef NO__1cairo_1image_1surface_1get_1height
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1height_FUNC);
@@ -553,7 +553,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height)
#ifndef NO__1cairo_1image_1surface_1get_1width
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1width_FUNC);
@@ -565,7 +565,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, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1in_1fill_FUNC);
@@ -577,7 +577,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, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1in_1stroke_FUNC);
@@ -589,7 +589,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, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1line_1to_FUNC);
cairo_line_to((cairo_t *)arg0, arg1, arg2);
@@ -599,7 +599,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1line_1to)
#ifndef NO__1cairo_1mask
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1mask_FUNC);
cairo_mask((cairo_t *)arg0, (cairo_pattern_t *)arg1);
@@ -609,7 +609,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, jint arg0, jint arg1, jdouble arg2, jdouble arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong 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);
@@ -807,7 +807,7 @@ fail:
#ifndef NO__1cairo_1move_1to
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1move_1to)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1move_1to_FUNC);
cairo_move_to((cairo_t *)arg0, arg1, arg2);
@@ -817,7 +817,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1new_1path_FUNC);
cairo_new_path((cairo_t *)arg0);
@@ -827,7 +827,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1new_1path)
#ifndef NO__1cairo_1paint
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_FUNC);
cairo_paint((cairo_t *)arg0);
@@ -837,7 +837,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, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_1with_1alpha_FUNC);
cairo_paint_with_alpha((cairo_t *)arg0, arg1);
@@ -847,7 +847,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1path_1destroy_FUNC);
cairo_path_destroy((cairo_path_t *)arg0);
@@ -857,7 +857,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1path_1destroy)
#ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgb
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgb)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1add_1color_1stop_1rgb_FUNC);
cairo_pattern_add_color_stop_rgb((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4);
@@ -867,7 +867,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgb)
#ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgba
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -876,36 +876,36 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba)
#endif
#ifndef NO__1cairo_1pattern_1create_1for_1surface
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1for_1surface_FUNC);
- rc = (jint)cairo_pattern_create_for_surface((cairo_surface_t *)arg0);
+ rc = (jintLong)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 jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1linear)
(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1linear_FUNC);
- rc = (jint)cairo_pattern_create_linear(arg0, arg1, arg2, arg3);
+ rc = (jintLong)cairo_pattern_create_linear(arg0, arg1, arg2, arg3);
Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1linear_FUNC);
return rc;
}
#endif
#ifndef NO__1cairo_1pattern_1create_1radial
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1radial_FUNC);
- rc = (jint)cairo_pattern_create_radial(arg0, arg1, arg2, arg3, arg4, arg5);
+ rc = (jintLong)cairo_pattern_create_radial(arg0, arg1, arg2, arg3, arg4, arg5);
Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1radial_FUNC);
return rc;
}
@@ -913,7 +913,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
#ifndef NO__1cairo_1pattern_1destroy
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1destroy_FUNC);
cairo_pattern_destroy((cairo_pattern_t *)arg0);
@@ -923,7 +923,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1extend_FUNC);
@@ -935,7 +935,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1extend)
#ifndef NO__1cairo_1pattern_1get_1filter
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1filter)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1filter_FUNC);
@@ -947,7 +947,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1filter)
#ifndef NO__1cairo_1pattern_1get_1matrix
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1matrix)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1matrix_FUNC);
@@ -961,7 +961,7 @@ fail:
#ifndef NO__1cairo_1pattern_1reference
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1reference)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1reference_FUNC);
cairo_pattern_reference((cairo_pattern_t *)arg0);
@@ -971,7 +971,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1reference)
#ifndef NO__1cairo_1pattern_1set_1extend
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1extend)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1extend_FUNC);
cairo_pattern_set_extend((cairo_pattern_t *)arg0, arg1);
@@ -981,7 +981,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1filter_FUNC);
cairo_pattern_set_filter((cairo_pattern_t *)arg0, arg1);
@@ -991,7 +991,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, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1matrix_FUNC);
@@ -1005,24 +1005,16 @@ fail:
#ifndef NO__1cairo_1pdf_1surface_1set_1size
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1pdf_1surface_1set_1size_FUNC);
/*
cairo_pdf_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(cairo_surface_t *, jdouble, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(cairo_pdf_surface_set_size_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "cairo_pdf_surface_set_size");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((cairo_surface_t *)arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, cairo_pdf_surface_set_size)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2);
}
}
Cairo_NATIVE_EXIT(env, that, _1cairo_1pdf_1surface_1set_1size_FUNC);
@@ -1031,24 +1023,16 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size)
#ifndef NO__1cairo_1ps_1surface_1set_1size
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1ps_1surface_1set_1size_FUNC);
/*
cairo_ps_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(cairo_surface_t *, jdouble, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(cairo_ps_surface_set_size_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "cairo_ps_surface_set_size");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((cairo_surface_t *)arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, cairo_ps_surface_set_size)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(cairo_surface_t *, jdouble, jdouble))fp)((cairo_surface_t *)arg0, arg1, arg2);
}
}
Cairo_NATIVE_EXIT(env, that, _1cairo_1ps_1surface_1set_1size_FUNC);
@@ -1057,7 +1041,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size)
#ifndef NO__1cairo_1rectangle
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -1066,12 +1050,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle)
#endif
#ifndef NO__1cairo_1reference
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1reference)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1reference)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1reference_FUNC);
- rc = (jint)cairo_reference((cairo_t *)arg0);
+ rc = (jintLong)cairo_reference((cairo_t *)arg0);
Cairo_NATIVE_EXIT(env, that, _1cairo_1reference_FUNC);
return rc;
}
@@ -1079,7 +1063,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1reference)
#ifndef NO__1cairo_1rel_1curve_1to
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1curve_1to)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1curve_1to_FUNC);
cairo_rel_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6);
@@ -1089,7 +1073,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1curve_1to)
#ifndef NO__1cairo_1rel_1line_1to
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1line_1to)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1line_1to_FUNC);
cairo_rel_line_to((cairo_t *)arg0, arg1, arg2);
@@ -1099,7 +1083,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1line_1to)
#ifndef NO__1cairo_1rel_1move_1to
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1move_1to)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1move_1to_FUNC);
cairo_rel_move_to((cairo_t *)arg0, arg1, arg2);
@@ -1109,7 +1093,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1move_1to)
#ifndef NO__1cairo_1reset_1clip
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1reset_1clip_FUNC);
cairo_reset_clip((cairo_t *)arg0);
@@ -1119,7 +1103,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip)
#ifndef NO__1cairo_1restore
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1restore_FUNC);
cairo_restore((cairo_t *)arg0);
@@ -1129,7 +1113,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore)
#ifndef NO__1cairo_1rotate
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1rotate_FUNC);
cairo_rotate((cairo_t *)arg0, arg1);
@@ -1139,7 +1123,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate)
#ifndef NO__1cairo_1save
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1save_FUNC);
cairo_save((cairo_t *)arg0);
@@ -1149,7 +1133,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save)
#ifndef NO__1cairo_1scale
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1scale)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1scale_FUNC);
cairo_scale((cairo_t *)arg0, arg1, arg2);
@@ -1159,7 +1143,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, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
{
jbyte *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1select_1font_1face_FUNC);
@@ -1173,7 +1157,7 @@ fail:
#ifndef NO__1cairo_1set_1antialias
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1antialias)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1antialias_FUNC);
cairo_set_antialias((cairo_t *)arg0, arg1);
@@ -1183,7 +1167,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, jint arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jint arg2, jdouble arg3)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1dash_FUNC);
@@ -1197,7 +1181,7 @@ fail:
#ifndef NO__1cairo_1set_1fill_1rule
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1fill_1rule)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1fill_1rule_FUNC);
cairo_set_fill_rule((cairo_t *)arg0, arg1);
@@ -1207,7 +1191,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1face_FUNC);
cairo_set_font_face((cairo_t *)arg0, (cairo_font_face_t *)arg1);
@@ -1217,7 +1201,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1face)
#ifndef NO__1cairo_1set_1font_1matrix
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1matrix)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1matrix_FUNC);
@@ -1231,7 +1215,7 @@ fail:
#ifndef NO__1cairo_1set_1font_1options
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1options)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1options_FUNC);
cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
@@ -1241,7 +1225,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1options)
#ifndef NO__1cairo_1set_1font_1size
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1size)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1size_FUNC);
cairo_set_font_size((cairo_t *)arg0, arg1);
@@ -1251,7 +1235,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1cap_FUNC);
cairo_set_line_cap((cairo_t *)arg0, arg1);
@@ -1261,7 +1245,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1join_FUNC);
cairo_set_line_join((cairo_t *)arg0, arg1);
@@ -1271,7 +1255,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, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1line_1width_FUNC);
cairo_set_line_width((cairo_t *)arg0, arg1);
@@ -1281,7 +1265,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, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1matrix_FUNC);
@@ -1295,7 +1279,7 @@ fail:
#ifndef NO__1cairo_1set_1miter_1limit
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1miter_1limit)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1miter_1limit_FUNC);
cairo_set_miter_limit((cairo_t *)arg0, arg1);
@@ -1305,7 +1289,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1operator_FUNC);
cairo_set_operator((cairo_t *)arg0, arg1);
@@ -1315,7 +1299,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, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1source_FUNC);
cairo_set_source((cairo_t *)arg0, (cairo_pattern_t *)arg1);
@@ -1325,7 +1309,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, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -1335,7 +1319,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, jint arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4)
+ (JNIEnv *env, jclass that, jintLong 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);
@@ -1345,7 +1329,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, jint arg0, jint arg1, jdouble arg2, jdouble arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong 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);
@@ -1355,7 +1339,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, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1tolerance_FUNC);
cairo_set_tolerance((cairo_t *)arg0, arg1);
@@ -1365,7 +1349,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1tolerance)
#ifndef NO__1cairo_1show_1glyphs
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1glyphs)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1glyphs_FUNC);
cairo_show_glyphs((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2);
@@ -1375,7 +1359,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1glyphs)
#ifndef NO__1cairo_1show_1page
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1page_FUNC);
cairo_show_page((cairo_t *)arg0);
@@ -1385,7 +1369,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page)
#ifndef NO__1cairo_1show_1text
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1text_FUNC);
@@ -1399,7 +1383,7 @@ fail:
#ifndef NO__1cairo_1status
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1status_FUNC);
@@ -1410,12 +1394,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status)
#endif
#ifndef NO__1cairo_1status_1to_1string
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
(JNIEnv *env, jclass that, jint arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1status_1to_1string_FUNC);
- rc = (jint)cairo_status_to_string(arg0);
+ rc = (jintLong)cairo_status_to_string(arg0);
Cairo_NATIVE_EXIT(env, that, _1cairo_1status_1to_1string_FUNC);
return rc;
}
@@ -1423,7 +1407,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
#ifndef NO__1cairo_1stroke
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_FUNC);
cairo_stroke((cairo_t *)arg0);
@@ -1433,7 +1417,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke)
#ifndef NO__1cairo_1stroke_1extents
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1extents)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -1456,7 +1440,7 @@ fail:
#ifndef NO__1cairo_1stroke_1preserve
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1preserve)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_1preserve_FUNC);
cairo_stroke_preserve((cairo_t *)arg0);
@@ -1465,12 +1449,12 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1preserve)
#endif
#ifndef NO__1cairo_1surface_1create_1similar
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1create_1similar_FUNC);
- rc = (jint)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3);
+ rc = (jintLong)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3);
Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1create_1similar_FUNC);
return rc;
}
@@ -1478,7 +1462,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
#ifndef NO__1cairo_1surface_1destroy
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1destroy_FUNC);
cairo_surface_destroy((cairo_surface_t *)arg0);
@@ -1488,7 +1472,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, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1finish_FUNC);
cairo_surface_finish((cairo_surface_t *)arg0);
@@ -1498,7 +1482,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1finish)
#ifndef NO__1cairo_1surface_1get_1type
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1type_FUNC);
@@ -1506,18 +1490,9 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
rc = (jint)cairo_surface_get_type((cairo_surface_t *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(cairo_surface_t *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(cairo_surface_get_type_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "cairo_surface_get_type");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((cairo_surface_t *)arg0);
+ LOAD_FUNCTION(fp, cairo_surface_get_type)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(cairo_surface_t *))fp)((cairo_surface_t *)arg0);
}
}
Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1get_1type_FUNC);
@@ -1526,12 +1501,12 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
#endif
#ifndef NO__1cairo_1surface_1get_1user_1data
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1user_1data_FUNC);
- rc = (jint)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1);
+ rc = (jintLong)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;
}
@@ -1539,7 +1514,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
#ifndef NO__1cairo_1surface_1reference
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1reference_FUNC);
cairo_surface_reference((cairo_surface_t *)arg0);
@@ -1549,7 +1524,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference)
#ifndef NO__1cairo_1surface_1set_1device_1offset
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1offset)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1device_1offset_FUNC);
cairo_surface_set_device_offset((cairo_surface_t *)arg0, arg1, arg2);
@@ -1559,24 +1534,16 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1offset)
#ifndef NO__1cairo_1surface_1set_1fallback_1resolution
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1fallback_1resolution_FUNC);
/*
cairo_surface_set_fallback_resolution(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jdouble, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(cairo_surface_set_fallback_resolution_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "cairo_surface_set_fallback_resolution");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, cairo_surface_set_fallback_resolution)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jdouble, jdouble))fp)(arg0, arg1, arg2);
}
}
Cairo_NATIVE_EXIT(env, that, _1cairo_1surface_1set_1fallback_1resolution_FUNC);
@@ -1585,7 +1552,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution)
#ifndef NO__1cairo_1surface_1set_1user_1data
JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1user_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
{
jint rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1user_1data_FUNC);
@@ -1597,7 +1564,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1user_1data)
#ifndef NO__1cairo_1text_1extents
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1extents)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
{
jbyte *lparg1=NULL;
cairo_text_extents_t _arg2, *lparg2=NULL;
@@ -1614,7 +1581,7 @@ fail:
#ifndef NO__1cairo_1text_1path
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1path)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1text_1path_FUNC);
@@ -1628,7 +1595,7 @@ fail:
#ifndef NO__1cairo_1transform
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1transform)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1)
{
jdouble *lparg1=NULL;
Cairo_NATIVE_ENTER(env, that, _1cairo_1transform_FUNC);
@@ -1642,7 +1609,7 @@ fail:
#ifndef NO__1cairo_1translate
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1translate_FUNC);
cairo_translate((cairo_t *)arg0, arg1, arg2);
@@ -1652,7 +1619,7 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate)
#ifndef NO__1cairo_1user_1to_1device
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -1669,7 +1636,7 @@ fail:
#ifndef NO__1cairo_1user_1to_1device_1distance
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device_1distance)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -1685,24 +1652,24 @@ fail:
#endif
#ifndef NO__1cairo_1xlib_1surface_1create
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_FUNC);
- rc = (jint)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4);
+ rc = (jintLong)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4);
Cairo_NATIVE_EXIT(env, that, _1cairo_1xlib_1surface_1create_FUNC);
return rc;
}
#endif
#ifndef NO__1cairo_1xlib_1surface_1create_1for_1bitmap
-JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
- rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
+ rc = (jintLong)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
Cairo_NATIVE_EXIT(env, that, _1cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
return rc;
}
@@ -1710,7 +1677,7 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
#ifndef NO__1cairo_1xlib_1surface_1set_1size
JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1set_1size)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1set_1size_FUNC);
cairo_xlib_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
@@ -1778,45 +1745,78 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version)
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II
-JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#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
{
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
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II
-JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#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
{
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
-#ifndef NO_memmove___3DII
-JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DII)
- (JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
+#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
{
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/cairo.h b/cairo.h
index 0ef50a3..eb79671 100644
--- a/cairo.h
+++ b/cairo.h
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2006 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/cairo_custom.h b/cairo_custom.h
index a0aa5d2..9d0ae8d 100644
--- a/cairo_custom.h
+++ b/cairo_custom.h
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2006 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/cairo_stats.c b/cairo_stats.c
index ce8889a..57be51f 100644
--- a/cairo_stats.c
+++ b/cairo_stats.c
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
@@ -169,9 +169,21 @@ char * Cairo_nativeFunctionNames[] = {
"cairo_1path_1t_1sizeof",
"cairo_1text_1extents_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___3DII",
+#else
+ "memmove___3DJJ",
+#endif
};
#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
diff --git a/cairo_stats.h b/cairo_stats.h
index 5cc6a07..1b2a1b5 100644
--- a/cairo_stats.h
+++ b/cairo_stats.h
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
@@ -177,7 +177,19 @@ typedef enum {
cairo_1path_1t_1sizeof_FUNC,
cairo_1text_1extents_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___3DII_FUNC,
+#else
+ memmove___3DJJ_FUNC,
+#endif
} Cairo_FUNCS;
diff --git a/cairo_structs.c b/cairo_structs.c
index 5fe58de..3225703 100644
--- a/cairo_structs.c
+++ b/cairo_structs.c
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
@@ -113,7 +113,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");
+ cairo_path_tFc.data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "data", I_J);
cairo_path_tFc.num_data = (*env)->GetFieldID(env, cairo_path_tFc.clazz, "num_data", "I");
cairo_path_tFc.cached = 1;
}
@@ -122,7 +122,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)->GetIntField(env, lpObject, cairo_path_tFc.data);
+ lpStruct->data = (cairo_path_data_t *)(*env)->GetIntLongField(env, lpObject, cairo_path_tFc.data);
lpStruct->num_data = (*env)->GetIntField(env, lpObject, cairo_path_tFc.num_data);
return lpStruct;
}
@@ -131,7 +131,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)->SetIntField(env, lpObject, cairo_path_tFc.data, (jint)lpStruct->data);
+ (*env)->SetIntLongField(env, lpObject, cairo_path_tFc.data, (jintLong)lpStruct->data);
(*env)->SetIntField(env, lpObject, cairo_path_tFc.num_data, (jint)lpStruct->num_data);
}
#endif
diff --git a/cairo_structs.h b/cairo_structs.h
index 85942ab..3a87645 100644
--- a/cairo_structs.h
+++ b/cairo_structs.h
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/callback.c b/callback.c
index 21d96c4..de5b5c4 100644
--- a/callback.c
+++ b/callback.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,12 +25,22 @@ static CALLBACK_DATA callbackData[MAX_CALLBACKS];
static int callbackEnabled = 1;
static int callbackEntryCount = 0;
static int initialized = 0;
+static jint JNI_VERSION = 0;
#ifdef DEBUG_CALL_PRINTS
static int counter = 0;
#endif
-SWT_PTR callback(int index, ...);
+#ifdef ATOMIC
+#include <libkern/OSAtomic.h>
+#define ATOMIC_INC(value) OSAtomicIncrement32(&value);
+#define ATOMIC_DEC(value) OSAtomicDecrement32(&value);
+#else
+#define ATOMIC_INC(value) value++;
+#define ATOMIC_DEC(value) value--;
+#endif
+
+jintLong callback(int index, ...);
#ifdef USE_ASSEMBLER
@@ -60,40 +70,40 @@ static unsigned char *callbackCode = NULL;
#define FN_0(index) RETURN_TYPE FN(index, 0)() { return RETURN_CAST callback(index); }
/* Function template with 1 argument */
-#define FN_1(index) RETURN_TYPE FN(index, 1)(SWT_PTR p1) { return RETURN_CAST callback(index, p1); }
+#define FN_1(index) RETURN_TYPE FN(index, 1)(jintLong p1) { return RETURN_CAST callback(index, p1); }
/* Function template with 2 arguments */
-#define FN_2(index) RETURN_TYPE FN(index, 2)(SWT_PTR p1, SWT_PTR p2) { return RETURN_CAST callback(index, p1, p2); }
+#define FN_2(index) RETURN_TYPE FN(index, 2)(jintLong p1, jintLong p2) { return RETURN_CAST callback(index, p1, p2); }
/* Function template with 3 arguments */
-#define FN_3(index) RETURN_TYPE FN(index, 3)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3) { return RETURN_CAST callback(index, p1, p2, p3); }
+#define FN_3(index) RETURN_TYPE FN(index, 3)(jintLong p1, jintLong p2, jintLong p3) { return RETURN_CAST callback(index, p1, p2, p3); }
/* Function template with 4 arguments */
-#define FN_4(index) RETURN_TYPE FN(index, 4)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
+#define FN_4(index) RETURN_TYPE FN(index, 4)(jintLong p1, jintLong p2, jintLong p3, jintLong p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
/* Function template with 5 arguments */
-#define FN_5(index) RETURN_TYPE FN(index, 5)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
+#define FN_5(index) RETURN_TYPE FN(index, 5)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
/* Function template with 6 arguments */
-#define FN_6(index) RETURN_TYPE FN(index, 6)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
+#define FN_6(index) RETURN_TYPE FN(index, 6)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
/* Function template with 7 arguments */
-#define FN_7(index) RETURN_TYPE FN(index, 7)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
+#define FN_7(index) RETURN_TYPE FN(index, 7)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
/* Function template with 8 arguments */
-#define FN_8(index) RETURN_TYPE FN(index, 8)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
+#define FN_8(index) RETURN_TYPE FN(index, 8)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
/* Function template with 9 arguments */
-#define FN_9(index) RETURN_TYPE FN(index, 9)(SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
+#define FN_9(index) RETURN_TYPE FN(index, 9)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
/* Function template with 10 arguments */
-#define FN_10(index) RETURN_TYPE FN(index, 10) (SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9, SWT_PTR p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
+#define FN_10(index) RETURN_TYPE FN(index, 10) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
/* Function template with 11 arguments */
-#define FN_11(index) RETURN_TYPE FN(index, 11) (SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9, SWT_PTR p10, SWT_PTR p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
+#define FN_11(index) RETURN_TYPE FN(index, 11) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10, jintLong p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
/* Function template with 12 arguments */
-#define FN_12(index) RETURN_TYPE FN(index, 12) (SWT_PTR p1, SWT_PTR p2, SWT_PTR p3, SWT_PTR p4, SWT_PTR p5, SWT_PTR p6, SWT_PTR p7, SWT_PTR p8, SWT_PTR p9, SWT_PTR p10, SWT_PTR p11, SWT_PTR p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
+#define FN_12(index) RETURN_TYPE FN(index, 12) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10, jintLong p11, jintLong p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
/**
* Define all functions with the specified number of arguments.
@@ -280,159 +290,159 @@ FN_BLOCK(12)
*/
#if MAX_CALLBACKS == 16
#define FN_A_BLOCK(args) { \
- (SWT_PTR)FN(0, args), \
- (SWT_PTR)FN(1, args), \
- (SWT_PTR)FN(2, args), \
- (SWT_PTR)FN(3, args), \
- (SWT_PTR)FN(4, args), \
- (SWT_PTR)FN(5, args), \
- (SWT_PTR)FN(6, args), \
- (SWT_PTR)FN(7, args), \
- (SWT_PTR)FN(8, args), \
- (SWT_PTR)FN(9, args), \
- (SWT_PTR)FN(10, args), \
- (SWT_PTR)FN(11, args), \
- (SWT_PTR)FN(12, args), \
- (SWT_PTR)FN(13, args), \
- (SWT_PTR)FN(14, args), \
- (SWT_PTR)FN(15, args), \
+ (jintLong)FN(0, args), \
+ (jintLong)FN(1, args), \
+ (jintLong)FN(2, args), \
+ (jintLong)FN(3, args), \
+ (jintLong)FN(4, args), \
+ (jintLong)FN(5, args), \
+ (jintLong)FN(6, args), \
+ (jintLong)FN(7, args), \
+ (jintLong)FN(8, args), \
+ (jintLong)FN(9, args), \
+ (jintLong)FN(10, args), \
+ (jintLong)FN(11, args), \
+ (jintLong)FN(12, args), \
+ (jintLong)FN(13, args), \
+ (jintLong)FN(14, args), \
+ (jintLong)FN(15, args), \
},
#elif MAX_CALLBACKS == 128
#define FN_A_BLOCK(args) { \
- (SWT_PTR)FN(0, args), \
- (SWT_PTR)FN(1, args), \
- (SWT_PTR)FN(2, args), \
- (SWT_PTR)FN(3, args), \
- (SWT_PTR)FN(4, args), \
- (SWT_PTR)FN(5, args), \
- (SWT_PTR)FN(6, args), \
- (SWT_PTR)FN(7, args), \
- (SWT_PTR)FN(8, args), \
- (SWT_PTR)FN(9, args), \
- (SWT_PTR)FN(10, args), \
- (SWT_PTR)FN(11, args), \
- (SWT_PTR)FN(12, args), \
- (SWT_PTR)FN(13, args), \
- (SWT_PTR)FN(14, args), \
- (SWT_PTR)FN(15, args), \
- (SWT_PTR)FN(16, args), \
- (SWT_PTR)FN(17, args), \
- (SWT_PTR)FN(18, args), \
- (SWT_PTR)FN(19, args), \
- (SWT_PTR)FN(20, args), \
- (SWT_PTR)FN(21, args), \
- (SWT_PTR)FN(22, args), \
- (SWT_PTR)FN(23, args), \
- (SWT_PTR)FN(24, args), \
- (SWT_PTR)FN(25, args), \
- (SWT_PTR)FN(26, args), \
- (SWT_PTR)FN(27, args), \
- (SWT_PTR)FN(28, args), \
- (SWT_PTR)FN(29, args), \
- (SWT_PTR)FN(30, args), \
- (SWT_PTR)FN(31, args), \
- (SWT_PTR)FN(32, args), \
- (SWT_PTR)FN(33, args), \
- (SWT_PTR)FN(34, args), \
- (SWT_PTR)FN(35, args), \
- (SWT_PTR)FN(36, args), \
- (SWT_PTR)FN(37, args), \
- (SWT_PTR)FN(38, args), \
- (SWT_PTR)FN(39, args), \
- (SWT_PTR)FN(40, args), \
- (SWT_PTR)FN(41, args), \
- (SWT_PTR)FN(42, args), \
- (SWT_PTR)FN(43, args), \
- (SWT_PTR)FN(44, args), \
- (SWT_PTR)FN(45, args), \
- (SWT_PTR)FN(46, args), \
- (SWT_PTR)FN(47, args), \
- (SWT_PTR)FN(48, args), \
- (SWT_PTR)FN(49, args), \
- (SWT_PTR)FN(50, args), \
- (SWT_PTR)FN(51, args), \
- (SWT_PTR)FN(52, args), \
- (SWT_PTR)FN(53, args), \
- (SWT_PTR)FN(54, args), \
- (SWT_PTR)FN(55, args), \
- (SWT_PTR)FN(56, args), \
- (SWT_PTR)FN(57, args), \
- (SWT_PTR)FN(58, args), \
- (SWT_PTR)FN(59, args), \
- (SWT_PTR)FN(60, args), \
- (SWT_PTR)FN(61, args), \
- (SWT_PTR)FN(62, args), \
- (SWT_PTR)FN(63, args), \
- (SWT_PTR)FN(64, args), \
- (SWT_PTR)FN(65, args), \
- (SWT_PTR)FN(66, args), \
- (SWT_PTR)FN(67, args), \
- (SWT_PTR)FN(68, args), \
- (SWT_PTR)FN(69, args), \
- (SWT_PTR)FN(70, args), \
- (SWT_PTR)FN(71, args), \
- (SWT_PTR)FN(72, args), \
- (SWT_PTR)FN(73, args), \
- (SWT_PTR)FN(74, args), \
- (SWT_PTR)FN(75, args), \
- (SWT_PTR)FN(76, args), \
- (SWT_PTR)FN(77, args), \
- (SWT_PTR)FN(78, args), \
- (SWT_PTR)FN(79, args), \
- (SWT_PTR)FN(80, args), \
- (SWT_PTR)FN(81, args), \
- (SWT_PTR)FN(82, args), \
- (SWT_PTR)FN(83, args), \
- (SWT_PTR)FN(84, args), \
- (SWT_PTR)FN(85, args), \
- (SWT_PTR)FN(86, args), \
- (SWT_PTR)FN(87, args), \
- (SWT_PTR)FN(88, args), \
- (SWT_PTR)FN(89, args), \
- (SWT_PTR)FN(90, args), \
- (SWT_PTR)FN(91, args), \
- (SWT_PTR)FN(92, args), \
- (SWT_PTR)FN(93, args), \
- (SWT_PTR)FN(94, args), \
- (SWT_PTR)FN(95, args), \
- (SWT_PTR)FN(96, args), \
- (SWT_PTR)FN(97, args), \
- (SWT_PTR)FN(98, args), \
- (SWT_PTR)FN(99, args), \
- (SWT_PTR)FN(100, args), \
- (SWT_PTR)FN(101, args), \
- (SWT_PTR)FN(102, args), \
- (SWT_PTR)FN(103, args), \
- (SWT_PTR)FN(104, args), \
- (SWT_PTR)FN(105, args), \
- (SWT_PTR)FN(106, args), \
- (SWT_PTR)FN(107, args), \
- (SWT_PTR)FN(108, args), \
- (SWT_PTR)FN(109, args), \
- (SWT_PTR)FN(110, args), \
- (SWT_PTR)FN(111, args), \
- (SWT_PTR)FN(112, args), \
- (SWT_PTR)FN(113, args), \
- (SWT_PTR)FN(114, args), \
- (SWT_PTR)FN(115, args), \
- (SWT_PTR)FN(116, args), \
- (SWT_PTR)FN(117, args), \
- (SWT_PTR)FN(118, args), \
- (SWT_PTR)FN(119, args), \
- (SWT_PTR)FN(120, args), \
- (SWT_PTR)FN(121, args), \
- (SWT_PTR)FN(122, args), \
- (SWT_PTR)FN(123, args), \
- (SWT_PTR)FN(124, args), \
- (SWT_PTR)FN(125, args), \
- (SWT_PTR)FN(126, args), \
- (SWT_PTR)FN(127, args), \
+ (jintLong)FN(0, args), \
+ (jintLong)FN(1, args), \
+ (jintLong)FN(2, args), \
+ (jintLong)FN(3, args), \
+ (jintLong)FN(4, args), \
+ (jintLong)FN(5, args), \
+ (jintLong)FN(6, args), \
+ (jintLong)FN(7, args), \
+ (jintLong)FN(8, args), \
+ (jintLong)FN(9, args), \
+ (jintLong)FN(10, args), \
+ (jintLong)FN(11, args), \
+ (jintLong)FN(12, args), \
+ (jintLong)FN(13, args), \
+ (jintLong)FN(14, args), \
+ (jintLong)FN(15, args), \
+ (jintLong)FN(16, args), \
+ (jintLong)FN(17, args), \
+ (jintLong)FN(18, args), \
+ (jintLong)FN(19, args), \
+ (jintLong)FN(20, args), \
+ (jintLong)FN(21, args), \
+ (jintLong)FN(22, args), \
+ (jintLong)FN(23, args), \
+ (jintLong)FN(24, args), \
+ (jintLong)FN(25, args), \
+ (jintLong)FN(26, args), \
+ (jintLong)FN(27, args), \
+ (jintLong)FN(28, args), \
+ (jintLong)FN(29, args), \
+ (jintLong)FN(30, args), \
+ (jintLong)FN(31, args), \
+ (jintLong)FN(32, args), \
+ (jintLong)FN(33, args), \
+ (jintLong)FN(34, args), \
+ (jintLong)FN(35, args), \
+ (jintLong)FN(36, args), \
+ (jintLong)FN(37, args), \
+ (jintLong)FN(38, args), \
+ (jintLong)FN(39, args), \
+ (jintLong)FN(40, args), \
+ (jintLong)FN(41, args), \
+ (jintLong)FN(42, args), \
+ (jintLong)FN(43, args), \
+ (jintLong)FN(44, args), \
+ (jintLong)FN(45, args), \
+ (jintLong)FN(46, args), \
+ (jintLong)FN(47, args), \
+ (jintLong)FN(48, args), \
+ (jintLong)FN(49, args), \
+ (jintLong)FN(50, args), \
+ (jintLong)FN(51, args), \
+ (jintLong)FN(52, args), \
+ (jintLong)FN(53, args), \
+ (jintLong)FN(54, args), \
+ (jintLong)FN(55, args), \
+ (jintLong)FN(56, args), \
+ (jintLong)FN(57, args), \
+ (jintLong)FN(58, args), \
+ (jintLong)FN(59, args), \
+ (jintLong)FN(60, args), \
+ (jintLong)FN(61, args), \
+ (jintLong)FN(62, args), \
+ (jintLong)FN(63, args), \
+ (jintLong)FN(64, args), \
+ (jintLong)FN(65, args), \
+ (jintLong)FN(66, args), \
+ (jintLong)FN(67, args), \
+ (jintLong)FN(68, args), \
+ (jintLong)FN(69, args), \
+ (jintLong)FN(70, args), \
+ (jintLong)FN(71, args), \
+ (jintLong)FN(72, args), \
+ (jintLong)FN(73, args), \
+ (jintLong)FN(74, args), \
+ (jintLong)FN(75, args), \
+ (jintLong)FN(76, args), \
+ (jintLong)FN(77, args), \
+ (jintLong)FN(78, args), \
+ (jintLong)FN(79, args), \
+ (jintLong)FN(80, args), \
+ (jintLong)FN(81, args), \
+ (jintLong)FN(82, args), \
+ (jintLong)FN(83, args), \
+ (jintLong)FN(84, args), \
+ (jintLong)FN(85, args), \
+ (jintLong)FN(86, args), \
+ (jintLong)FN(87, args), \
+ (jintLong)FN(88, args), \
+ (jintLong)FN(89, args), \
+ (jintLong)FN(90, args), \
+ (jintLong)FN(91, args), \
+ (jintLong)FN(92, args), \
+ (jintLong)FN(93, args), \
+ (jintLong)FN(94, args), \
+ (jintLong)FN(95, args), \
+ (jintLong)FN(96, args), \
+ (jintLong)FN(97, args), \
+ (jintLong)FN(98, args), \
+ (jintLong)FN(99, args), \
+ (jintLong)FN(100, args), \
+ (jintLong)FN(101, args), \
+ (jintLong)FN(102, args), \
+ (jintLong)FN(103, args), \
+ (jintLong)FN(104, args), \
+ (jintLong)FN(105, args), \
+ (jintLong)FN(106, args), \
+ (jintLong)FN(107, args), \
+ (jintLong)FN(108, args), \
+ (jintLong)FN(109, args), \
+ (jintLong)FN(110, args), \
+ (jintLong)FN(111, args), \
+ (jintLong)FN(112, args), \
+ (jintLong)FN(113, args), \
+ (jintLong)FN(114, args), \
+ (jintLong)FN(115, args), \
+ (jintLong)FN(116, args), \
+ (jintLong)FN(117, args), \
+ (jintLong)FN(118, args), \
+ (jintLong)FN(119, args), \
+ (jintLong)FN(120, args), \
+ (jintLong)FN(121, args), \
+ (jintLong)FN(122, args), \
+ (jintLong)FN(123, args), \
+ (jintLong)FN(124, args), \
+ (jintLong)FN(125, args), \
+ (jintLong)FN(126, args), \
+ (jintLong)FN(127, args), \
},
#else
#error Invalid MAX_CALLBACKS
#endif /* MAX_CALLBACKS == 16 */
-SWT_PTR fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = {
+jintLong fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = {
FN_A_BLOCK(0)
FN_A_BLOCK(1)
FN_A_BLOCK(2)
@@ -452,14 +462,15 @@ SWT_PTR fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = {
/* --------------- callback class calls --------------- */
-JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
- (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, SWT_PTR errorResult)
+JNIEXPORT jintLong JNICALL Java_org_eclipse_swt_internal_Callback_bind
+ (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, jintLong errorResult)
{
int i;
jmethodID mid = NULL;
jclass javaClass = that;
const char *methodString = NULL, *sigString = NULL;
if (jvm == NULL) (*env)->GetJavaVM(env, &jvm);
+ if (JNI_VERSION == 0) JNI_VERSION = (*env)->GetVersion(env);
if (!initialized) {
memset(&callbackData, 0, sizeof(callbackData));
initialized = 1;
@@ -487,11 +498,14 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
callbackData[i].errorResult = errorResult;
callbackData[i].methodID = mid;
#ifndef USE_ASSEMBLER
- return (SWT_PTR) fnx_array[argCount][i];
+ return (jintLong) fnx_array[argCount][i];
#else
{
- int j = 0, k, pad = 0;
+ int j = 0, k;
unsigned char* code;
+#ifdef __APPLE__
+ int pad = 0;
+#endif
if (callbackCode == NULL) {
#if defined (_WIN32) || defined (_WIN32_WCE)
callbackCode = VirtualAlloc(NULL, CALLBACK_THUNK_SIZE * MAX_CALLBACKS, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
@@ -512,7 +526,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
#ifdef __APPLE__
/* darwin calling conventions require that the stack be aligned on a 16-byte boundary. */
- k = (argCount+3)*sizeof(SWT_PTR);
+ k = (argCount+3)*sizeof(jintLong);
pad = ((k + 15) & ~15) - k;
if (pad > 0) {
//SUB ESP,pad - 3 bytes
@@ -523,7 +537,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
#endif
// 3*argCount bytes
- for (k=(argCount + 1) * sizeof(SWT_PTR); k >= sizeof(SWT_PTR)*2; k -= sizeof(SWT_PTR)) {
+ for (k=(argCount + 1) * sizeof(jintLong); k >= sizeof(jintLong)*2; k -= sizeof(jintLong)) {
//PUSH SS:[EBP+k]
code[j++] = 0xff;
code[j++] = 0x75;
@@ -543,31 +557,31 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
code[j++] = i;
}
- //MOV EAX callback - 1 + sizeof(SWT_PTR) bytes
+ //MOV EAX callback - 1 + sizeof(jintLong) bytes
code[j++] = 0xb8;
- ((SWT_PTR *)&code[j])[0] = (SWT_PTR)&callback;
- j += sizeof(SWT_PTR);
+ ((jintLong *)&code[j])[0] = (jintLong)&callback;
+ j += sizeof(jintLong);
//CALL EAX - 2 bytes
code[j++] = 0xff;
code[j++] = 0xd0;
- //ADD ESP,(argCount + 1) * sizeof(SWT_PTR) - 3 bytes
+ //ADD ESP,(argCount + 1) * sizeof(jintLong) - 3 bytes
code[j++] = 0x83;
code[j++] = 0xc4;
#ifdef __APPLE__
- code[j++] = (unsigned char)(pad + ((argCount + 1) * sizeof(SWT_PTR)));
+ code[j++] = (unsigned char)(pad + ((argCount + 1) * sizeof(jintLong)));
#else
- code[j++] = (unsigned char)((argCount + 1) * sizeof(SWT_PTR));
+ code[j++] = (unsigned char)((argCount + 1) * sizeof(jintLong));
#endif
//POP EBP - 1 byte
code[j++] = 0x5d;
#if defined (_WIN32) || defined (_WIN32_WCE)
- //RETN argCount * sizeof(SWT_PTR) - 3 bytes
+ //RETN argCount * sizeof(jintLong) - 3 bytes
code[j++] = 0xc2;
- code[j++] = (unsigned char)(argCount * sizeof(SWT_PTR));
+ code[j++] = (unsigned char)(argCount * sizeof(jintLong));
code[j++] = 0x00;
#else
//RETN - 1 byte
@@ -579,7 +593,7 @@ JNIEXPORT SWT_PTR JNICALL Java_org_eclipse_swt_internal_Callback_bind
(*env)->ThrowNew(env, errorClass, "Callback thunk overflow");
}
- return (SWT_PTR)code;
+ return (jintLong)code;
}
#endif /* USE_ASSEMBLER */
}
@@ -625,7 +639,7 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_reset
memset((void *)&callbackData, 0, sizeof(callbackData));
}
-SWT_PTR callback(int index, ...)
+jintLong callback(int index, ...)
{
if (!callbackEnabled) return 0;
@@ -636,7 +650,7 @@ SWT_PTR callback(int index, ...)
jboolean isStatic = callbackData[index].isStatic;
jboolean isArrayBased = callbackData[index].isArrayBased;
jint argCount = callbackData[index].argCount;
- SWT_PTR result = callbackData[index].errorResult;
+ jintLong result = callbackData[index].errorResult;
int detach = 0;
va_list vl;
@@ -650,6 +664,14 @@ SWT_PTR callback(int index, ...)
}
#endif
+#ifdef JNI_VERSION_1_4
+ if (env == NULL) {
+ if (JNI_VERSION >= JNI_VERSION_1_4) {
+ (*jvm)->AttachCurrentThreadAsDaemon(jvm, (void **)&env, NULL);
+ }
+ }
+#endif
+
if (env == NULL) {
(*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
if (IS_JNI_1_2) detach = 1;
@@ -669,22 +691,22 @@ SWT_PTR callback(int index, ...)
}
/* Call into the VM. */
- callbackEntryCount++;
+ ATOMIC_INC(callbackEntryCount);
va_start(vl, index);
if (isArrayBased) {
int i;
- SWT_PTRArray argsArray = (*env)->NewSWT_PTRArray(env, argCount);
+ jintLongArray argsArray = (*env)->NewIntLongArray(env, argCount);
if (argsArray != NULL) {
- SWT_PTR *elements = (*env)->GetSWT_PTRArrayElements(env, argsArray, NULL);
+ jintLong *elements = (*env)->GetIntLongArrayElements(env, argsArray, NULL);
if (elements != NULL) {
for (i=0; i<argCount; i++) {
- elements[i] = va_arg(vl, SWT_PTR);
+ elements[i] = va_arg(vl, jintLong);
}
- (*env)->ReleaseSWT_PTRArrayElements(env, argsArray, elements, 0);
+ (*env)->ReleaseIntLongArrayElements(env, argsArray, elements, 0);
if (isStatic) {
- result = (*env)->CallStaticSWT_PTRMethod(env, object, mid, argsArray);
+ result = (*env)->CallStaticIntLongMethod(env, object, mid, argsArray);
} else {
- result = (*env)->CallSWT_PTRMethod(env, object, mid, argsArray);
+ result = (*env)->CallIntLongMethod(env, object, mid, argsArray);
}
}
/*
@@ -695,13 +717,13 @@ SWT_PTR callback(int index, ...)
}
} else {
if (isStatic) {
- result = (*env)->CallStaticSWT_PTRMethodV(env, object, mid, vl);
+ result = (*env)->CallStaticIntLongMethodV(env, object, mid, vl);
} else {
- result = (*env)->CallSWT_PTRMethodV(env, object, mid, vl);
+ result = (*env)->CallIntLongMethodV(env, object, mid, vl);
}
}
va_end(vl);
- callbackEntryCount--;
+ ATOMIC_DEC(callbackEntryCount);
done:
/* If an exception has occurred in Java, return the error result. */
diff --git a/callback.h b/callback.h
index 39152ae..040ac69 100644
--- a/callback.h
+++ b/callback.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
#endif
#ifndef RETURN_TYPE
-#define RETURN_TYPE SWT_PTR
+#define RETURN_TYPE jintLong
#endif
#ifndef RETURN_CAST
@@ -57,7 +57,7 @@ typedef struct CALLBACK_DATA {
jboolean isStatic;
jboolean isArrayBased;
jint argCount;
- SWT_PTR errorResult;
+ jintLong errorResult;
} CALLBACK_DATA;
#endif /* ifndef INC_callback_H */
diff --git a/cde.c b/cde.c
index f8b12e4..0840e83 100644
--- a/cde.c
+++ b/cde.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,7 +29,7 @@ JNIEXPORT jint JNICALL CDE_NATIVE(DtActionArg_1sizeof)
#ifndef NO__1DtActionInvoke
JNIEXPORT jlong JNICALL CDE_NATIVE(_1DtActionInvoke)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jbyteArray arg6, jint arg7, jintLong arg8, jintLong arg9)
{
jbyte *lparg1=NULL;
DtActionArg _arg2, *lparg2=NULL;
@@ -57,7 +57,7 @@ fail:
#ifndef NO__1DtAppInitialize
JNIEXPORT jboolean JNICALL CDE_NATIVE(_1DtAppInitialize)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jbyteArray arg4)
{
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
@@ -101,30 +101,30 @@ fail:
#endif
#ifndef NO__1DtDtsDataTypeNames
-JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsDataTypeNames)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1DtDtsDataTypeNames)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
CDE_NATIVE_ENTER(env, that, _1DtDtsDataTypeNames_FUNC);
- rc = (jint)DtDtsDataTypeNames();
+ rc = (jintLong)DtDtsDataTypeNames();
CDE_NATIVE_EXIT(env, that, _1DtDtsDataTypeNames_FUNC);
return rc;
}
#endif
#ifndef NO__1DtDtsDataTypeToAttributeValue
-JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsDataTypeToAttributeValue)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1DtDtsDataTypeToAttributeValue)
(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jbyteArray arg2)
{
jbyte *lparg0=NULL;
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
- jint rc = 0;
+ jintLong rc = 0;
CDE_NATIVE_ENTER(env, that, _1DtDtsDataTypeToAttributeValue_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- rc = (jint)DtDtsDataTypeToAttributeValue((char *)lparg0, (char *)lparg1, (char *)lparg2);
+ rc = (jintLong)DtDtsDataTypeToAttributeValue((char *)lparg0, (char *)lparg1, (char *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
@@ -135,14 +135,14 @@ fail:
#endif
#ifndef NO__1DtDtsFileToDataType
-JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsFileToDataType)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1DtDtsFileToDataType)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
CDE_NATIVE_ENTER(env, that, _1DtDtsFileToDataType_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)DtDtsFileToDataType((char *)lparg0);
+ rc = (jintLong)DtDtsFileToDataType((char *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
CDE_NATIVE_EXIT(env, that, _1DtDtsFileToDataType_FUNC);
@@ -152,7 +152,7 @@ fail:
#ifndef NO__1DtDtsFreeAttributeValue
JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeAttributeValue)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
CDE_NATIVE_ENTER(env, that, _1DtDtsFreeAttributeValue_FUNC);
DtDtsFreeAttributeValue((char *)arg0);
@@ -162,7 +162,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeAttributeValue)
#ifndef NO__1DtDtsFreeDataType
JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataType)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
CDE_NATIVE_ENTER(env, that, _1DtDtsFreeDataType_FUNC);
DtDtsFreeDataType((char *)arg0);
@@ -172,7 +172,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataType)
#ifndef NO__1DtDtsFreeDataTypeNames
JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataTypeNames)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
CDE_NATIVE_ENTER(env, that, _1DtDtsFreeDataTypeNames_FUNC);
DtDtsFreeDataTypeNames((char **)arg0);
@@ -181,20 +181,20 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataTypeNames)
#endif
#ifndef NO__1XtAppCreateShell
-JNIEXPORT jint JNICALL CDE_NATIVE(_1XtAppCreateShell)
- (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1XtAppCreateShell)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLongArray arg4, jint arg5)
{
jbyte *lparg0=NULL;
jbyte *lparg1=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
CDE_NATIVE_ENTER(env, that, _1XtAppCreateShell_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
- rc = (jint)XtAppCreateShell((String)lparg0, (String)lparg1, (WidgetClass)arg2, (Display *)arg3, (ArgList)lparg4, arg5);
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ rc = (jintLong)XtAppCreateShell((String)lparg0, (String)lparg1, (WidgetClass)arg2, (Display *)arg3, (ArgList)lparg4, arg5);
fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
CDE_NATIVE_EXIT(env, that, _1XtAppCreateShell_FUNC);
@@ -203,12 +203,12 @@ fail:
#endif
#ifndef NO__1XtCreateApplicationContext
-JNIEXPORT jint JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
CDE_NATIVE_ENTER(env, that, _1XtCreateApplicationContext_FUNC);
- rc = (jint)XtCreateApplicationContext();
+ rc = (jintLong)XtCreateApplicationContext();
CDE_NATIVE_EXIT(env, that, _1XtCreateApplicationContext_FUNC);
return rc;
}
@@ -216,18 +216,18 @@ JNIEXPORT jint JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
#ifndef NO__1XtDisplayInitialize
JNIEXPORT void JNICALL CDE_NATIVE(_1XtDisplayInitialize)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6, jint arg7)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintLong arg4, jint arg5, jintLongArray arg6, jint arg7)
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
- jint *lparg6=NULL;
+ jintLong *lparg6=NULL;
CDE_NATIVE_ENTER(env, that, _1XtDisplayInitialize_FUNC);
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
XtDisplayInitialize((XtAppContext)arg0, (Display *)arg1, (String)lparg2, (String)lparg3, (XrmOptionDescRec *)arg4, (Cardinal)arg5, (int *)lparg6, (String *)arg7);
fail:
- if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+ if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
CDE_NATIVE_EXIT(env, that, _1XtDisplayInitialize_FUNC);
@@ -236,7 +236,7 @@ fail:
#ifndef NO__1XtRealizeWidget
JNIEXPORT void JNICALL CDE_NATIVE(_1XtRealizeWidget)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
CDE_NATIVE_ENTER(env, that, _1XtRealizeWidget_FUNC);
XtRealizeWidget((Widget)arg0);
@@ -246,7 +246,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1XtRealizeWidget)
#ifndef NO__1XtResizeWidget
JNIEXPORT void JNICALL CDE_NATIVE(_1XtResizeWidget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
{
CDE_NATIVE_ENTER(env, that, _1XtResizeWidget_FUNC);
XtResizeWidget((Widget)arg0, arg1, arg2, arg3);
@@ -256,7 +256,7 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1XtResizeWidget)
#ifndef NO__1XtSetMappedWhenManaged
JNIEXPORT void JNICALL CDE_NATIVE(_1XtSetMappedWhenManaged)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
CDE_NATIVE_ENTER(env, that, _1XtSetMappedWhenManaged_FUNC);
XtSetMappedWhenManaged((Widget)arg0, arg1);
@@ -275,12 +275,12 @@ JNIEXPORT void JNICALL CDE_NATIVE(_1XtToolkitInitialize)
#endif
#ifndef NO__1topLevelShellWidgetClass
-JNIEXPORT jint JNICALL CDE_NATIVE(_1topLevelShellWidgetClass)
+JNIEXPORT jintLong JNICALL CDE_NATIVE(_1topLevelShellWidgetClass)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
CDE_NATIVE_ENTER(env, that, _1topLevelShellWidgetClass_FUNC);
- rc = (jint)topLevelShellWidgetClass;
+ rc = (jintLong)topLevelShellWidgetClass;
CDE_NATIVE_EXIT(env, that, _1topLevelShellWidgetClass_FUNC);
return rc;
}
diff --git a/cde_stats.c b/cde_stats.c
index 8ccfdc3..1011b90 100644
--- a/cde_stats.c
+++ b/cde_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/cde_stats.h b/cde_stats.h
index 5b56173..6a762cf 100644
--- a/cde_stats.h
+++ b/cde_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/cde_structs.c b/cde_structs.c
index 01663ca..07aadbc 100644
--- a/cde_structs.c
+++ b/cde_structs.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@ void cacheDtActionArgFields(JNIEnv *env, jobject lpObject)
if (DtActionArgFc.cached) return;
DtActionArgFc.clazz = (*env)->GetObjectClass(env, lpObject);
DtActionArgFc.argClass = (*env)->GetFieldID(env, DtActionArgFc.clazz, "argClass", "I");
- DtActionArgFc.name = (*env)->GetFieldID(env, DtActionArgFc.clazz, "name", "I");
+ DtActionArgFc.name = (*env)->GetFieldID(env, DtActionArgFc.clazz, "name", I_J);
DtActionArgFc.cached = 1;
}
@@ -34,7 +34,7 @@ DtActionArg *getDtActionArgFields(JNIEnv *env, jobject lpObject, DtActionArg *lp
{
if (!DtActionArgFc.cached) cacheDtActionArgFields(env, lpObject);
lpStruct->argClass = (*env)->GetIntField(env, lpObject, DtActionArgFc.argClass);
- lpStruct->u.file.name = (char *)(*env)->GetIntField(env, lpObject, DtActionArgFc.name);
+ lpStruct->u.file.name = (char *)(*env)->GetIntLongField(env, lpObject, DtActionArgFc.name);
return lpStruct;
}
@@ -42,7 +42,7 @@ void setDtActionArgFields(JNIEnv *env, jobject lpObject, DtActionArg *lpStruct)
{
if (!DtActionArgFc.cached) cacheDtActionArgFields(env, lpObject);
(*env)->SetIntField(env, lpObject, DtActionArgFc.argClass, (jint)lpStruct->argClass);
- (*env)->SetIntField(env, lpObject, DtActionArgFc.name, (jint)lpStruct->u.file.name);
+ (*env)->SetIntLongField(env, lpObject, DtActionArgFc.name, (jintLong)lpStruct->u.file.name);
}
#endif
diff --git a/cde_structs.h b/cde_structs.h
index e36e896..92a5821 100644
--- a/cde_structs.h
+++ b/cde_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/debian/Makefile b/debian/Makefile
index 7008424..3c6a238 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -1,4 +1,4 @@
-RELEASE=3.4.2
+RELEASE=3.5.1
JAVA=swt-gtk-$(RELEASE).jar
CLEANFILES=*.files *.jar *-stamp
diff --git a/debian/changelog b/debian/changelog
index 99e3abd..2f795fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+swt-gtk (3.5.1-1~1.gbp0a3f85) UNRELEASED; urgency=low
+
+ ** SNAPSHOT build @0a3f850e24cad4b963bd8f17cc5d61fc84281088 **
+
+ * New upstream release. Closes: #XXXXX.
+ * debian/control: Add Vcs-* fields for Git repository.
+ * debian/copyright: Minor updates.
+ * debian/rules: Fix default-java path around AWT_LIB_PATH.
+
+ -- Adrian Perez <adrianperez.deb at gmail.com> Mon, 30 Nov 2009 23:13:20 -0500
+
swt-gtk (3.4.2-3) unstable; urgency=medium
* debian/control:
diff --git a/debian/control b/debian/control
index 53a9eed..6929a35 100644
--- a/debian/control
+++ b/debian/control
@@ -11,11 +11,10 @@ Vcs-Git: git://git.debian.org/git/pkg-java/swt-gtk.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/swt-gtk.git
Homepage: http://www.eclipse.org/swt/
-Package: libswt-gtk-3.4-java
+Package: libswt-gtk-3.5-java
Architecture: any
Section: java
-Depends: libswt-gtk-3.4-jni (= ${binary:Version})
- | libswt3.4-gtk-jni (= 3.4.2), ${misc:Depends}
+Depends: libswt-gtk-3.5-jni (= ${binary:Version}), ${misc:Depends}
Suggests: libswt-gtk-3.4-java-gcj
Description: Standard Widget Toolkit for GTK+ Java library
The SWT component is designed to provide efficient, portable access to
@@ -24,10 +23,10 @@ Description: Standard Widget Toolkit for GTK+ Java library
.
This package includes the SWT JAR libraries.
-Package: libswt-gtk-3.4-jni
+Package: libswt-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libswt-gnome-gtk-3.4-jni
+Suggests: libswt-gnome-gtk-3.5-jni
Conflicts: libswt3.4-gtk-jni
Description: Standard Widget Toolkit for GTK+ JNI library
The SWT component is designed to provide efficient, portable access to
@@ -36,7 +35,7 @@ Description: Standard Widget Toolkit for GTK+ JNI library
.
This package includes the JNI libraries.
-Package: libswt-gnome-gtk-3.4-jni
+Package: libswt-gnome-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libswt3.4-gtk-jni
@@ -47,7 +46,7 @@ Description: Standard Widget Toolkit for GTK+ GNOME JNI library
.
This package includes the GNOME JNI library.
-Package: libswt-mozilla-gtk-3.4-jni
+Package: libswt-mozilla-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libswt3.4-gtk-jni
@@ -58,7 +57,7 @@ Description: Standard Widget Toolkit for GTK+ Mozilla JNI library
.
This package includes the Mozilla JNI libraries.
-Package: libswt-cairo-gtk-3.4-jni
+Package: libswt-cairo-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libswt3.4-gtk-jni
@@ -69,7 +68,7 @@ Description: Standard Widget Toolkit for GTK+ Cairo JNI library
.
This package includes the Cairo JNI libraries.
-Package: libswt-glx-gtk-3.4-jni
+Package: libswt-glx-gtk-3.5-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libswt3.4-gtk-jni
@@ -80,14 +79,14 @@ Description: Standard Widget Toolkit for GTK+ GLX JNI library
.
This package includes the GLX JNI libraries.
-Package: libswt-gtk-3.4-java-gcj
+Package: libswt-gtk-3.5-java-gcj
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
- libswt-cairo-gtk-3.4-jni (= ${binary:Version}),
- libswt-glx-gtk-3.4-jni (= ${binary:Version}),
- libswt-gnome-gtk-3.4-jni (= ${binary:Version}),
- libswt-gtk-3.4-jni (= ${binary:Version}),
- libswt-mozilla-gtk-3.4-jni (= ${binary:Version})
+ libswt-cairo-gtk-3.5-jni (= ${binary:Version}),
+ libswt-glx-gtk-3.5-jni (= ${binary:Version}),
+ libswt-gnome-gtk-3.5-jni (= ${binary:Version}),
+ libswt-gtk-3.5-jni (= ${binary:Version}),
+ libswt-mozilla-gtk-3.5-jni (= ${binary:Version})
Description: Standard Widget Toolkit for GTK+ native library
The SWT component is designed to provide efficient, portable access to
the user-interface facilities of the operating systems on which it is
diff --git a/debian/copyright b/debian/copyright
index 8f6304d..5403df1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,6 +20,11 @@ Files: cairo*.[c|h], org/eclipse/swt/internal/cairo/*
Copyright: 2000-2007, IBM Corporation
License: MPL-1.1
+Files: nsIScript*
+Copyright: 2009, IBM Corporation and others
+ 1998-1999, Netscape Communications Corporation
+License: MPL-1.1
+
Files: org/eclipse/swt/internal/mozilla/[^GRE]*.java
Copyright: 2003-2008, IBM Corporation
1998-1999, Netscape Communications Corporation
diff --git a/debian/java-config/libswt-gtk-3.4-java b/debian/java-config/libswt-gtk-3.5-java
similarity index 100%
rename from debian/java-config/libswt-gtk-3.4-java
rename to debian/java-config/libswt-gtk-3.5-java
diff --git a/debian/libswt-cairo-gtk-3.4-jni.install b/debian/libswt-cairo-gtk-3.5-jni.install
similarity index 100%
rename from debian/libswt-cairo-gtk-3.4-jni.install
rename to debian/libswt-cairo-gtk-3.5-jni.install
diff --git a/debian/libswt-glx-gtk-3.4-jni.install b/debian/libswt-glx-gtk-3.5-jni.install
similarity index 100%
rename from debian/libswt-glx-gtk-3.4-jni.install
rename to debian/libswt-glx-gtk-3.5-jni.install
diff --git a/debian/libswt-gnome-gtk-3.4-jni.install b/debian/libswt-gnome-gtk-3.5-jni.install
similarity index 100%
rename from debian/libswt-gnome-gtk-3.4-jni.install
rename to debian/libswt-gnome-gtk-3.5-jni.install
diff --git a/debian/libswt-gtk-3.4-java.install b/debian/libswt-gtk-3.5-java.install
similarity index 100%
rename from debian/libswt-gtk-3.4-java.install
rename to debian/libswt-gtk-3.5-java.install
diff --git a/debian/libswt-gtk-3.4-java.postinst b/debian/libswt-gtk-3.5-java.postinst
similarity index 67%
rename from debian/libswt-gtk-3.4-java.postinst
rename to debian/libswt-gtk-3.5-java.postinst
index cec9a48..cd4c61f 100644
--- a/debian/libswt-gtk-3.4-java.postinst
+++ b/debian/libswt-gtk-3.5-java.postinst
@@ -4,14 +4,14 @@ set -e
case "$1" in
configure)
update-alternatives --install \
- /usr/share/java-config/libswt-3.4-java \
- libswt-3.4-java \
- /usr/share/java-config/libswt-gtk-3.4-java \
+ /usr/share/java-config/libswt-3.5-java \
+ libswt-3.5-java \
+ /usr/share/java-config/libswt-gtk-3.5-java \
103
update-alternatives --install \
/usr/share/java/swt.jar \
swt.jar \
- /usr/lib/java/swt-gtk-3.4.2.jar \
+ /usr/lib/java/swt-gtk-3.5.1.jar \
103
;;
diff --git a/debian/libswt-gtk-3.4-java.prerm b/debian/libswt-gtk-3.5-java.prerm
similarity index 61%
rename from debian/libswt-gtk-3.4-java.prerm
rename to debian/libswt-gtk-3.5-java.prerm
index a6d5599..9c3c03c 100644
--- a/debian/libswt-gtk-3.4-java.prerm
+++ b/debian/libswt-gtk-3.5-java.prerm
@@ -3,10 +3,10 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove libswt-3.4-java \
- /usr/share/java-config/libswt-gtk-3.4-java
+ update-alternatives --remove libswt-3.5-java \
+ /usr/share/java-config/libswt-gtk-3.5-java
update-alternatives --remove swt.jar \
- /usr/lib/java/swt-gtk-3.4.2.jar
+ /usr/lib/java/swt-gtk-3.5.1.jar
;;
failed-upgrade)
;;
diff --git a/debian/libswt-gtk-3.4-jni.install b/debian/libswt-gtk-3.5-jni.install
similarity index 100%
rename from debian/libswt-gtk-3.4-jni.install
rename to debian/libswt-gtk-3.5-jni.install
diff --git a/debian/libswt-mozilla-gtk-3.4-jni.install b/debian/libswt-mozilla-gtk-3.5-jni.install
similarity index 100%
rename from debian/libswt-mozilla-gtk-3.4-jni.install
rename to debian/libswt-mozilla-gtk-3.5-jni.install
diff --git a/debian/patches/64/arch64.diff b/debian/patches/64/x86_64.diff
similarity index 53%
rename from debian/patches/64/arch64.diff
rename to debian/patches/64/x86_64.diff
index 45f5891..154b738 100644
--- a/debian/patches/64/arch64.diff
+++ b/debian/patches/64/x86_64.diff
@@ -1,4366 +1,6 @@
-diff -ur x86/atk.c x86_64/atk.c
---- x86/atk.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/atk.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-@@ -44,72 +44,72 @@
- #endif
-
- #ifndef NO__1ATK_1ACTION_1GET_1IFACE
--JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1ACTION_1GET_1IFACE)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1ATK_1ACTION_1GET_1IFACE_FUNC);
-- rc = (jint)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 jint JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1COMPONENT_1GET_1IFACE)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1ATK_1COMPONENT_1GET_1IFACE_FUNC);
-- rc = (jint)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_1OBJECT_1FACTORY_1CLASS
--JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC);
-- rc = (jint)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 jint JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1SELECTION_1GET_1IFACE)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1ATK_1SELECTION_1GET_1IFACE_FUNC);
-- rc = (jint)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_1TEXT_1GET_1IFACE
--JNIEXPORT jint JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1TEXT_1GET_1IFACE)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1ATK_1TEXT_1GET_1IFACE_FUNC);
-- rc = (jint)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__1GTK_1ACCESSIBLE
--JNIEXPORT jint JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1GTK_1ACCESSIBLE)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC);
-- rc = (jint)GTK_ACCESSIBLE(arg0);
-+ rc = (jlong)GTK_ACCESSIBLE(arg0);
- ATK_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC);
- return rc;
- }
-@@ -117,7 +117,7 @@
-
- #ifndef NO__1atk_1focus_1tracker_1notify
- JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1focus_1tracker_1notify)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- ATK_NATIVE_ENTER(env, that, _1atk_1focus_1tracker_1notify_FUNC);
- atk_focus_tracker_notify((AtkObject *)arg0);
-@@ -126,36 +126,36 @@
- #endif
-
- #ifndef NO__1atk_1get_1default_1registry
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1get_1default_1registry)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1get_1default_1registry_FUNC);
-- rc = (jint)atk_get_default_registry();
-+ rc = (jlong)atk_get_default_registry();
- ATK_NATIVE_EXIT(env, that, _1atk_1get_1default_1registry_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1atk_1object_1factory_1create_1accessible
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1object_1factory_1create_1accessible)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
-- rc = (jint)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
-+ rc = (jlong)atk_object_factory_create_accessible((AtkObjectFactory *)arg0, (GObject *)arg1);
- ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1create_1accessible_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1atk_1object_1factory_1get_1accessible_1type
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1object_1factory_1get_1accessible_1type)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1object_1factory_1get_1accessible_1type_FUNC);
-- rc = (jint)atk_object_factory_get_accessible_type((AtkObjectFactory *)arg0);
-+ rc = (jlong)atk_object_factory_get_accessible_type((AtkObjectFactory *)arg0);
- ATK_NATIVE_EXIT(env, that, _1atk_1object_1factory_1get_1accessible_1type_FUNC);
- return rc;
- }
-@@ -163,7 +163,7 @@
-
- #ifndef NO__1atk_1object_1initialize
- JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1object_1initialize)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- ATK_NATIVE_ENTER(env, that, _1atk_1object_1initialize_FUNC);
- atk_object_initialize((AtkObject *)arg0, (gpointer)arg1);
-@@ -172,24 +172,24 @@
- #endif
-
- #ifndef NO__1atk_1object_1ref_1relation_1set
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1object_1ref_1relation_1set)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
-- rc = (jint)atk_object_ref_relation_set((AtkObject *)arg0);
-+ rc = (jlong)atk_object_ref_relation_set((AtkObject *)arg0);
- ATK_NATIVE_EXIT(env, that, _1atk_1object_1ref_1relation_1set_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1atk_1registry_1get_1factory
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1registry_1get_1factory)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1registry_1get_1factory_FUNC);
-- rc = (jint)atk_registry_get_factory((AtkRegistry *)arg0, (GType)arg1);
-+ rc = (jlong)atk_registry_get_factory((AtkRegistry *)arg0, (GType)arg1);
- ATK_NATIVE_EXIT(env, that, _1atk_1registry_1get_1factory_FUNC);
- return rc;
- }
-@@ -197,7 +197,7 @@
-
- #ifndef NO__1atk_1registry_1set_1factory_1type
- JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1registry_1set_1factory_1type)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- ATK_NATIVE_ENTER(env, that, _1atk_1registry_1set_1factory_1type_FUNC);
- atk_registry_set_factory_type((AtkRegistry *)arg0, (GType)arg1, (GType)arg2);
-@@ -207,7 +207,7 @@
-
- #ifndef NO__1atk_1relation_1set_1get_1n_1relations
- JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1n_1relations)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1n_1relations_FUNC);
-@@ -218,12 +218,12 @@
- #endif
-
- #ifndef NO__1atk_1relation_1set_1get_1relation
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1relation_1set_1get_1relation)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
-- rc = (jint)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
-+ rc = (jlong)atk_relation_set_get_relation((AtkRelationSet *)arg0, arg1);
- ATK_NATIVE_EXIT(env, that, _1atk_1relation_1set_1get_1relation_FUNC);
- return rc;
- }
-@@ -231,7 +231,7 @@
-
- #ifndef NO__1atk_1relation_1set_1remove
- JNIEXPORT void JNICALL ATK_NATIVE(_1atk_1relation_1set_1remove)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- ATK_NATIVE_ENTER(env, that, _1atk_1relation_1set_1remove_FUNC);
- atk_relation_set_remove((AtkRelationSet *)arg0, (AtkRelation *)arg1);
-@@ -241,7 +241,7 @@
-
- #ifndef NO__1atk_1state_1set_1add_1state
- JNIEXPORT jboolean JNICALL ATK_NATIVE(_1atk_1state_1set_1add_1state)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -252,236 +252,236 @@
- #endif
-
- #ifndef NO__1atk_1state_1set_1new
--JNIEXPORT jint JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1atk_1state_1set_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- ATK_NATIVE_ENTER(env, that, _1atk_1state_1set_1new_FUNC);
-- rc = (jint)atk_state_set_new();
-+ rc = (jlong)atk_state_set_new();
- ATK_NATIVE_EXIT(env, that, _1atk_1state_1set_1new_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1call__II
--JNIEXPORT jint JNICALL ATK_NATIVE(_1call__II)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+#ifndef NO__1call__JJ
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-- ATK_NATIVE_ENTER(env, that, _1call__II_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1);
-- ATK_NATIVE_EXIT(env, that, _1call__II_FUNC);
-+ jlong rc = 0;
-+ ATK_NATIVE_ENTER(env, that, _1call__JJ_FUNC);
-+ rc = (jlong)((jlong (*)())arg0)(arg1);
-+ ATK_NATIVE_EXIT(env, that, _1call__JJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1call__III
--JNIEXPORT jint JNICALL ATK_NATIVE(_1call__III)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+#ifndef NO__1call__JJJ
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
-- jint rc = 0;
-- ATK_NATIVE_ENTER(env, that, _1call__III_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1, arg2);
-- ATK_NATIVE_EXIT(env, that, _1call__III_FUNC);
-+ jlong rc = 0;
-+ ATK_NATIVE_ENTER(env, that, _1call__JJJ_FUNC);
-+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2);
-+ ATK_NATIVE_EXIT(env, that, _1call__JJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1call__IIII
--JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+#ifndef NO__1call__JJJJ
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
- {
-- jint rc = 0;
-- ATK_NATIVE_ENTER(env, that, _1call__IIII_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
-- ATK_NATIVE_EXIT(env, that, _1call__IIII_FUNC);
-+ jlong rc = 0;
-+ ATK_NATIVE_ENTER(env, that, _1call__JJJJ_FUNC);
-+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
-+ ATK_NATIVE_EXIT(env, that, _1call__JJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1call__IIIII
--JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+#ifndef NO__1call__JJJJJ
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
- {
-- jint rc = 0;
-- ATK_NATIVE_ENTER(env, that, _1call__IIIII_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4);
-- ATK_NATIVE_EXIT(env, that, _1call__IIIII_FUNC);
-+ jlong rc = 0;
-+ ATK_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC);
-+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4);
-+ ATK_NATIVE_EXIT(env, that, _1call__JJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1call__IIIIII
--JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+#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)
- {
-- jint rc = 0;
-- ATK_NATIVE_ENTER(env, that, _1call__IIIIII_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
-- ATK_NATIVE_EXIT(env, that, _1call__IIIIII_FUNC);
-+ jlong rc = 0;
-+ ATK_NATIVE_ENTER(env, that, _1call__JJJJJJ_FUNC);
-+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
-+ ATK_NATIVE_EXIT(env, that, _1call__JJJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1call__IIIIIII
--JNIEXPORT jint JNICALL ATK_NATIVE(_1call__IIIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+#ifndef NO__1call__JJJJJJJ
-+JNIEXPORT jlong JNICALL ATK_NATIVE(_1call__JJJJJJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
- {
-- jint rc = 0;
-- ATK_NATIVE_ENTER(env, that, _1call__IIIIIII_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
-- ATK_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC);
-+ jlong rc = 0;
-+ ATK_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC);
-+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
-+ ATK_NATIVE_EXIT(env, that, _1call__JJJJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
- if (arg1) getAtkActionIfaceFields(env, arg1, (AtkActionIface *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
- if (arg1) getAtkComponentIfaceFields(env, arg1, (AtkComponentIface *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
- if (arg1) getAtkHypertextIfaceFields(env, arg1, (AtkHypertextIface *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
- if (arg1) getAtkObjectClassFields(env, arg1, (AtkObjectClass *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2
-+JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
- if (arg1) getAtkObjectFactoryClassFields(env, arg1, (AtkObjectFactoryClass *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
- if (arg1) getAtkSelectionIfaceFields(env, arg1, (AtkSelectionIface *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
- if (arg1) getAtkTextIfaceFields(env, arg1, (AtkTextIface *)arg0);
-- ATK_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC);
- if (arg0) setAtkActionIfaceFields(env, arg0, (AtkActionIface *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC);
- if (arg0) setAtkComponentIfaceFields(env, arg0, (AtkComponentIface *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC);
- if (arg0) setAtkHypertextIfaceFields(env, arg0, (AtkHypertextIface *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC);
- if (arg0) setAtkObjectClassFields(env, arg0, (AtkObjectClass *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J
-+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC);
- if (arg0) setAtkObjectFactoryClassFields(env, arg0, (AtkObjectFactoryClass *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC);
- if (arg0) setAtkSelectionIfaceFields(env, arg0, (AtkSelectionIface *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#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)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC);
- if (arg0) setAtkTextIfaceFields(env, arg0, (AtkTextIface *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I
--JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J
-+JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC);
-+ ATK_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC);
- if (arg0) setGtkAccessibleFields(env, arg0, (GtkAccessible *)arg1);
-- ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC);
-+ ATK_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC);
- }
- #endif
-
-diff -ur x86/atk_stats.c x86_64/atk_stats.c
---- x86/atk_stats.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/atk_stats.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-@@ -42,27 +42,27 @@
- "_1atk_1relation_1set_1remove",
- "_1atk_1state_1set_1add_1state",
- "_1atk_1state_1set_1new",
-- "_1call__II",
-- "_1call__III",
-- "_1call__IIII",
-- "_1call__IIIII",
-- "_1call__IIIIII",
-- "_1call__IIIIIII",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2",
-- "memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I",
-- "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I",
-+ "_1call__JJ",
-+ "_1call__JJJ",
-+ "_1call__JJJJ",
-+ "_1call__JJJJJ",
-+ "_1call__JJJJJJ",
-+ "_1call__JJJJJJJ",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2",
-+ "memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J",
-+ "memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J",
- };
-
- #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
-diff -ur x86/atk_stats.h x86_64/atk_stats.h
---- x86/atk_stats.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/atk_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-@@ -50,25 +50,25 @@
- _1atk_1relation_1set_1remove_FUNC,
- _1atk_1state_1set_1add_1state_FUNC,
- _1atk_1state_1set_1new_FUNC,
-- _1call__II_FUNC,
-- _1call__III_FUNC,
-- _1call__IIII_FUNC,
-- _1call__IIIII_FUNC,
-- _1call__IIIIII_FUNC,
-- _1call__IIIIIII_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2I_FUNC,
-+ _1call__JJ_FUNC,
-+ _1call__JJJ_FUNC,
-+ _1call__JJJJ_FUNC,
-+ _1call__JJJJJ_FUNC,
-+ _1call__JJJJJJ_FUNC,
-+ _1call__JJJJJJJ_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkObjectFactoryClass_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_accessibility_gtk_GtkAccessible_2J_FUNC,
- } ATK_FUNCS;
-diff -ur x86/atk_structs.c x86_64/atk_structs.c
---- x86/atk_structs.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/atk_structs.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-@@ -29,36 +29,36 @@
- {
- if (AtkActionIfaceFc.cached) return;
- AtkActionIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkActionIfaceFc.do_action = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "do_action", "I");
-- AtkActionIfaceFc.get_n_actions = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_n_actions", "I");
-- AtkActionIfaceFc.get_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_description", "I");
-- AtkActionIfaceFc.get_name = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_name", "I");
-- AtkActionIfaceFc.get_keybinding = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "get_keybinding", "I");
-- AtkActionIfaceFc.set_description = (*env)->GetFieldID(env, AtkActionIfaceFc.clazz, "set_description", "I");
-+ 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)->GetIntField(env, lpObject, AtkActionIfaceFc.do_action);
-- lpStruct->get_n_actions = (gint (*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_n_actions);
-- lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_description);
-- lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_name);
-- lpStruct->get_keybinding = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkActionIfaceFc.get_keybinding);
-- lpStruct->set_description = (gboolean (*)())(*env)->GetIntField(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 = (G_CONST_RETURN gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_description);
-+ lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_name);
-+ lpStruct->get_keybinding = (G_CONST_RETURN 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)->SetIntField(env, lpObject, AtkActionIfaceFc.do_action, (jint)lpStruct->do_action);
-- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_n_actions, (jint)lpStruct->get_n_actions);
-- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_description, (jint)lpStruct->get_description);
-- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_name, (jint)lpStruct->get_name);
-- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.get_keybinding, (jint)lpStruct->get_keybinding);
-- (*env)->SetIntField(env, lpObject, AtkActionIfaceFc.set_description, (jint)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
-
-@@ -75,57 +75,57 @@
- {
- if (AtkComponentIfaceFc.cached) return;
- AtkComponentIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkComponentIfaceFc.add_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "add_focus_handler", "I");
-- AtkComponentIfaceFc.contains = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "contains", "I");
-- AtkComponentIfaceFc.ref_accessible_at_point = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "ref_accessible_at_point", "I");
-- AtkComponentIfaceFc.get_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_extents", "I");
-- AtkComponentIfaceFc.get_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_position", "I");
-- AtkComponentIfaceFc.get_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_size", "I");
-- AtkComponentIfaceFc.grab_focus = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "grab_focus", "I");
-- AtkComponentIfaceFc.remove_focus_handler = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "remove_focus_handler", "I");
-- AtkComponentIfaceFc.set_extents = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_extents", "I");
-- AtkComponentIfaceFc.set_position = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_position", "I");
-- AtkComponentIfaceFc.set_size = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "set_size", "I");
-- AtkComponentIfaceFc.get_layer = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_layer", "I");
-- AtkComponentIfaceFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkComponentIfaceFc.clazz, "get_mdi_zorder", "I");
-+ 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)->GetIntField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
-- lpStruct->contains = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.contains);
-- lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
-- lpStruct->get_extents = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_extents);
-- lpStruct->get_position = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_position);
-- lpStruct->get_size = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_size);
-- lpStruct->grab_focus = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.grab_focus);
-- lpStruct->remove_focus_handler = (void (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
-- lpStruct->set_extents = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_extents);
-- lpStruct->set_position = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_position);
-- lpStruct->set_size = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.set_size);
-- lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntField(env, lpObject, AtkComponentIfaceFc.get_layer);
-- lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntField(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)->SetIntField(env, lpObject, AtkComponentIfaceFc.add_focus_handler, (jint)lpStruct->add_focus_handler);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.contains, (jint)lpStruct->contains);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point, (jint)lpStruct->ref_accessible_at_point);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_extents, (jint)lpStruct->get_extents);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_position, (jint)lpStruct->get_position);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_size, (jint)lpStruct->get_size);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.grab_focus, (jint)lpStruct->grab_focus);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler, (jint)lpStruct->remove_focus_handler);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_extents, (jint)lpStruct->set_extents);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_position, (jint)lpStruct->set_position);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.set_size, (jint)lpStruct->set_size);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_layer, (jint)lpStruct->get_layer);
-- (*env)->SetIntField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder, (jint)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
-
-@@ -142,27 +142,27 @@
- {
- if (AtkHypertextIfaceFc.cached) return;
- AtkHypertextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkHypertextIfaceFc.get_link = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link", "I");
-- AtkHypertextIfaceFc.get_n_links = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_n_links", "I");
-- AtkHypertextIfaceFc.get_link_index = (*env)->GetFieldID(env, AtkHypertextIfaceFc.clazz, "get_link_index", "I");
-+ 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)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_link);
-- lpStruct->get_n_links = (gint (*)())(*env)->GetIntField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
-- lpStruct->get_link_index = (gint (*)())(*env)->GetIntField(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)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_link, (jint)lpStruct->get_link);
-- (*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_n_links, (jint)lpStruct->get_n_links);
-- (*env)->SetIntField(env, lpObject, AtkHypertextIfaceFc.get_link_index, (jint)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
-
-@@ -179,87 +179,87 @@
- {
- if (AtkObjectClassFc.cached) return;
- AtkObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkObjectClassFc.get_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_name", "I");
-- AtkObjectClassFc.get_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_description", "I");
-- AtkObjectClassFc.get_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_parent", "I");
-- AtkObjectClassFc.get_n_children = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_n_children", "I");
-- AtkObjectClassFc.ref_child = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_child", "I");
-- AtkObjectClassFc.get_index_in_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_index_in_parent", "I");
-- AtkObjectClassFc.ref_relation_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_relation_set", "I");
-- AtkObjectClassFc.get_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_role", "I");
-- AtkObjectClassFc.get_layer = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_layer", "I");
-- AtkObjectClassFc.get_mdi_zorder = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "get_mdi_zorder", "I");
-- AtkObjectClassFc.ref_state_set = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "ref_state_set", "I");
-- AtkObjectClassFc.set_name = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_name", "I");
-- AtkObjectClassFc.set_description = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_description", "I");
-- AtkObjectClassFc.set_parent = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_parent", "I");
-- AtkObjectClassFc.set_role = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "set_role", "I");
-- AtkObjectClassFc.connect_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "connect_property_change_handler", "I");
-- AtkObjectClassFc.remove_property_change_handler = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "remove_property_change_handler", "I");
-- AtkObjectClassFc.initialize = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "initialize", "I");
-- AtkObjectClassFc.children_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "children_changed", "I");
-- AtkObjectClassFc.focus_event = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "focus_event", "I");
-- AtkObjectClassFc.property_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "property_change", "I");
-- AtkObjectClassFc.state_change = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "state_change", "I");
-- AtkObjectClassFc.visible_data_changed = (*env)->GetFieldID(env, AtkObjectClassFc.clazz, "visible_data_changed", "I");
-+ 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.cached = 1;
- }
-
- AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
- {
- if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
-- lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_name);
-- lpStruct->get_description = (G_CONST_RETURN gchar *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_description);
-- lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_parent);
-- lpStruct->get_n_children = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_n_children);
-- lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_child);
-- lpStruct->get_index_in_parent = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
-- lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_relation_set);
-- lpStruct->get_role = (AtkRole (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_role);
-- lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_layer);
-- lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
-- lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.ref_state_set);
-- lpStruct->set_name = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_name);
-- lpStruct->set_description = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_description);
-- lpStruct->set_parent = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_parent);
-- lpStruct->set_role = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.set_role);
-- lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
-- lpStruct->remove_property_change_handler = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
-- lpStruct->initialize = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.initialize);
-- lpStruct->children_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.children_changed);
-- lpStruct->focus_event = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.focus_event);
-- lpStruct->property_change = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.property_change);
-- lpStruct->state_change = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.state_change);
-- lpStruct->visible_data_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectClassFc.visible_data_changed);
-+ lpStruct->get_name = (G_CONST_RETURN gchar *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_name);
-+ lpStruct->get_description = (G_CONST_RETURN 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);
- return lpStruct;
- }
-
- void setAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
- {
- if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_name, (jint)lpStruct->get_name);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_description, (jint)lpStruct->get_description);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_parent, (jint)lpStruct->get_parent);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_n_children, (jint)lpStruct->get_n_children);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_child, (jint)lpStruct->ref_child);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_index_in_parent, (jint)lpStruct->get_index_in_parent);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_relation_set, (jint)lpStruct->ref_relation_set);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_role, (jint)lpStruct->get_role);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_layer, (jint)lpStruct->get_layer);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.get_mdi_zorder, (jint)lpStruct->get_mdi_zorder);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.ref_state_set, (jint)lpStruct->ref_state_set);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_name, (jint)lpStruct->set_name);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_description, (jint)lpStruct->set_description);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_parent, (jint)lpStruct->set_parent);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.set_role, (jint)lpStruct->set_role);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.connect_property_change_handler, (jint)lpStruct->connect_property_change_handler);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.remove_property_change_handler, (jint)lpStruct->remove_property_change_handler);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.initialize, (jint)lpStruct->initialize);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.children_changed, (jint)lpStruct->children_changed);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.focus_event, (jint)lpStruct->focus_event);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.property_change, (jint)lpStruct->property_change);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.state_change, (jint)lpStruct->state_change);
-- (*env)->SetIntField(env, lpObject, AtkObjectClassFc.visible_data_changed, (jint)lpStruct->visible_data_changed);
-+ (*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);
- }
- #endif
-
-@@ -276,27 +276,27 @@
- {
- if (AtkObjectFactoryClassFc.cached) return;
- AtkObjectFactoryClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkObjectFactoryClassFc.create_accessible = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "create_accessible", "I");
-- AtkObjectFactoryClassFc.invalidate = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "invalidate", "I");
-- AtkObjectFactoryClassFc.get_accessible_type = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "get_accessible_type", "I");
-+ AtkObjectFactoryClassFc.create_accessible = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "create_accessible", "J");
-+ AtkObjectFactoryClassFc.invalidate = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "invalidate", "J");
-+ AtkObjectFactoryClassFc.get_accessible_type = (*env)->GetFieldID(env, AtkObjectFactoryClassFc.clazz, "get_accessible_type", "J");
- AtkObjectFactoryClassFc.cached = 1;
- }
-
- AtkObjectFactoryClass *getAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
- {
- if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
-- lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
-- lpStruct->invalidate = (void (*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
-- lpStruct->get_accessible_type = (GType (*)())(*env)->GetIntField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
-+ lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
-+ lpStruct->invalidate = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
-+ lpStruct->get_accessible_type = (GType (*)())(*env)->GetLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
- return lpStruct;
- }
-
- void setAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
- {
- if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.create_accessible, (jint)lpStruct->create_accessible);
-- (*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.invalidate, (jint)lpStruct->invalidate);
-- (*env)->SetIntField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type, (jint)lpStruct->get_accessible_type);
-+ (*env)->SetLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible, (jlong)lpStruct->create_accessible);
-+ (*env)->SetLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate, (jlong)lpStruct->invalidate);
-+ (*env)->SetLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type, (jlong)lpStruct->get_accessible_type);
- }
- #endif
-
-@@ -313,42 +313,42 @@
- {
- if (AtkSelectionIfaceFc.cached) return;
- AtkSelectionIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkSelectionIfaceFc.add_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "add_selection", "I");
-- AtkSelectionIfaceFc.clear_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "clear_selection", "I");
-- AtkSelectionIfaceFc.ref_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "ref_selection", "I");
-- AtkSelectionIfaceFc.get_selection_count = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "get_selection_count", "I");
-- AtkSelectionIfaceFc.is_child_selected = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "is_child_selected", "I");
-- AtkSelectionIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "remove_selection", "I");
-- AtkSelectionIfaceFc.select_all_selection = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "select_all_selection", "I");
-- AtkSelectionIfaceFc.selection_changed = (*env)->GetFieldID(env, AtkSelectionIfaceFc.clazz, "selection_changed", "I");
-+ 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)->GetIntField(env, lpObject, AtkSelectionIfaceFc.add_selection);
-- lpStruct->clear_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
-- lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
-- lpStruct->get_selection_count = (gint (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
-- lpStruct->is_child_selected = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
-- lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
-- lpStruct->select_all_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
-- lpStruct->selection_changed = (void (*)())(*env)->GetIntField(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)->SetIntField(env, lpObject, AtkSelectionIfaceFc.add_selection, (jint)lpStruct->add_selection);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.clear_selection, (jint)lpStruct->clear_selection);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.ref_selection, (jint)lpStruct->ref_selection);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.get_selection_count, (jint)lpStruct->get_selection_count);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.is_child_selected, (jint)lpStruct->is_child_selected);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.remove_selection, (jint)lpStruct->remove_selection);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.select_all_selection, (jint)lpStruct->select_all_selection);
-- (*env)->SetIntField(env, lpObject, AtkSelectionIfaceFc.selection_changed, (jint)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
-
-@@ -365,78 +365,78 @@
- {
- if (AtkTextIfaceFc.cached) return;
- AtkTextIfaceFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- AtkTextIfaceFc.get_text = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text", "I");
-- AtkTextIfaceFc.get_text_after_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_after_offset", "I");
-- AtkTextIfaceFc.get_text_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_at_offset", "I");
-- AtkTextIfaceFc.get_character_at_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_at_offset", "I");
-- AtkTextIfaceFc.get_text_before_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_text_before_offset", "I");
-- AtkTextIfaceFc.get_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_caret_offset", "I");
-- AtkTextIfaceFc.get_run_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_run_attributes", "I");
-- AtkTextIfaceFc.get_default_attributes = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_default_attributes", "I");
-- AtkTextIfaceFc.get_character_extents = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_extents", "I");
-- AtkTextIfaceFc.get_character_count = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_character_count", "I");
-- AtkTextIfaceFc.get_offset_at_point = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_offset_at_point", "I");
-- AtkTextIfaceFc.get_n_selections = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_n_selections", "I");
-- AtkTextIfaceFc.get_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "get_selection", "I");
-- AtkTextIfaceFc.add_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "add_selection", "I");
-- AtkTextIfaceFc.remove_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "remove_selection", "I");
-- AtkTextIfaceFc.set_selection = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_selection", "I");
-- AtkTextIfaceFc.set_caret_offset = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "set_caret_offset", "I");
-- AtkTextIfaceFc.text_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_changed", "I");
-- AtkTextIfaceFc.text_caret_moved = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_caret_moved", "I");
-- AtkTextIfaceFc.text_selection_changed = (*env)->GetFieldID(env, AtkTextIfaceFc.clazz, "text_selection_changed", "I");
-+ 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.cached = 1;
- }
-
- AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
- {
- if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
-- lpStruct->get_text = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text);
-- lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
-- lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
-- lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
-- lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
-- lpStruct->get_caret_offset = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
-- lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
-- lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
-- lpStruct->get_character_extents = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_extents);
-- lpStruct->get_character_count = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_character_count);
-- lpStruct->get_offset_at_point = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
-- lpStruct->get_n_selections = (gint (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_n_selections);
-- lpStruct->get_selection = (gchar *(*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.get_selection);
-- lpStruct->add_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.add_selection);
-- lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.remove_selection);
-- lpStruct->set_selection = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.set_selection);
-- lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
-- lpStruct->text_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_changed);
-- lpStruct->text_caret_moved = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
-- lpStruct->text_selection_changed = (void (*)())(*env)->GetIntField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
-+ 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);
- return lpStruct;
- }
-
- void setAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
- {
- if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text, (jint)lpStruct->get_text);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_after_offset, (jint)lpStruct->get_text_after_offset);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_at_offset, (jint)lpStruct->get_text_at_offset);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_at_offset, (jint)lpStruct->get_character_at_offset);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_text_before_offset, (jint)lpStruct->get_text_before_offset);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_caret_offset, (jint)lpStruct->get_caret_offset);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_run_attributes, (jint)lpStruct->get_run_attributes);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_default_attributes, (jint)lpStruct->get_default_attributes);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_extents, (jint)lpStruct->get_character_extents);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_character_count, (jint)lpStruct->get_character_count);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_offset_at_point, (jint)lpStruct->get_offset_at_point);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_n_selections, (jint)lpStruct->get_n_selections);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.get_selection, (jint)lpStruct->get_selection);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.add_selection, (jint)lpStruct->add_selection);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.remove_selection, (jint)lpStruct->remove_selection);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.set_selection, (jint)lpStruct->set_selection);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.set_caret_offset, (jint)lpStruct->set_caret_offset);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_changed, (jint)lpStruct->text_changed);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_caret_moved, (jint)lpStruct->text_caret_moved);
-- (*env)->SetIntField(env, lpObject, AtkTextIfaceFc.text_selection_changed, (jint)lpStruct->text_selection_changed);
-+ (*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);
- }
- #endif
-
-@@ -453,21 +453,21 @@
- {
- if (GtkAccessibleFc.cached) return;
- GtkAccessibleFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkAccessibleFc.widget = (*env)->GetFieldID(env, GtkAccessibleFc.clazz, "widget", "I");
-+ GtkAccessibleFc.widget = (*env)->GetFieldID(env, GtkAccessibleFc.clazz, "widget", "J");
- GtkAccessibleFc.cached = 1;
- }
-
- GtkAccessible *getGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct)
- {
- if (!GtkAccessibleFc.cached) cacheGtkAccessibleFields(env, lpObject);
-- lpStruct->widget = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkAccessibleFc.widget);
-+ lpStruct->widget = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkAccessibleFc.widget);
- return lpStruct;
- }
-
- void setGtkAccessibleFields(JNIEnv *env, jobject lpObject, GtkAccessible *lpStruct)
- {
- if (!GtkAccessibleFc.cached) cacheGtkAccessibleFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkAccessibleFc.widget, (jint)lpStruct->widget);
-+ (*env)->SetLongField(env, lpObject, GtkAccessibleFc.widget, (jlong)lpStruct->widget);
- }
- #endif
-
-diff -ur x86/atk_structs.h x86_64/atk_structs.h
---- x86/atk_structs.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/atk_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-diff -ur x86/cairo.c x86_64/cairo.c
---- x86/cairo.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/cairo.c 2009-02-11 17:53:48.000000000 -0500
-@@ -15,7 +15,7 @@
- *
- * IBM
- * - Binding to permit interfacing between Cairo and SWT
-- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
-+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@@ -39,7 +39,7 @@
-
- #ifndef NO__1cairo_1append_1path
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1append_1path)
-- (JNIEnv *env, jclass that, jint arg0, jint 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);
-@@ -49,7 +49,7 @@
-
- #ifndef NO__1cairo_1arc
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -59,7 +59,7 @@
-
- #ifndef NO__1cairo_1arc_1negative
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1arc_1negative)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -69,7 +69,7 @@
-
- #ifndef NO__1cairo_1clip
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_FUNC);
- cairo_clip((cairo_t *)arg0);
-@@ -79,7 +79,7 @@
-
- #ifndef NO__1cairo_1clip_1preserve
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1clip_1preserve)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1clip_1preserve_FUNC);
- cairo_clip_preserve((cairo_t *)arg0);
-@@ -89,7 +89,7 @@
-
- #ifndef NO__1cairo_1close_1path
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1close_1path)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1close_1path_FUNC);
- cairo_close_path((cairo_t *)arg0);
-@@ -99,7 +99,7 @@
-
- #ifndef NO__1cairo_1copy_1page
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1copy_1page)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1page_FUNC);
- cairo_copy_page((cairo_t *)arg0);
-@@ -108,36 +108,36 @@
- #endif
-
- #ifndef NO__1cairo_1copy_1path
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1copy_1path)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1copy_1path)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_FUNC);
-- rc = (jint)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 jint JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1copy_1path_1flat)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1copy_1path_1flat_FUNC);
-- rc = (jint)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 jint JNICALL Cairo_NATIVE(_1cairo_1create)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1create)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1create_FUNC);
-- rc = (jint)cairo_create((cairo_surface_t *)arg0);
-+ rc = (jlong)cairo_create((cairo_surface_t *)arg0);
- Cairo_NATIVE_EXIT(env, that, _1cairo_1create_FUNC);
- return rc;
- }
-@@ -145,7 +145,7 @@
-
- #ifndef NO__1cairo_1curve_1to
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1curve_1to)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -155,7 +155,7 @@
-
- #ifndef NO__1cairo_1destroy
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1destroy_FUNC);
- cairo_destroy((cairo_t *)arg0);
-@@ -165,7 +165,7 @@
-
- #ifndef NO__1cairo_1device_1to_1user
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1device_1to_1user)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -182,7 +182,7 @@
-
- #ifndef NO__1cairo_1device_1to_1user_1distance
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1device_1to_1user_1distance)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -199,7 +199,7 @@
-
- #ifndef NO__1cairo_1fill
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_FUNC);
- cairo_fill((cairo_t *)arg0);
-@@ -209,7 +209,7 @@
-
- #ifndef NO__1cairo_1fill_1extents
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -232,7 +232,7 @@
-
- #ifndef NO__1cairo_1fill_1preserve
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1preserve)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1fill_1preserve_FUNC);
- cairo_fill_preserve((cairo_t *)arg0);
-@@ -242,7 +242,7 @@
-
- #ifndef NO__1cairo_1font_1extents
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- cairo_font_extents_t _arg1, *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1extents_FUNC);
-@@ -255,12 +255,12 @@
- #endif
-
- #ifndef NO__1cairo_1font_1options_1create
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1create_FUNC);
-- rc = (jint)cairo_font_options_create();
-+ rc = (jlong)cairo_font_options_create();
- Cairo_NATIVE_EXIT(env, that, _1cairo_1font_1options_1create_FUNC);
- return rc;
- }
-@@ -268,7 +268,7 @@
-
- #ifndef NO__1cairo_1font_1options_1destroy
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1destroy)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -278,7 +278,7 @@
-
- #ifndef NO__1cairo_1font_1options_1get_1antialias
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1font_1options_1get_1antialias)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1options_1get_1antialias_FUNC);
-@@ -290,7 +290,7 @@
-
- #ifndef NO__1cairo_1font_1options_1set_1antialias
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1options_1set_1antialias)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -300,7 +300,7 @@
-
- #ifndef NO__1cairo_1get_1antialias
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1antialias)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1antialias_FUNC);
-@@ -312,7 +312,7 @@
-
- #ifndef NO__1cairo_1get_1current_1point
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1current_1point)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -329,7 +329,7 @@
-
- #ifndef NO__1cairo_1get_1fill_1rule
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1fill_1rule)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1fill_1rule_FUNC);
-@@ -340,12 +340,12 @@
- #endif
-
- #ifndef NO__1cairo_1get_1font_1face
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1get_1font_1face)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1face_FUNC);
-- rc = (jint)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;
- }
-@@ -353,7 +353,7 @@
-
- #ifndef NO__1cairo_1get_1font_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1matrix)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1matrix_FUNC);
-@@ -367,7 +367,7 @@
-
- #ifndef NO__1cairo_1get_1font_1options
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1options)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1options_FUNC);
- cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
-@@ -377,7 +377,7 @@
-
- #ifndef NO__1cairo_1get_1line_1cap
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1cap)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1cap_FUNC);
-@@ -389,7 +389,7 @@
-
- #ifndef NO__1cairo_1get_1line_1join
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1join)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1join_FUNC);
-@@ -401,7 +401,7 @@
-
- #ifndef NO__1cairo_1get_1line_1width
- JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1line_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jdouble rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1line_1width_FUNC);
-@@ -413,7 +413,7 @@
-
- #ifndef NO__1cairo_1get_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1matrix)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1matrix_FUNC);
-@@ -427,7 +427,7 @@
-
- #ifndef NO__1cairo_1get_1miter_1limit
- JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1miter_1limit)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jdouble rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1miter_1limit_FUNC);
-@@ -439,7 +439,7 @@
-
- #ifndef NO__1cairo_1get_1operator
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1operator)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1operator_FUNC);
-@@ -450,24 +450,24 @@
- #endif
-
- #ifndef NO__1cairo_1get_1source
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1source)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1get_1source)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1source_FUNC);
-- rc = (jint)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 jint JNICALL Cairo_NATIVE(_1cairo_1get_1target)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1get_1target)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1target_FUNC);
-- rc = (jint)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;
- }
-@@ -475,7 +475,7 @@
-
- #ifndef NO__1cairo_1get_1tolerance
- JNIEXPORT jdouble JNICALL Cairo_NATIVE(_1cairo_1get_1tolerance)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jdouble rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1tolerance_FUNC);
-@@ -487,7 +487,7 @@
-
- #ifndef NO__1cairo_1glyph_1extents
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1glyph_1extents_FUNC);
- cairo_glyph_extents((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2, (cairo_text_extents_t *)arg3);
-@@ -497,7 +497,7 @@
-
- #ifndef NO__1cairo_1glyph_1path
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1glyph_1path)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1glyph_1path_FUNC);
- cairo_glyph_path((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2);
-@@ -507,7 +507,7 @@
-
- #ifndef NO__1cairo_1identity_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1identity_1matrix)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1identity_1matrix_FUNC);
- cairo_identity_matrix((cairo_t *)arg0);
-@@ -516,24 +516,24 @@
- #endif
-
- #ifndef NO__1cairo_1image_1surface_1create
--JNIEXPORT jint 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)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_FUNC);
-- rc = (jint)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_1create_1for_1data
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1create_1for_1data)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1create_1for_1data_FUNC);
-- rc = (jint)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
-+ rc = (jlong)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4);
- Cairo_NATIVE_EXIT(env, that, _1cairo_1image_1surface_1create_1for_1data_FUNC);
- return rc;
- }
-@@ -541,7 +541,7 @@
-
- #ifndef NO__1cairo_1image_1surface_1get_1height
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1height)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1height_FUNC);
-@@ -553,7 +553,7 @@
-
- #ifndef NO__1cairo_1image_1surface_1get_1width
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1image_1surface_1get_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1image_1surface_1get_1width_FUNC);
-@@ -565,7 +565,7 @@
-
- #ifndef NO__1cairo_1in_1fill
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1fill)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -577,7 +577,7 @@
-
- #ifndef NO__1cairo_1in_1stroke
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1in_1stroke)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -589,7 +589,7 @@
-
- #ifndef NO__1cairo_1line_1to
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1line_1to)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -599,7 +599,7 @@
-
- #ifndef NO__1cairo_1mask
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask)
-- (JNIEnv *env, jclass that, jint arg0, jint 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);
-@@ -609,7 +609,7 @@
-
- #ifndef NO__1cairo_1mask_1surface
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1mask_1surface)
-- (JNIEnv *env, jclass that, jint arg0, jint 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);
-@@ -807,7 +807,7 @@
-
- #ifndef NO__1cairo_1move_1to
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1move_1to)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -817,7 +817,7 @@
-
- #ifndef NO__1cairo_1new_1path
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1new_1path)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1new_1path_FUNC);
- cairo_new_path((cairo_t *)arg0);
-@@ -827,7 +827,7 @@
-
- #ifndef NO__1cairo_1paint
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1paint_FUNC);
- cairo_paint((cairo_t *)arg0);
-@@ -837,7 +837,7 @@
-
- #ifndef NO__1cairo_1paint_1with_1alpha
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1paint_1with_1alpha)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -847,7 +847,7 @@
-
- #ifndef NO__1cairo_1path_1destroy
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1path_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1path_1destroy_FUNC);
- cairo_path_destroy((cairo_path_t *)arg0);
-@@ -857,7 +857,7 @@
-
- #ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgb
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgb)
-- (JNIEnv *env, jclass that, jint 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_1pattern_1add_1color_1stop_1rgb_FUNC);
- cairo_pattern_add_color_stop_rgb((cairo_pattern_t *)arg0, arg1, arg2, arg3, arg4);
-@@ -867,7 +867,7 @@
-
- #ifndef NO__1cairo_1pattern_1add_1color_1stop_1rgba
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1add_1color_1stop_1rgba)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -876,36 +876,36 @@
- #endif
-
- #ifndef NO__1cairo_1pattern_1create_1for_1surface
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1for_1surface)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1for_1surface_FUNC);
-- rc = (jint)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 jint 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)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1linear_FUNC);
-- rc = (jint)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;
- }
- #endif
-
- #ifndef NO__1cairo_1pattern_1create_1radial
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1pattern_1create_1radial)
- (JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1create_1radial_FUNC);
-- rc = (jint)cairo_pattern_create_radial(arg0, arg1, arg2, arg3, arg4, arg5);
-+ rc = (jlong)cairo_pattern_create_radial(arg0, arg1, arg2, arg3, arg4, arg5);
- Cairo_NATIVE_EXIT(env, that, _1cairo_1pattern_1create_1radial_FUNC);
- return rc;
- }
-@@ -913,7 +913,7 @@
-
- #ifndef NO__1cairo_1pattern_1destroy
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1destroy_FUNC);
- cairo_pattern_destroy((cairo_pattern_t *)arg0);
-@@ -923,7 +923,7 @@
-
- #ifndef NO__1cairo_1pattern_1get_1extend
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1extend)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1extend_FUNC);
-@@ -935,7 +935,7 @@
-
- #ifndef NO__1cairo_1pattern_1get_1filter
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1filter)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1filter_FUNC);
-@@ -947,7 +947,7 @@
-
- #ifndef NO__1cairo_1pattern_1get_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1get_1matrix)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1get_1matrix_FUNC);
-@@ -961,7 +961,7 @@
-
- #ifndef NO__1cairo_1pattern_1reference
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1reference)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1reference_FUNC);
- cairo_pattern_reference((cairo_pattern_t *)arg0);
-@@ -971,7 +971,7 @@
-
- #ifndef NO__1cairo_1pattern_1set_1extend
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1extend)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -981,7 +981,7 @@
-
- #ifndef NO__1cairo_1pattern_1set_1filter
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1filter)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -991,7 +991,7 @@
-
- #ifndef NO__1cairo_1pattern_1set_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pattern_1set_1matrix)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1pattern_1set_1matrix_FUNC);
-@@ -1005,7 +1005,7 @@
-
- #ifndef NO__1cairo_1pdf_1surface_1set_1size
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1pdf_1surface_1set_1size)
-- (JNIEnv *env, jclass that, jint 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);
- /*
-@@ -1031,7 +1031,7 @@
-
- #ifndef NO__1cairo_1ps_1surface_1set_1size
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1ps_1surface_1set_1size)
-- (JNIEnv *env, jclass that, jint 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);
- /*
-@@ -1057,7 +1057,7 @@
-
- #ifndef NO__1cairo_1rectangle
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rectangle)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1066,12 +1066,12 @@
- #endif
-
- #ifndef NO__1cairo_1reference
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1reference)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1reference)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1reference_FUNC);
-- rc = (jint)cairo_reference((cairo_t *)arg0);
-+ rc = (jlong)cairo_reference((cairo_t *)arg0);
- Cairo_NATIVE_EXIT(env, that, _1cairo_1reference_FUNC);
- return rc;
- }
-@@ -1079,7 +1079,7 @@
-
- #ifndef NO__1cairo_1rel_1curve_1to
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1curve_1to)
-- (JNIEnv *env, jclass that, jint 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_1rel_1curve_1to_FUNC);
- cairo_rel_curve_to((cairo_t *)arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -1089,7 +1089,7 @@
-
- #ifndef NO__1cairo_1rel_1line_1to
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1line_1to)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1line_1to_FUNC);
- cairo_rel_line_to((cairo_t *)arg0, arg1, arg2);
-@@ -1099,7 +1099,7 @@
-
- #ifndef NO__1cairo_1rel_1move_1to
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rel_1move_1to)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1rel_1move_1to_FUNC);
- cairo_rel_move_to((cairo_t *)arg0, arg1, arg2);
-@@ -1109,7 +1109,7 @@
-
- #ifndef NO__1cairo_1reset_1clip
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1reset_1clip)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1reset_1clip_FUNC);
- cairo_reset_clip((cairo_t *)arg0);
-@@ -1119,7 +1119,7 @@
-
- #ifndef NO__1cairo_1restore
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1restore)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1restore_FUNC);
- cairo_restore((cairo_t *)arg0);
-@@ -1129,7 +1129,7 @@
-
- #ifndef NO__1cairo_1rotate
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1rotate)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1139,7 +1139,7 @@
-
- #ifndef NO__1cairo_1save
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1save)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1save_FUNC);
- cairo_save((cairo_t *)arg0);
-@@ -1149,7 +1149,7 @@
-
- #ifndef NO__1cairo_1scale
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1scale)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1159,7 +1159,7 @@
-
- #ifndef NO__1cairo_1select_1font_1face
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1select_1font_1face)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1173,7 +1173,7 @@
-
- #ifndef NO__1cairo_1set_1antialias
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1antialias)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1183,7 +1183,7 @@
-
- #ifndef NO__1cairo_1set_1dash
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1dash)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1197,7 +1197,7 @@
-
- #ifndef NO__1cairo_1set_1fill_1rule
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1fill_1rule)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1207,7 +1207,7 @@
-
- #ifndef NO__1cairo_1set_1font_1face
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1face)
-- (JNIEnv *env, jclass that, jint arg0, jint 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);
-@@ -1217,7 +1217,7 @@
-
- #ifndef NO__1cairo_1set_1font_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1matrix)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1matrix_FUNC);
-@@ -1231,7 +1231,7 @@
-
- #ifndef NO__1cairo_1set_1font_1options
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1options)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1font_1options_FUNC);
- cairo_set_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1);
-@@ -1241,7 +1241,7 @@
-
- #ifndef NO__1cairo_1set_1font_1size
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1font_1size)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1251,7 +1251,7 @@
-
- #ifndef NO__1cairo_1set_1line_1cap
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1cap)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1261,7 +1261,7 @@
-
- #ifndef NO__1cairo_1set_1line_1join
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1join)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1271,7 +1271,7 @@
-
- #ifndef NO__1cairo_1set_1line_1width
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1line_1width)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1281,7 +1281,7 @@
-
- #ifndef NO__1cairo_1set_1matrix
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1matrix)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1set_1matrix_FUNC);
-@@ -1295,7 +1295,7 @@
-
- #ifndef NO__1cairo_1set_1miter_1limit
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1miter_1limit)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1305,7 +1305,7 @@
-
- #ifndef NO__1cairo_1set_1operator
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1operator)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1315,7 +1315,7 @@
-
- #ifndef NO__1cairo_1set_1source
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source)
-- (JNIEnv *env, jclass that, jint arg0, jint 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);
-@@ -1325,7 +1325,7 @@
-
- #ifndef NO__1cairo_1set_1source_1rgb
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgb)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1335,7 +1335,7 @@
-
- #ifndef NO__1cairo_1set_1source_1rgba
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1rgba)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1345,7 +1345,7 @@
-
- #ifndef NO__1cairo_1set_1source_1surface
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1source_1surface)
-- (JNIEnv *env, jclass that, jint arg0, jint 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);
-@@ -1355,7 +1355,7 @@
-
- #ifndef NO__1cairo_1set_1tolerance
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1set_1tolerance)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1365,7 +1365,7 @@
-
- #ifndef NO__1cairo_1show_1glyphs
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1glyphs)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1glyphs_FUNC);
- cairo_show_glyphs((cairo_t *)arg0, (cairo_glyph_t *)arg1, arg2);
-@@ -1375,7 +1375,7 @@
-
- #ifndef NO__1cairo_1show_1page
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1page_FUNC);
- cairo_show_page((cairo_t *)arg0);
-@@ -1385,7 +1385,7 @@
-
- #ifndef NO__1cairo_1show_1text
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1text_FUNC);
-@@ -1399,7 +1399,7 @@
-
- #ifndef NO__1cairo_1status
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1status_FUNC);
-@@ -1410,12 +1410,12 @@
- #endif
-
- #ifndef NO__1cairo_1status_1to_1string
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1status_1to_1string)
- (JNIEnv *env, jclass that, jint arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1status_1to_1string_FUNC);
-- rc = (jint)cairo_status_to_string(arg0);
-+ rc = (jlong)cairo_status_to_string(arg0);
- Cairo_NATIVE_EXIT(env, that, _1cairo_1status_1to_1string_FUNC);
- return rc;
- }
-@@ -1423,7 +1423,7 @@
-
- #ifndef NO__1cairo_1stroke
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_FUNC);
- cairo_stroke((cairo_t *)arg0);
-@@ -1433,7 +1433,7 @@
-
- #ifndef NO__1cairo_1stroke_1extents
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3, jdoubleArray arg4)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -1456,7 +1456,7 @@
-
- #ifndef NO__1cairo_1stroke_1preserve
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1stroke_1preserve)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1stroke_1preserve_FUNC);
- cairo_stroke_preserve((cairo_t *)arg0);
-@@ -1465,12 +1465,12 @@
- #endif
-
- #ifndef NO__1cairo_1surface_1create_1similar
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1create_1similar)
-- (JNIEnv *env, jclass that, jint 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)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1create_1similar_FUNC);
-- rc = (jint)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;
- }
-@@ -1478,7 +1478,7 @@
-
- #ifndef NO__1cairo_1surface_1destroy
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1destroy_FUNC);
- cairo_surface_destroy((cairo_surface_t *)arg0);
-@@ -1488,7 +1488,7 @@
-
- #ifndef NO__1cairo_1surface_1finish
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1finish)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1finish_FUNC);
- cairo_surface_finish((cairo_surface_t *)arg0);
-@@ -1498,7 +1498,7 @@
-
- #ifndef NO__1cairo_1surface_1get_1type
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1type)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1type_FUNC);
-@@ -1526,12 +1526,12 @@
- #endif
-
- #ifndef NO__1cairo_1surface_1get_1user_1data
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1surface_1get_1user_1data)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1get_1user_1data_FUNC);
-- rc = (jint)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;
- }
-@@ -1539,7 +1539,7 @@
-
- #ifndef NO__1cairo_1surface_1reference
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1reference)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1reference_FUNC);
- cairo_surface_reference((cairo_surface_t *)arg0);
-@@ -1549,7 +1549,7 @@
-
- #ifndef NO__1cairo_1surface_1set_1device_1offset
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1device_1offset)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1device_1offset_FUNC);
- cairo_surface_set_device_offset((cairo_surface_t *)arg0, arg1, arg2);
-@@ -1559,7 +1559,7 @@
-
- #ifndef NO__1cairo_1surface_1set_1fallback_1resolution
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1fallback_1resolution)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1fallback_1resolution_FUNC);
- /*
-@@ -1568,7 +1568,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jdouble, jdouble);
-+ typedef void (*FPTR)(jlong, jdouble, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(cairo_surface_set_fallback_resolution_LIB, RTLD_LAZY);
-@@ -1585,7 +1585,7 @@
-
- #ifndef NO__1cairo_1surface_1set_1user_1data
- JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1user_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- jint rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1surface_1set_1user_1data_FUNC);
-@@ -1597,7 +1597,7 @@
-
- #ifndef NO__1cairo_1text_1extents
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2)
- {
- jbyte *lparg1=NULL;
- cairo_text_extents_t _arg2, *lparg2=NULL;
-@@ -1614,7 +1614,7 @@
-
- #ifndef NO__1cairo_1text_1path
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1path)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1text_1path_FUNC);
-@@ -1628,7 +1628,7 @@
-
- #ifndef NO__1cairo_1transform
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1transform)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
- {
- jdouble *lparg1=NULL;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1transform_FUNC);
-@@ -1642,7 +1642,7 @@
-
- #ifndef NO__1cairo_1translate
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1translate)
-- (JNIEnv *env, jclass that, jint 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);
-@@ -1652,7 +1652,7 @@
-
- #ifndef NO__1cairo_1user_1to_1device
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -1669,7 +1669,7 @@
-
- #ifndef NO__1cairo_1user_1to_1device_1distance
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1user_1to_1device_1distance)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -1685,24 +1685,24 @@
- #endif
-
- #ifndef NO__1cairo_1xlib_1surface_1create
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint 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)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_FUNC);
-- rc = (jint)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;
- }
- #endif
-
- #ifndef NO__1cairo_1xlib_1surface_1create_1for_1bitmap
--JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+JNIEXPORT jlong JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1create_1for_1bitmap)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
-- rc = (jint)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
-+ rc = (jlong)cairo_xlib_surface_create_for_bitmap((Display *)arg0, (Pixmap)arg1, (Screen *)arg2, arg3, arg4);
- Cairo_NATIVE_EXIT(env, that, _1cairo_1xlib_1surface_1create_1for_1bitmap_FUNC);
- return rc;
- }
-@@ -1710,7 +1710,7 @@
-
- #ifndef NO__1cairo_1xlib_1surface_1set_1size
- JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1set_1size)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- Cairo_NATIVE_ENTER(env, that, _1cairo_1xlib_1surface_1set_1size_FUNC);
- cairo_xlib_surface_set_size((cairo_surface_t *)arg0, arg1, arg2);
-@@ -1778,45 +1778,45 @@
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II
--JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#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;
-- Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC);
-+ Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC);
- 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);
-- Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC);
-+ Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II
--JNIEXPORT void JNICALL Cairo_NATIVE(memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#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;
-- Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC);
-+ Cairo_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC);
- 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);
-- Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC);
-+ Cairo_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3DII
--JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DII)
-- (JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3DJJ
-+JNIEXPORT void JNICALL Cairo_NATIVE(memmove___3DJJ)
-+ (JNIEnv *env, jclass that, jdoubleArray arg0, jlong arg1, jlong arg2)
- {
- jdouble *lparg0=NULL;
-- Cairo_NATIVE_ENTER(env, that, memmove___3DII_FUNC);
-+ Cairo_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC);
- 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);
-- Cairo_NATIVE_EXIT(env, that, memmove___3DII_FUNC);
-+ Cairo_NATIVE_EXIT(env, that, memmove___3DJJ_FUNC);
- }
- #endif
-
-diff -ur x86/cairo_stats.c x86_64/cairo_stats.c
---- x86/cairo_stats.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/cairo_stats.c 2009-02-11 17:53:48.000000000 -0500
-@@ -15,7 +15,7 @@
- *
- * IBM
- * - Binding to permit interfacing between Cairo and SWT
-- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
-+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@@ -169,9 +169,9 @@
- "cairo_1path_1t_1sizeof",
- "cairo_1text_1extents_1t_1sizeof",
- "cairo_1version",
-- "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II",
-- "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II",
-- "memmove___3DII",
-+ "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ",
-+ "memmove___3DJJ",
- };
-
- #define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
-diff -ur x86/cairo_stats.h x86_64/cairo_stats.h
---- x86/cairo_stats.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/cairo_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -15,7 +15,7 @@
- *
- * IBM
- * - Binding to permit interfacing between Cairo and SWT
-- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
-+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@@ -177,7 +177,7 @@
- cairo_1path_1t_1sizeof_FUNC,
- cairo_1text_1extents_1t_1sizeof_FUNC,
- cairo_1version_FUNC,
-- memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2II_FUNC,
-- memmove___3DII_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1t_2JJ_FUNC,
-+ memmove___3DJJ_FUNC,
- } Cairo_FUNCS;
-diff -ur x86/cairo_structs.c x86_64/cairo_structs.c
---- x86/cairo_structs.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/cairo_structs.c 2009-02-11 17:53:48.000000000 -0500
-@@ -15,7 +15,7 @@
- *
- * IBM
- * - Binding to permit interfacing between Cairo and SWT
-- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
-+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@@ -113,7 +113,7 @@
- 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");
-+ 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;
- }
-@@ -122,7 +122,7 @@
- {
- 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)->GetIntField(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;
- }
-@@ -131,7 +131,7 @@
- {
- if (!cairo_path_tFc.cached) cachecairo_path_tFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, cairo_path_tFc.status, (jint)lpStruct->status);
-- (*env)->SetIntField(env, lpObject, cairo_path_tFc.data, (jint)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 -ur x86/cairo_structs.h x86_64/cairo_structs.h
---- x86/cairo_structs.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/cairo_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -15,7 +15,7 @@
- *
- * IBM
- * - Binding to permit interfacing between Cairo and SWT
-- * - Copyright (C) 2005, 2007 IBM Corp. All Rights Reserved.
-+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-
-diff -ur x86/c.c x86_64/c.c
---- x86/c.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/c.c 2009-02-11 17:53:46.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -29,7 +29,7 @@
-
- #ifndef NO_free
- JNIEXPORT void JNICALL C_NATIVE(free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- C_NATIVE_ENTER(env, that, free_FUNC);
- free((void *)arg0);
-@@ -38,14 +38,14 @@
- #endif
-
- #ifndef NO_getenv
--JNIEXPORT jint JNICALL C_NATIVE(getenv)
-+JNIEXPORT jlong JNICALL C_NATIVE(getenv)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint 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 = (jint)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);
-@@ -54,33 +54,33 @@
- #endif
-
- #ifndef NO_malloc
--JNIEXPORT jint JNICALL C_NATIVE(malloc)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL C_NATIVE(malloc)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- C_NATIVE_ENTER(env, that, malloc_FUNC);
-- rc = (jint)malloc(arg0);
-+ rc = (jlong)malloc(arg0);
- C_NATIVE_EXIT(env, that, malloc_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_memmove__III
--JNIEXPORT void JNICALL C_NATIVE(memmove__III)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__JJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove__JJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
-- C_NATIVE_ENTER(env, that, memmove__III_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__JJJ_FUNC);
- memmove((void *)arg0, (const void *)arg1, (size_t)arg2);
-- C_NATIVE_EXIT(env, that, memmove__III_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__JJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3BI
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3BI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3BJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -99,16 +99,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3BI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3BJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3CI
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3CI)
-- (JNIEnv *env, jclass that, jint arg0, jcharArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3CI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3CJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -127,16 +127,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3CI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3CJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3DI
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3DI)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3DI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3DJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -155,16 +155,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3DI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3DJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3FI
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3FI)
-- (JNIEnv *env, jclass that, jint arg0, jfloatArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3FI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3FJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -183,16 +183,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseFloatArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3FI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3FJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3II
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3II)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3II_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3IJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -211,16 +211,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3II_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3IJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3JI
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3JI)
-- (JNIEnv *env, jclass that, jint arg0, jlongArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3JI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3JJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -239,16 +239,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3JI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__I_3SI
--JNIEXPORT void JNICALL C_NATIVE(memmove__I_3SI)
-- (JNIEnv *env, jclass that, jint arg0, jshortArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove__I_3SI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove__J_3SJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-@@ -267,16 +267,16 @@
- {
- if (arg1 && lparg1) (*env)->ReleaseShortArrayElements(env, arg1, lparg1, JNI_ABORT);
- }
-- C_NATIVE_EXIT(env, that, memmove__I_3SI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove__J_3SJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3BII
--JNIEXPORT void JNICALL C_NATIVE(memmove___3BII)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3BJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3BJJ)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jlong arg2)
- {
- jbyte *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3BII_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3BJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -295,17 +295,17 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3BII_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3BJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3B_3CI
--JNIEXPORT void JNICALL C_NATIVE(memmove___3B_3CI)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jcharArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove___3B_3CI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3B_3CJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -328,16 +328,16 @@
- if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, JNI_ABORT);
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3B_3CI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3B_3CJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3CII
--JNIEXPORT void JNICALL C_NATIVE(memmove___3CII)
-- (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3CJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3CJJ)
-+ (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jlong arg2)
- {
- jchar *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3CII_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3CJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -356,16 +356,16 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3CII_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3CJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3DII
--JNIEXPORT void JNICALL C_NATIVE(memmove___3DII)
-- (JNIEnv *env, jclass that, jdoubleArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3DJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3DJJ)
-+ (JNIEnv *env, jclass that, jdoubleArray arg0, jlong arg1, jlong arg2)
- {
- jdouble *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3DII_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3DJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -384,16 +384,16 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3DII_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3DJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3FII
--JNIEXPORT void JNICALL C_NATIVE(memmove___3FII)
-- (JNIEnv *env, jclass that, jfloatArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3FJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3FJJ)
-+ (JNIEnv *env, jclass that, jfloatArray arg0, jlong arg1, jlong arg2)
- {
- jfloat *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3FII_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3FJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -412,16 +412,16 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseFloatArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3FII_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3FJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3III
--JNIEXPORT void JNICALL C_NATIVE(memmove___3III)
-- (JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3IJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3IJJ)
-+ (JNIEnv *env, jclass that, jintArray arg0, jlong arg1, jlong arg2)
- {
- jint *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3III_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3IJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -440,17 +440,17 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3III_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3IJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3I_3BI
--JNIEXPORT void JNICALL C_NATIVE(memmove___3I_3BI)
-- (JNIEnv *env, jclass that, jintArray arg0, jbyteArray arg1, jint arg2)
-+#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;
-- C_NATIVE_ENTER(env, that, memmove___3I_3BI_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3I_3BJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -471,16 +471,16 @@
- if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
- }
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- C_NATIVE_EXIT(env, that, memmove___3I_3BI_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3I_3BJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3JII
--JNIEXPORT void JNICALL C_NATIVE(memmove___3JII)
-- (JNIEnv *env, jclass that, jlongArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3JJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3JJJ)
-+ (JNIEnv *env, jclass that, jlongArray arg0, jlong arg1, jlong arg2)
- {
- jlong *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3JII_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3JJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -499,16 +499,16 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3JII_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3JJJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove___3SII
--JNIEXPORT void JNICALL C_NATIVE(memmove___3SII)
-- (JNIEnv *env, jclass that, jshortArray arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove___3SJJ
-+JNIEXPORT void JNICALL C_NATIVE(memmove___3SJJ)
-+ (JNIEnv *env, jclass that, jshortArray arg0, jlong arg1, jlong arg2)
- {
- jshort *lparg0=NULL;
-- C_NATIVE_ENTER(env, that, memmove___3SII_FUNC);
-+ C_NATIVE_ENTER(env, that, memmove___3SJJ_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -527,17 +527,17 @@
- {
- if (arg0 && lparg0) (*env)->ReleaseShortArrayElements(env, arg0, lparg0, 0);
- }
-- C_NATIVE_EXIT(env, that, memmove___3SII_FUNC);
-+ C_NATIVE_EXIT(env, that, memmove___3SJJ_FUNC);
- }
- #endif
-
- #ifndef NO_memset
--JNIEXPORT jint JNICALL C_NATIVE(memset)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+JNIEXPORT jlong JNICALL C_NATIVE(memset)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- C_NATIVE_ENTER(env, that, memset_FUNC);
-- rc = (jint)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;
- }
-@@ -545,7 +545,7 @@
-
- #ifndef NO_strlen
- JNIEXPORT jint JNICALL C_NATIVE(strlen)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- C_NATIVE_ENTER(env, that, strlen_FUNC);
-diff -ur x86/cde.c x86_64/cde.c
---- x86/cde.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/cde.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -29,7 +29,7 @@
-
- #ifndef NO__1DtActionInvoke
- JNIEXPORT jlong JNICALL CDE_NATIVE(_1DtActionInvoke)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2, jint arg3, jbyteArray arg4, jbyteArray arg5, jbyteArray arg6, jint arg7, jlong arg8, jlong arg9)
- {
- jbyte *lparg1=NULL;
- DtActionArg _arg2, *lparg2=NULL;
-@@ -57,7 +57,7 @@
-
- #ifndef NO__1DtAppInitialize
- JNIEXPORT jboolean JNICALL CDE_NATIVE(_1DtAppInitialize)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4)
- {
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
-@@ -101,30 +101,30 @@
- #endif
-
- #ifndef NO__1DtDtsDataTypeNames
--JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsDataTypeNames)
-+JNIEXPORT jlong JNICALL CDE_NATIVE(_1DtDtsDataTypeNames)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- CDE_NATIVE_ENTER(env, that, _1DtDtsDataTypeNames_FUNC);
-- rc = (jint)DtDtsDataTypeNames();
-+ rc = (jlong)DtDtsDataTypeNames();
- CDE_NATIVE_EXIT(env, that, _1DtDtsDataTypeNames_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1DtDtsDataTypeToAttributeValue
--JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsDataTypeToAttributeValue)
-+JNIEXPORT jlong JNICALL CDE_NATIVE(_1DtDtsDataTypeToAttributeValue)
- (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jbyteArray arg2)
- {
- jbyte *lparg0=NULL;
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- CDE_NATIVE_ENTER(env, that, _1DtDtsDataTypeToAttributeValue_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-- rc = (jint)DtDtsDataTypeToAttributeValue((char *)lparg0, (char *)lparg1, (char *)lparg2);
-+ rc = (jlong)DtDtsDataTypeToAttributeValue((char *)lparg0, (char *)lparg1, (char *)lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-@@ -135,14 +135,14 @@
- #endif
-
- #ifndef NO__1DtDtsFileToDataType
--JNIEXPORT jint JNICALL CDE_NATIVE(_1DtDtsFileToDataType)
-+JNIEXPORT jlong JNICALL CDE_NATIVE(_1DtDtsFileToDataType)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- CDE_NATIVE_ENTER(env, that, _1DtDtsFileToDataType_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)DtDtsFileToDataType((char *)lparg0);
-+ rc = (jlong)DtDtsFileToDataType((char *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- CDE_NATIVE_EXIT(env, that, _1DtDtsFileToDataType_FUNC);
-@@ -152,7 +152,7 @@
-
- #ifndef NO__1DtDtsFreeAttributeValue
- JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeAttributeValue)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- CDE_NATIVE_ENTER(env, that, _1DtDtsFreeAttributeValue_FUNC);
- DtDtsFreeAttributeValue((char *)arg0);
-@@ -162,7 +162,7 @@
-
- #ifndef NO__1DtDtsFreeDataType
- JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataType)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- CDE_NATIVE_ENTER(env, that, _1DtDtsFreeDataType_FUNC);
- DtDtsFreeDataType((char *)arg0);
-@@ -172,7 +172,7 @@
-
- #ifndef NO__1DtDtsFreeDataTypeNames
- JNIEXPORT void JNICALL CDE_NATIVE(_1DtDtsFreeDataTypeNames)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- CDE_NATIVE_ENTER(env, that, _1DtDtsFreeDataTypeNames_FUNC);
- DtDtsFreeDataTypeNames((char **)arg0);
-@@ -181,20 +181,20 @@
- #endif
-
- #ifndef NO__1XtAppCreateShell
--JNIEXPORT jint JNICALL CDE_NATIVE(_1XtAppCreateShell)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2, jint arg3, jintArray arg4, jint arg5)
-+JNIEXPORT jlong JNICALL CDE_NATIVE(_1XtAppCreateShell)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jlong arg2, jlong arg3, jlongArray arg4, jint arg5)
- {
- jbyte *lparg0=NULL;
- jbyte *lparg1=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
- CDE_NATIVE_ENTER(env, that, _1XtAppCreateShell_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-- rc = (jint)XtAppCreateShell((String)lparg0, (String)lparg1, (WidgetClass)arg2, (Display *)arg3, (ArgList)lparg4, arg5);
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ rc = (jlong)XtAppCreateShell((String)lparg0, (String)lparg1, (WidgetClass)arg2, (Display *)arg3, (ArgList)lparg4, arg5);
- fail:
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- CDE_NATIVE_EXIT(env, that, _1XtAppCreateShell_FUNC);
-@@ -203,12 +203,12 @@
- #endif
-
- #ifndef NO__1XtCreateApplicationContext
--JNIEXPORT jint JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
-+JNIEXPORT jlong JNICALL CDE_NATIVE(_1XtCreateApplicationContext)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- CDE_NATIVE_ENTER(env, that, _1XtCreateApplicationContext_FUNC);
-- rc = (jint)XtCreateApplicationContext();
-+ rc = (jlong)XtCreateApplicationContext();
- CDE_NATIVE_EXIT(env, that, _1XtCreateApplicationContext_FUNC);
- return rc;
- }
-@@ -216,18 +216,18 @@
-
- #ifndef NO__1XtDisplayInitialize
- JNIEXPORT void JNICALL CDE_NATIVE(_1XtDisplayInitialize)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6, jint arg7)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jlong arg4, jint arg5, jlongArray arg6, jint arg7)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
-- jint *lparg6=NULL;
-+ jlong *lparg6=NULL;
- CDE_NATIVE_ENTER(env, that, _1XtDisplayInitialize_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-- if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-+ if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
- XtDisplayInitialize((XtAppContext)arg0, (Display *)arg1, (String)lparg2, (String)lparg3, (XrmOptionDescRec *)arg4, (Cardinal)arg5, (int *)lparg6, (String *)arg7);
- fail:
-- if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
-+ if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
- if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
- CDE_NATIVE_EXIT(env, that, _1XtDisplayInitialize_FUNC);
-@@ -236,7 +236,7 @@
-
- #ifndef NO__1XtRealizeWidget
- JNIEXPORT void JNICALL CDE_NATIVE(_1XtRealizeWidget)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- CDE_NATIVE_ENTER(env, that, _1XtRealizeWidget_FUNC);
- XtRealizeWidget((Widget)arg0);
-@@ -246,7 +246,7 @@
-
- #ifndef NO__1XtResizeWidget
- JNIEXPORT void JNICALL CDE_NATIVE(_1XtResizeWidget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3)
- {
- CDE_NATIVE_ENTER(env, that, _1XtResizeWidget_FUNC);
- XtResizeWidget((Widget)arg0, arg1, arg2, arg3);
-@@ -256,7 +256,7 @@
-
- #ifndef NO__1XtSetMappedWhenManaged
- JNIEXPORT void JNICALL CDE_NATIVE(_1XtSetMappedWhenManaged)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- CDE_NATIVE_ENTER(env, that, _1XtSetMappedWhenManaged_FUNC);
- XtSetMappedWhenManaged((Widget)arg0, arg1);
-@@ -275,12 +275,12 @@
- #endif
-
- #ifndef NO__1topLevelShellWidgetClass
--JNIEXPORT jint JNICALL CDE_NATIVE(_1topLevelShellWidgetClass)
-+JNIEXPORT jlong JNICALL CDE_NATIVE(_1topLevelShellWidgetClass)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- CDE_NATIVE_ENTER(env, that, _1topLevelShellWidgetClass_FUNC);
-- rc = (jint)topLevelShellWidgetClass;
-+ rc = (jlong)topLevelShellWidgetClass;
- CDE_NATIVE_EXIT(env, that, _1topLevelShellWidgetClass_FUNC);
- return rc;
- }
-diff -ur x86/cde_stats.c x86_64/cde_stats.c
---- x86/cde_stats.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/cde_stats.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/cde_stats.h x86_64/cde_stats.h
---- x86/cde_stats.h 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/cde_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/cde_structs.c x86_64/cde_structs.c
---- x86/cde_structs.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/cde_structs.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -26,7 +26,7 @@
- if (DtActionArgFc.cached) return;
- DtActionArgFc.clazz = (*env)->GetObjectClass(env, lpObject);
- DtActionArgFc.argClass = (*env)->GetFieldID(env, DtActionArgFc.clazz, "argClass", "I");
-- DtActionArgFc.name = (*env)->GetFieldID(env, DtActionArgFc.clazz, "name", "I");
-+ DtActionArgFc.name = (*env)->GetFieldID(env, DtActionArgFc.clazz, "name", "J");
- DtActionArgFc.cached = 1;
- }
-
-@@ -34,7 +34,7 @@
- {
- if (!DtActionArgFc.cached) cacheDtActionArgFields(env, lpObject);
- lpStruct->argClass = (*env)->GetIntField(env, lpObject, DtActionArgFc.argClass);
-- lpStruct->u.file.name = (char *)(*env)->GetIntField(env, lpObject, DtActionArgFc.name);
-+ lpStruct->u.file.name = (char *)(*env)->GetLongField(env, lpObject, DtActionArgFc.name);
- return lpStruct;
- }
-
-@@ -42,7 +42,7 @@
- {
- if (!DtActionArgFc.cached) cacheDtActionArgFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, DtActionArgFc.argClass, (jint)lpStruct->argClass);
-- (*env)->SetIntField(env, lpObject, DtActionArgFc.name, (jint)lpStruct->u.file.name);
-+ (*env)->SetLongField(env, lpObject, DtActionArgFc.name, (jlong)lpStruct->u.file.name);
- }
- #endif
-
-diff -ur x86/cde_structs.h x86_64/cde_structs.h
---- x86/cde_structs.h 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/cde_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/c_stats.c x86_64/c_stats.c
---- x86/c_stats.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/c_stats.c 2009-02-11 17:53:46.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -21,23 +21,23 @@
- "free",
- "getenv",
- "malloc",
-- "memmove__III",
-- "memmove__I_3BI",
-- "memmove__I_3CI",
-- "memmove__I_3DI",
-- "memmove__I_3FI",
-- "memmove__I_3II",
-- "memmove__I_3JI",
-- "memmove__I_3SI",
-- "memmove___3BII",
-- "memmove___3B_3CI",
-- "memmove___3CII",
-- "memmove___3DII",
-- "memmove___3FII",
-- "memmove___3III",
-- "memmove___3I_3BI",
-- "memmove___3JII",
-- "memmove___3SII",
-+ "memmove__JJJ",
-+ "memmove__J_3BJ",
-+ "memmove__J_3CJ",
-+ "memmove__J_3DJ",
-+ "memmove__J_3FJ",
-+ "memmove__J_3IJ",
-+ "memmove__J_3JJ",
-+ "memmove__J_3SJ",
-+ "memmove___3BJJ",
-+ "memmove___3B_3CJ",
-+ "memmove___3CJJ",
-+ "memmove___3DJJ",
-+ "memmove___3FJJ",
-+ "memmove___3IJJ",
-+ "memmove___3I_3BJ",
-+ "memmove___3JJJ",
-+ "memmove___3SJJ",
- "memset",
- "strlen",
- };
-diff -ur x86/c_stats.h x86_64/c_stats.h
---- x86/c_stats.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/c_stats.h 2009-02-11 17:53:46.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -29,23 +29,23 @@
- free_FUNC,
- getenv_FUNC,
- malloc_FUNC,
-- memmove__III_FUNC,
-- memmove__I_3BI_FUNC,
-- memmove__I_3CI_FUNC,
-- memmove__I_3DI_FUNC,
-- memmove__I_3FI_FUNC,
-- memmove__I_3II_FUNC,
-- memmove__I_3JI_FUNC,
-- memmove__I_3SI_FUNC,
-- memmove___3BII_FUNC,
-- memmove___3B_3CI_FUNC,
-- memmove___3CII_FUNC,
-- memmove___3DII_FUNC,
-- memmove___3FII_FUNC,
-- memmove___3III_FUNC,
-- memmove___3I_3BI_FUNC,
-- memmove___3JII_FUNC,
-- memmove___3SII_FUNC,
-+ memmove__JJJ_FUNC,
-+ memmove__J_3BJ_FUNC,
-+ memmove__J_3CJ_FUNC,
-+ memmove__J_3DJ_FUNC,
-+ memmove__J_3FJ_FUNC,
-+ memmove__J_3IJ_FUNC,
-+ memmove__J_3JJ_FUNC,
-+ memmove__J_3SJ_FUNC,
-+ memmove___3BJJ_FUNC,
-+ memmove___3B_3CJ_FUNC,
-+ memmove___3CJJ_FUNC,
-+ memmove___3DJJ_FUNC,
-+ memmove___3FJJ_FUNC,
-+ memmove___3IJJ_FUNC,
-+ memmove___3I_3BJ_FUNC,
-+ memmove___3JJJ_FUNC,
-+ memmove___3SJJ_FUNC,
- memset_FUNC,
- strlen_FUNC,
- } C_FUNCS;
-diff -ur x86/c_structs.c x86_64/c_structs.c
---- x86/c_structs.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/c_structs.c 2009-02-11 17:53:46.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/c_structs.h x86_64/c_structs.h
---- x86/c_structs.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/c_structs.h 2009-02-11 17:53:46.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/glx.c x86_64/glx.c
---- x86/glx.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/glx.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -52,14 +52,14 @@
- #endif
-
- #ifndef NO__1glXChooseVisual
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXChooseVisual)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXChooseVisual)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2)
- {
- jint *lparg2=NULL;
-- jint 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 = (jint)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);
-@@ -69,7 +69,7 @@
-
- #ifndef NO__1glXCopyContext
- JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3)
- {
- GLX_NATIVE_ENTER(env, that, _1glXCopyContext_FUNC);
- glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
-@@ -78,14 +78,14 @@
- #endif
-
- #ifndef NO__1glXCreateContext
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateContext)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint 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;
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXCreateContext_FUNC);
- if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-- rc = (jint)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);
-@@ -94,14 +94,14 @@
- #endif
-
- #ifndef NO__1glXCreateGLXPixmap
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- XVisualInfo _arg1, *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXCreateGLXPixmap_FUNC);
- if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-- rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
-+ rc = (jlong)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
- fail:
- if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
- GLX_NATIVE_EXIT(env, that, _1glXCreateGLXPixmap_FUNC);
-@@ -111,7 +111,7 @@
-
- #ifndef NO__1glXDestroyContext
- JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- GLX_NATIVE_ENTER(env, that, _1glXDestroyContext_FUNC);
- glXDestroyContext((Display *)arg0, (GLXContext)arg1);
-@@ -121,7 +121,7 @@
-
- #ifndef NO__1glXDestroyGLXPixmap
- JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- GLX_NATIVE_ENTER(env, that, _1glXDestroyGLXPixmap_FUNC);
- glXDestroyGLXPixmap((Display *)arg0, (GLXPixmap)arg1);
-@@ -130,12 +130,12 @@
- #endif
-
- #ifndef NO__1glXGetClientString
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXGetClientString)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXGetClientString_FUNC);
-- rc = (jint)glXGetClientString((Display *)arg0, arg1);
-+ rc = (jlong)glXGetClientString((Display *)arg0, arg1);
- GLX_NATIVE_EXIT(env, that, _1glXGetClientString_FUNC);
- return rc;
- }
-@@ -143,7 +143,7 @@
-
- #ifndef NO__1glXGetConfig
- JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetConfig)
-- (JNIEnv *env, jclass that, jint 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;
-@@ -161,24 +161,24 @@
- #endif
-
- #ifndef NO__1glXGetCurrentContext
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentContext)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXGetCurrentContext)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXGetCurrentContext_FUNC);
-- rc = (jint)glXGetCurrentContext();
-+ rc = (jlong)glXGetCurrentContext();
- GLX_NATIVE_EXIT(env, that, _1glXGetCurrentContext_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1glXGetCurrentDrawable
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXGetCurrentDrawable_FUNC);
-- rc = (jint)glXGetCurrentDrawable();
-+ rc = (jlong)glXGetCurrentDrawable();
- GLX_NATIVE_EXIT(env, that, _1glXGetCurrentDrawable_FUNC);
- return rc;
- }
-@@ -186,7 +186,7 @@
-
- #ifndef NO__1glXIsDirect
- JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXIsDirect_FUNC);
-@@ -198,7 +198,7 @@
-
- #ifndef NO__1glXMakeCurrent
- JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jboolean rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXMakeCurrent_FUNC);
-@@ -210,7 +210,7 @@
-
- #ifndef NO__1glXQueryExtension
- JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryExtension)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -228,24 +228,24 @@
- #endif
-
- #ifndef NO__1glXQueryExtensionsString
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXQueryExtensionsString_FUNC);
-- rc = (jint)glXQueryExtensionsString((Display *)arg0, arg1);
-+ rc = (jlong)glXQueryExtensionsString((Display *)arg0, arg1);
- GLX_NATIVE_EXIT(env, that, _1glXQueryExtensionsString_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1glXQueryServerString
--JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+JNIEXPORT jlong JNICALL GLX_NATIVE(_1glXQueryServerString)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GLX_NATIVE_ENTER(env, that, _1glXQueryServerString_FUNC);
-- rc = (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
-+ rc = (jlong)glXQueryServerString((Display *)arg0, arg1, arg2);
- GLX_NATIVE_EXIT(env, that, _1glXQueryServerString_FUNC);
- return rc;
- }
-@@ -253,7 +253,7 @@
-
- #ifndef NO__1glXQueryVersion
- JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryVersion)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -272,7 +272,7 @@
-
- #ifndef NO__1glXSwapBuffers
- JNIEXPORT void JNICALL GLX_NATIVE(_1glXSwapBuffers)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- GLX_NATIVE_ENTER(env, that, _1glXSwapBuffers_FUNC);
- glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
-@@ -302,7 +302,7 @@
-
- #ifndef NO_memmove
- JNIEXPORT void JNICALL GLX_NATIVE(memmove)
-- (JNIEnv *env, jclass that, jobject arg0, jint 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 -ur x86/glx_stats.c x86_64/glx_stats.c
---- x86/glx_stats.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/glx_stats.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/glx_stats.h x86_64/glx_stats.h
---- x86/glx_stats.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/glx_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/glx_structs.c x86_64/glx_structs.c
---- x86/glx_structs.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/glx_structs.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -25,7 +25,7 @@
- {
- if (XVisualInfoFc.cached) return;
- XVisualInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", "I");
-+ 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");
-@@ -41,7 +41,7 @@
- XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
- {
- if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
-- lpStruct->visual = (Visual *)(*env)->GetIntField(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);
-@@ -57,7 +57,7 @@
- void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
- {
- if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, XVisualInfoFc.visual, (jint)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 -ur x86/glx_structs.h x86_64/glx_structs.h
---- x86/glx_structs.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/glx_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/gnome.c x86_64/gnome.c
---- x86/gnome.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/gnome.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-@@ -33,7 +33,7 @@
-
- #ifndef NO__1g_1free
- JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- GNOME_NATIVE_ENTER(env, that, _1g_1free_FUNC);
- g_free((gpointer)arg0);
-@@ -42,12 +42,12 @@
- #endif
-
- #ifndef NO__1g_1list_1append
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1append)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1g_1list_1append)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
-- rc = (jint)g_list_append((GList *)arg0, (gpointer)arg1);
-+ rc = (jlong)g_list_append((GList *)arg0, (gpointer)arg1);
- GNOME_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
- return rc;
- }
-@@ -55,7 +55,7 @@
-
- #ifndef NO__1g_1list_1free
- JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1list_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- GNOME_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
- g_list_free((GList *)arg0);
-@@ -64,12 +64,12 @@
- #endif
-
- #ifndef NO__1g_1list_1next
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1next)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1g_1list_1next)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
-- rc = (jint)g_list_next(arg0);
-+ rc = (jlong)g_list_next(arg0);
- GNOME_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
- return rc;
- }
-@@ -77,7 +77,7 @@
-
- #ifndef NO__1g_1object_1unref
- JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1object_1unref)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- GNOME_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
- g_object_unref((gpointer)arg0);
-@@ -86,20 +86,20 @@
- #endif
-
- #ifndef NO__1gnome_1icon_1lookup
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1lookup)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintArray arg7)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1icon_1lookup)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jlong arg4, jbyteArray arg5, jint arg6, jintArray arg7)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jbyte *lparg5=NULL;
- jint *lparg7=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1lookup_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
-- rc = (jint)gnome_icon_lookup((GnomeIconTheme *)arg0, (GnomeThumbnailFactory *)arg1, (const char *)lparg2, (const char *)lparg3, (GnomeVFSFileInfo *)arg4, (const char *)lparg5, (GnomeIconLookupFlags)arg6, (GnomeIconLookupResultFlags *)lparg7);
-+ rc = (jlong)gnome_icon_lookup((GnomeIconTheme *)arg0, (GnomeThumbnailFactory *)arg1, (const char *)lparg2, (const char *)lparg3, (GnomeVFSFileInfo *)arg4, (const char *)lparg5, (GnomeIconLookupFlags)arg6, (GnomeIconLookupResultFlags *)lparg7);
- fail:
- if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
- if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
-@@ -111,43 +111,43 @@
- #endif
-
- #ifndef NO__1gnome_1icon_1theme_1lookup_1icon
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1lookup_1icon)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1lookup_1icon)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3, jintArray arg4)
- {
-- jint *lparg3=NULL;
-+ jlong *lparg3=NULL;
- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1theme_1lookup_1icon_FUNC);
-- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-- rc = (jint)gnome_icon_theme_lookup_icon((GnomeIconTheme *)arg0, (const char *)arg1, arg2, (const GnomeIconData **)lparg3, lparg4);
-+ rc = (jlong)gnome_icon_theme_lookup_icon((GnomeIconTheme *)arg0, (const char *)arg1, arg2, (const GnomeIconData **)lparg3, lparg4);
- fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1icon_1theme_1lookup_1icon_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gnome_1icon_1theme_1new
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1new)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1theme_1new_FUNC);
-- rc = (jint)gnome_icon_theme_new();
-+ rc = (jlong)gnome_icon_theme_new();
- GNOME_NATIVE_EXIT(env, that, _1gnome_1icon_1theme_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gnome_1vfs_1get_1registered_1mime_1types
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
-- rc = (jint)gnome_vfs_get_registered_mime_types();
-+ rc = (jlong)gnome_vfs_get_registered_mime_types();
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
- return rc;
- }
-@@ -166,14 +166,14 @@
- #endif
-
- #ifndef NO__1gnome_1vfs_1make_1uri_1from_1input
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1make_1uri_1from_1input_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gnome_vfs_make_uri_from_input((const char *)lparg0);
-+ rc = (jlong)gnome_vfs_make_uri_from_input((const char *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1make_1uri_1from_1input_FUNC);
-@@ -182,20 +182,20 @@
- #endif
-
- #ifndef NO__1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1);
-+ rc = (jlong)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(const char *, jint);
-+ typedef jlong (*FPTR)(const char *, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -204,7 +204,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((const char *)lparg0, arg1);
-+ rc = (jlong)(*fptr)((const char *)lparg0, arg1);
- }
- }
- fail:
-@@ -216,7 +216,7 @@
-
- #ifndef NO__1gnome_1vfs_1mime_1application_1free
- JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1application_1free_FUNC);
- gnome_vfs_mime_application_free((GnomeVFSMimeApplication *)arg0);
-@@ -226,7 +226,7 @@
-
- #ifndef NO__1gnome_1vfs_1mime_1application_1launch
- JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1application_1launch_FUNC);
-@@ -255,7 +255,7 @@
-
- #ifndef NO__1gnome_1vfs_1mime_1extensions_1list_1free
- JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1extensions_1list_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1extensions_1list_1free_FUNC);
- gnome_vfs_mime_extensions_list_free((GList *)arg0);
-@@ -264,14 +264,14 @@
- #endif
-
- #ifndef NO__1gnome_1vfs_1mime_1get_1default_1application
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1default_1application_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gnome_vfs_mime_get_default_application((const char *)lparg0);
-+ rc = (jlong)gnome_vfs_mime_get_default_application((const char *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1default_1application_FUNC);
-@@ -280,12 +280,12 @@
- #endif
-
- #ifndef NO__1gnome_1vfs_1mime_1get_1extensions_1list
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
-- rc = (jint)gnome_vfs_mime_get_extensions_list((const char *)arg0);
-+ rc = (jlong)gnome_vfs_mime_get_extensions_list((const char *)arg0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
- return rc;
- }
-@@ -293,7 +293,7 @@
-
- #ifndef NO__1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free
- JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free_FUNC);
- gnome_vfs_mime_registered_mime_type_list_free((GList *)arg0);
-@@ -302,14 +302,14 @@
- #endif
-
- #ifndef NO__1gnome_1vfs_1mime_1type_1from_1name
--JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
-+JNIEXPORT jlong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1type_1from_1name_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gnome_vfs_mime_type_from_name((const char *)lparg0);
-+ rc = (jlong)gnome_vfs_mime_type_from_name((const char *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1type_1from_1name_FUNC);
-@@ -319,7 +319,7 @@
-
- #ifndef NO__1gnome_1vfs_1url_1show
- JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1url_1show_FUNC);
-@@ -348,7 +348,7 @@
-
- #ifndef NO_memmove
- JNIEXPORT void JNICALL GNOME_NATIVE(memmove)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GnomeVFSMimeApplication _arg0, *lparg0=NULL;
- GNOME_NATIVE_ENTER(env, that, memmove_FUNC);
-diff -ur x86/gnome_stats.c x86_64/gnome_stats.c
---- x86/gnome_stats.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/gnome_stats.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-diff -ur x86/gnome_stats.h x86_64/gnome_stats.h
---- x86/gnome_stats.h 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/gnome_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-diff -ur x86/gnome_structs.c x86_64/gnome_structs.c
---- x86/gnome_structs.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/gnome_structs.c 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-@@ -29,12 +29,12 @@
- {
- if (GnomeVFSMimeApplicationFc.cached) return;
- GnomeVFSMimeApplicationFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GnomeVFSMimeApplicationFc.id = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "id", "I");
-- GnomeVFSMimeApplicationFc.name = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "name", "I");
-- GnomeVFSMimeApplicationFc.command = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "command", "I");
-+ GnomeVFSMimeApplicationFc.id = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "id", "J");
-+ GnomeVFSMimeApplicationFc.name = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "name", "J");
-+ GnomeVFSMimeApplicationFc.command = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "command", "J");
- GnomeVFSMimeApplicationFc.can_open_multiple_files = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "can_open_multiple_files", "Z");
- GnomeVFSMimeApplicationFc.expects_uris = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "expects_uris", "I");
-- GnomeVFSMimeApplicationFc.supported_uri_schemes = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "supported_uri_schemes", "I");
-+ GnomeVFSMimeApplicationFc.supported_uri_schemes = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "supported_uri_schemes", "J");
- GnomeVFSMimeApplicationFc.requires_terminal = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "requires_terminal", "Z");
- GnomeVFSMimeApplicationFc.cached = 1;
- }
-@@ -42,12 +42,12 @@
- GnomeVFSMimeApplication *getGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject, GnomeVFSMimeApplication *lpStruct)
- {
- if (!GnomeVFSMimeApplicationFc.cached) cacheGnomeVFSMimeApplicationFields(env, lpObject);
-- lpStruct->id = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.id);
-- lpStruct->name = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.name);
-- lpStruct->command = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.command);
-+ lpStruct->id = (char *)(*env)->GetLongField(env, lpObject, GnomeVFSMimeApplicationFc.id);
-+ lpStruct->name = (char *)(*env)->GetLongField(env, lpObject, GnomeVFSMimeApplicationFc.name);
-+ lpStruct->command = (char *)(*env)->GetLongField(env, lpObject, GnomeVFSMimeApplicationFc.command);
- lpStruct->can_open_multiple_files = (gboolean)(*env)->GetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.can_open_multiple_files);
- lpStruct->expects_uris = (GnomeVFSMimeApplicationArgumentType)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.expects_uris);
-- lpStruct->supported_uri_schemes = (GList *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes);
-+ lpStruct->supported_uri_schemes = (GList *)(*env)->GetLongField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes);
- lpStruct->requires_terminal = (gboolean)(*env)->GetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.requires_terminal);
- return lpStruct;
- }
-@@ -55,12 +55,12 @@
- void setGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject, GnomeVFSMimeApplication *lpStruct)
- {
- if (!GnomeVFSMimeApplicationFc.cached) cacheGnomeVFSMimeApplicationFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.id, (jint)lpStruct->id);
-- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.name, (jint)lpStruct->name);
-- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.command, (jint)lpStruct->command);
-+ (*env)->SetLongField(env, lpObject, GnomeVFSMimeApplicationFc.id, (jlong)lpStruct->id);
-+ (*env)->SetLongField(env, lpObject, GnomeVFSMimeApplicationFc.name, (jlong)lpStruct->name);
-+ (*env)->SetLongField(env, lpObject, GnomeVFSMimeApplicationFc.command, (jlong)lpStruct->command);
- (*env)->SetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.can_open_multiple_files, (jboolean)lpStruct->can_open_multiple_files);
- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.expects_uris, (jint)lpStruct->expects_uris);
-- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes, (jint)lpStruct->supported_uri_schemes);
-+ (*env)->SetLongField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes, (jlong)lpStruct->supported_uri_schemes);
- (*env)->SetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.requires_terminal, (jboolean)lpStruct->requires_terminal);
- }
- #endif
-diff -ur x86/gnome_structs.h x86_64/gnome_structs.h
---- x86/gnome_structs.h 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/gnome_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
-+ * Copyright (c) 2000, 2008 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
-diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java
---- x86/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-02-11 17:43:46.000000000 -0500
+diff -urN x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java
+--- x86/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-05-29 17:30:30.000000000 -0400
++++ x86_64/org/eclipse/swt/accessibility/AccessibleFactory.java 2009-09-17 08:48:16.000000000 -0400
@@ -18,16 +18,16 @@
import org.eclipse.swt.*;
@@ -4382,7 +22,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
static final byte[] FACTORY_PARENTTYPENAME = Converter.wcsToMbcs (null, "AtkObjectFactory", true); //$NON-NLS-1$
static final byte[] SWT_TYPE_PREFIX = Converter.wcsToMbcs (null, "SWT", false); //$NON-NLS-1$
static final byte[] CHILD_TYPENAME = Converter.wcsToMbcs (null, "Child", false); //$NON-NLS-1$
-@@ -82,12 +82,12 @@
+@@ -83,12 +83,12 @@
static final Callback InitSelectionIfaceCB;
static final Callback InitTextIfaceCB;
/* interface definitions */
@@ -4401,7 +41,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
static {
AtkActionCB_get_keybinding = newCallback (AccessibleObject.class, "atkAction_get_keybinding", 2); //$NON-NLS-1$
AtkActionCB_get_name = newCallback (AccessibleObject.class, "atkAction_get_name", 2); //$NON-NLS-1$
-@@ -157,7 +157,7 @@
+@@ -158,7 +158,7 @@
return callback;
}
@@ -4410,7 +50,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
super ();
widgetTypeName = OS.g_type_name (widgetType);
int widgetTypeNameLength = OS.strlen (widgetTypeName) + 1;
-@@ -168,40 +168,40 @@
+@@ -169,40 +169,40 @@
System.arraycopy (buffer, 0, factoryName, FACTORY_TYPENAME.length - 1, widgetTypeNameLength);
if (OS.g_type_from_name (factoryName) == 0) {
/* register the factory */
@@ -4460,7 +100,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
ATK.atk_object_initialize (result, widget);
return result;
}
-@@ -212,21 +212,21 @@
+@@ -213,21 +213,21 @@
int typeNameLength = OS.strlen (widgetTypeName);
byte[] buffer = new byte [typeNameLength];
OS.memmove (buffer, widgetTypeName, typeNameLength);
@@ -4486,7 +126,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = childId;
AccessibleControlListener[] listeners = accessible.getControlListeners ();
-@@ -269,13 +269,13 @@
+@@ -270,13 +270,13 @@
if (selection) swtTypeName += "Selection"; //$NON-NLS-1$
if (text) swtTypeName += "Text"; //$NON-NLS-1$
@@ -4502,7 +142,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
OS.g_type_query (parentType, queryPtr);
GTypeQuery query = new GTypeQuery ();
OS.memmove (query, queryPtr, GTypeQuery.sizeof);
-@@ -298,19 +298,19 @@
+@@ -299,19 +299,19 @@
return type;
}
@@ -4526,7 +166,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, klass);
objectClass.get_name = AtkObjectCB_get_name.getAddress ();
-@@ -321,7 +321,7 @@
+@@ -322,7 +322,7 @@
objectClass.ref_state_set = AtkObjectCB_ref_state_set.getAddress ();
objectClass.get_index_in_parent = AtkObjectCB_get_index_in_parent.getAddress ();
objectClass.ref_child = AtkObjectCB_ref_child.getAddress ();
@@ -4535,7 +175,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
GObjectClass objectClassStruct = new GObjectClass ();
OS.memmove (objectClassStruct, gObjectClass);
objectClassStruct.finalize = GObjectClass_finalize.getAddress ();
-@@ -330,7 +330,7 @@
+@@ -331,7 +331,7 @@
return 0;
}
@@ -4544,7 +184,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AtkActionIface actionIface = new AtkActionIface ();
ATK.memmove (actionIface, iface);
actionIface.get_keybinding = AtkActionCB_get_keybinding.getAddress ();
-@@ -339,7 +339,7 @@
+@@ -340,7 +340,7 @@
return 0;
}
@@ -4553,7 +193,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AtkComponentIface componentIface = new AtkComponentIface ();
ATK.memmove (componentIface, iface);
componentIface.get_extents = AtkComponentCB_get_extents.getAddress ();
-@@ -350,7 +350,7 @@
+@@ -351,7 +351,7 @@
return 0;
}
@@ -4562,7 +202,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AtkHypertextIface hypertextIface = new AtkHypertextIface ();
ATK.memmove (hypertextIface, iface);
hypertextIface.get_link = AtkHypertextCB_get_link.getAddress ();
-@@ -360,7 +360,7 @@
+@@ -361,7 +361,7 @@
return 0;
}
@@ -4571,7 +211,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AtkSelectionIface selectionIface = new AtkSelectionIface ();
ATK.memmove (selectionIface, iface);
selectionIface.is_child_selected = AtkSelectionCB_is_child_selected.getAddress ();
-@@ -369,7 +369,7 @@
+@@ -370,7 +370,7 @@
return 0;
}
@@ -4580,7 +220,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AtkTextIface textInterface = new AtkTextIface ();
ATK.memmove (textInterface, iface);
textInterface.get_caret_offset = AtkTextCB_get_caret_offset.getAddress ();
-@@ -388,8 +388,8 @@
+@@ -389,8 +389,8 @@
static void registerAccessible (Accessible accessible) {
/* If DefaultParentType is 0 then OS accessibility is not active */
if (DefaultParentType == 0) return;
@@ -4591,7 +231,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));
if (factory == null) {
factory = new AccessibleFactory (widgetType);
-@@ -403,8 +403,8 @@
+@@ -404,8 +404,8 @@
}
static void unregisterAccessible (Accessible accessible) {
@@ -4602,10 +242,10 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleFactory.java x86_64/org/ecl
AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType));
if (factory != null) {
factory.removeAccessible (accessible);
-diff -ur x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/swt/accessibility/Accessible.java
---- x86/org/eclipse/swt/accessibility/Accessible.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/accessibility/Accessible.java 2009-02-11 17:43:46.000000000 -0500
-@@ -163,7 +163,7 @@
+diff -urN x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/swt/accessibility/Accessible.java
+--- x86/org/eclipse/swt/accessibility/Accessible.java 2009-05-29 17:30:30.000000000 -0400
++++ x86_64/org/eclipse/swt/accessibility/Accessible.java 2009-09-17 08:48:16.000000000 -0400
+@@ -169,7 +169,7 @@
return result;
}
@@ -4614,9 +254,9 @@ diff -ur x86/org/eclipse/swt/accessibility/Accessible.java x86_64/org/eclipse/sw
return control.handle;
}
-diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/eclipse/swt/accessibility/AccessibleObject.java
---- x86/org/eclipse/swt/accessibility/AccessibleObject.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/accessibility/AccessibleObject.java 2009-02-11 17:43:46.000000000 -0500
+diff -urN x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/eclipse/swt/accessibility/AccessibleObject.java
+--- x86/org/eclipse/swt/accessibility/AccessibleObject.java 2009-05-29 17:30:30.000000000 -0400
++++ x86_64/org/eclipse/swt/accessibility/AccessibleObject.java 2009-09-17 08:48:16.000000000 -0400
@@ -18,8 +18,8 @@
import org.eclipse.swt.widgets.*;
@@ -4939,7 +579,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (DEBUG) System.out.println ("-->atkObject_get_role: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -496,14 +496,14 @@
+@@ -497,14 +497,14 @@
}
}
}
@@ -4956,7 +596,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (DEBUG) System.out.println ("-->atkObject_ref_child: " + index + " of: " + atkObject);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -513,19 +513,19 @@
+@@ -514,19 +514,19 @@
OS.g_object_ref (accObject.handle);
return accObject.handle;
}
@@ -4980,16 +620,16 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkObjectClass objectClass = new AtkObjectClass ();
ATK.memmove (objectClass, superType);
if (objectClass.ref_state_set != 0) {
-@@ -534,7 +534,7 @@
+@@ -535,7 +535,7 @@
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
- int /*long*/ set = parentResult;
+ long /*int*/ set = parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.detail = -1;
-@@ -563,13 +563,13 @@
+@@ -564,13 +564,13 @@
return set;
}
@@ -5006,7 +646,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkSelectionIface selectionIface = new AtkSelectionIface ();
ATK.memmove (selectionIface, superType);
if (selectionIface.is_child_selected != 0) {
-@@ -591,13 +591,13 @@
+@@ -592,13 +592,13 @@
return parentResult;
}
@@ -5023,7 +663,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkSelectionIface selectionIface = new AtkSelectionIface ();
ATK.memmove (selectionIface, superType);
if (selectionIface.ref_selection != 0) {
-@@ -621,13 +621,13 @@
+@@ -622,13 +622,13 @@
return parentResult;
}
@@ -5040,7 +680,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_caret_offset != 0) {
-@@ -646,14 +646,14 @@
+@@ -647,14 +647,14 @@
return event.offset;
}
@@ -5057,7 +697,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_character_at_offset != 0) {
-@@ -663,14 +663,14 @@
+@@ -664,14 +664,14 @@
return 0;
}
@@ -5074,7 +714,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_character_count != 0) {
-@@ -680,13 +680,13 @@
+@@ -681,13 +681,13 @@
return 0;
}
@@ -5091,7 +731,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_n_selections != 0) {
-@@ -704,14 +704,14 @@
+@@ -705,14 +705,14 @@
return event.length == 0 ? parentResult : 1;
}
@@ -5108,7 +748,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
AtkTextIface textIface = new AtkTextIface ();
ATK.memmove (textIface, superType);
if (textIface.get_selection != 0) {
-@@ -737,7 +737,7 @@
+@@ -738,7 +738,7 @@
return 0;
}
@@ -5117,7 +757,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (DEBUG) System.out.println ("-->atkText_get_text: " + start_offset + "," + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -751,14 +751,14 @@
+@@ -752,14 +752,14 @@
start_offset = Math.min (start_offset, end_offset);
text = text.substring ((int)/*64*/start_offset, (int)/*64*/end_offset);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -5134,7 +774,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (DEBUG) System.out.println ("-->atkText_get_text_after_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -924,14 +924,14 @@
+@@ -925,14 +925,14 @@
OS.memmove (end_offset, new int[] {endBounds}, 4);
text = text.substring (startBounds, endBounds);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -5151,7 +791,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (DEBUG) System.out.println ("-->atkText_get_text_at_offset: " + offset_value + " start: " + start_offset + " end: " + end_offset);
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -1040,14 +1040,14 @@
+@@ -1041,14 +1041,14 @@
OS.memmove (end_offset, new int[] {endBounds}, 4);
text = text.substring (startBounds, endBounds);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -5168,7 +808,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (DEBUG) System.out.println ("-->atkText_get_text_before_offset");
AccessibleObject object = getAccessibleObject (atkObject);
if (object == null) return 0;
-@@ -1161,7 +1161,7 @@
+@@ -1162,7 +1162,7 @@
OS.memmove (end_offset, new int[] {endBounds}, 4);
text = text.substring (startBounds, endBounds);
byte[] bytes = Converter.wcsToMbcs (null, text, true);
@@ -5177,7 +817,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
OS.memmove (result, bytes, bytes.length);
return result;
}
-@@ -1174,11 +1174,11 @@
+@@ -1175,11 +1175,11 @@
return result != null ? result : new AccessibleListener [0];
}
@@ -5191,7 +831,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
return (AccessibleObject) children.get (new LONG (handle));
}
-@@ -1208,13 +1208,13 @@
+@@ -1209,13 +1209,13 @@
}
String getText () {
@@ -5208,7 +848,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
if (textIface.get_character_count != 0) {
characterCount = ATK.call (textIface.get_character_count, handle);
}
-@@ -1245,9 +1245,9 @@
+@@ -1246,9 +1246,9 @@
return result != null ? result : new AccessibleTextListener [0];
}
@@ -5221,7 +861,7 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
GObjectClass objectClassStruct = new GObjectClass ();
ATK.memmove (objectClassStruct, gObjectClass);
ATK.call (objectClassStruct.finalize, atkObject);
-@@ -1364,11 +1364,11 @@
+@@ -1365,11 +1365,11 @@
Vector idsToKeep = new Vector (children.size ());
if (event.children [0] instanceof Integer) {
/* an array of child id's (Integers) was answered */
@@ -5235,10 +875,10 @@ diff -ur x86/org/eclipse/swt/accessibility/AccessibleObject.java x86_64/org/ecli
object = new AccessibleObject (childType, 0, accessible, parentType, true);
AccessibleObjects.put (new LONG (object.handle), object);
addChild (object);
-diff -ur x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT.java
---- x86/org/eclipse/swt/awt/SWT_AWT.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/awt/SWT_AWT.java 2009-02-11 17:43:46.000000000 -0500
-@@ -63,7 +63,7 @@
+diff -urN x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT.java
+--- x86/org/eclipse/swt/awt/SWT_AWT.java 2008-11-26 15:56:54.000000000 -0500
++++ x86_64/org/eclipse/swt/awt/SWT_AWT.java 2009-09-17 08:48:16.000000000 -0400
+@@ -64,7 +64,7 @@
static boolean loaded, swingInitialized;
@@ -5247,7 +887,7 @@ diff -ur x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT
static native final void setDebug (Frame canvas, boolean debug);
static synchronized void loadLibrary () {
-@@ -151,7 +151,7 @@
+@@ -152,7 +152,7 @@
if ((parent.getStyle () & SWT.EMBEDDED) == 0) {
SWT.error (SWT.ERROR_INVALID_ARGUMENT);
}
@@ -5256,7 +896,7 @@ diff -ur x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT
/*
* Some JREs have implemented the embedded frame constructor to take an integer
* and other JREs take a long. To handle this binary incompatibility, use
-@@ -199,9 +199,9 @@
+@@ -200,9 +200,9 @@
if (parent.isDisposed()) return;
Shell shell = parent.getShell();
loadLibrary();
@@ -5268,7 +908,7 @@ diff -ur x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT
OS.XSetTransientForHint(OS.GDK_DISPLAY(), awtHandle, xWindow);
}
});
-@@ -299,7 +299,7 @@
+@@ -300,7 +300,7 @@
public static Shell new_Shell (final Display display, final Canvas parent) {
if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
@@ -5277,10 +917,10 @@ diff -ur x86/org/eclipse/swt/awt/SWT_AWT.java x86_64/org/eclipse/swt/awt/SWT_AWT
try {
loadLibrary ();
handle = getAWTHandle (parent);
-diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/swt/browser/AppFileLocProvider.java
---- x86/org/eclipse/swt/browser/AppFileLocProvider.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/AppFileLocProvider.java 2009-02-11 17:43:48.000000000 -0500
-@@ -47,24 +47,24 @@
+diff -urN x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/swt/browser/AppFileLocProvider.java
+--- x86/org/eclipse/swt/browser/AppFileLocProvider.java 2009-08-20 15:16:38.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/AppFileLocProvider.java 2009-09-17 08:48:20.000000000 -0400
+@@ -54,24 +54,24 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -5317,7 +957,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
};
}
-@@ -83,32 +83,32 @@
+@@ -90,32 +90,32 @@
}
}
@@ -5356,7 +996,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -121,7 +121,7 @@
+@@ -132,7 +132,7 @@
void setProfilePath (String path) {
profilePath = path;
if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$
@@ -5365,7 +1005,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
nsEmbedString pathString = new nsEmbedString (path);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -137,7 +137,7 @@
+@@ -148,7 +148,7 @@
/* nsIDirectoryServiceProvider2 */
@@ -5374,7 +1014,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -148,7 +148,7 @@
+@@ -159,7 +159,7 @@
if (pluginDirs == null) {
int index = 0;
/* set the first value(s) to the MOZ_PLUGIN_PATH environment variable value if it's defined */
@@ -5383,7 +1023,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -189,9 +189,9 @@
+@@ -210,9 +210,9 @@
propertyValues = pluginDirs;
}
@@ -5395,7 +1035,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
nsISupports[] files = new nsISupports [propertyValues.length];
int index = 0;
for (int i = 0; i < propertyValues.length; i++) {
-@@ -225,7 +225,7 @@
+@@ -246,7 +246,7 @@
SimpleEnumerator enumerator = new SimpleEnumerator (files);
enumerator.AddRef ();
@@ -5404,7 +1044,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
return XPCOM.NS_OK;
}
-@@ -234,7 +234,7 @@
+@@ -255,7 +255,7 @@
/* nsIDirectoryServiceProvider implementation */
@@ -5413,7 +1053,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
int size = XPCOM.strlen (prop);
byte[] bytes = new byte[size];
XPCOM.memmove (bytes, prop, size);
-@@ -288,9 +288,9 @@
+@@ -309,9 +309,9 @@
}
XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */
@@ -5425,7 +1065,7 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
nsEmbedString pathString = new nsEmbedString (propertyValue);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -303,7 +303,7 @@
+@@ -324,7 +324,7 @@
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -5434,10 +1074,10 @@ diff -ur x86/org/eclipse/swt/browser/AppFileLocProvider.java x86_64/org/eclipse/
localFile.Release ();
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/browser/Download_1_8.java
---- x86/org/eclipse/swt/browser/Download_1_8.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/Download_1_8.java 2009-02-11 17:43:48.000000000 -0500
-@@ -42,97 +42,97 @@
+diff -urN x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/browser/Download_1_8.java
+--- x86/org/eclipse/swt/browser/Download_1_8.java 2008-08-21 15:41:30.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/Download_1_8.java 2009-09-17 08:48:20.000000000 -0400
+@@ -48,97 +48,97 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -5593,7 +1233,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
};
}
-@@ -155,36 +155,36 @@
+@@ -161,36 +161,36 @@
}
}
@@ -5637,7 +1277,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -197,26 +197,26 @@
+@@ -203,26 +203,26 @@
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
@@ -5669,7 +1309,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
rc = target.GetPath (aPath);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aPath);
-@@ -271,60 +271,60 @@
+@@ -277,60 +277,60 @@
return XPCOM.NS_OK;
}
@@ -5744,7 +1384,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-@@ -332,26 +332,26 @@
+@@ -338,26 +338,26 @@
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -5776,7 +1416,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1;
long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1;
long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1;
-@@ -359,7 +359,7 @@
+@@ -365,7 +365,7 @@
return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
@@ -5785,7 +1425,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
long currentKBytes = aCurTotalProgress / 1024;
long totalKBytes = aMaxTotalProgress / 1024;
if (shell != null && !shell.isDisposed ()) {
-@@ -372,11 +372,11 @@
+@@ -378,11 +378,11 @@
return XPCOM.NS_OK;
}
@@ -5799,7 +1439,7 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
cancelable = null;
if (shell != null && !shell.isDisposed ()) shell.dispose ();
-@@ -385,7 +385,7 @@
+@@ -391,7 +391,7 @@
return XPCOM.NS_OK;
}
@@ -5808,9 +1448,9 @@ diff -ur x86/org/eclipse/swt/browser/Download_1_8.java x86_64/org/eclipse/swt/br
return XPCOM.NS_OK;
}
}
-diff -ur x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java
---- x86/org/eclipse/swt/browser/DownloadFactory_1_8.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java
+--- x86/org/eclipse/swt/browser/DownloadFactory_1_8.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/DownloadFactory_1_8.java 2009-09-17 08:48:20.000000000 -0400
@@ -30,17 +30,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -5883,9 +1523,9 @@ diff -ur x86/org/eclipse/swt/browser/DownloadFactory_1_8.java x86_64/org/eclipse
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/swt/browser/DownloadFactory.java
---- x86/org/eclipse/swt/browser/DownloadFactory.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/DownloadFactory.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/swt/browser/DownloadFactory.java
+--- x86/org/eclipse/swt/browser/DownloadFactory.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/DownloadFactory.java 2009-09-17 08:48:20.000000000 -0400
@@ -30,17 +30,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -5958,10 +1598,10 @@ diff -ur x86/org/eclipse/swt/browser/DownloadFactory.java x86_64/org/eclipse/swt
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browser/Download.java
---- x86/org/eclipse/swt/browser/Download.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/Download.java 2009-02-11 17:43:48.000000000 -0500
-@@ -40,63 +40,63 @@
+diff -urN x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browser/Download.java
+--- x86/org/eclipse/swt/browser/Download.java 2008-08-21 15:41:30.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/Download.java 2009-09-17 08:48:20.000000000 -0400
+@@ -46,63 +46,63 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -6073,7 +1713,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
};
}
-@@ -119,36 +119,36 @@
+@@ -125,36 +125,36 @@
}
}
@@ -6117,7 +1757,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -161,13 +161,13 @@
+@@ -167,13 +167,13 @@
/* nsIDownload */
/* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */
@@ -6134,14 +1774,14 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -180,12 +180,12 @@
+@@ -186,12 +186,12 @@
*/
String filename = null;
nsISupports supports = new nsISupports (aTarget);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);
- if (rc == 0) { /* >= 1.7 */
+ if (rc == XPCOM.NS_OK) { /* >= 1.7 */
nsIURI target = new nsIURI (result[0]);
result[0] = 0;
- int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
@@ -6149,7 +1789,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
rc = target.GetPath (aPath);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aPath);
-@@ -199,7 +199,7 @@
+@@ -205,7 +205,7 @@
target.Release ();
} else { /* < 1.7 */
nsILocalFile target = new nsILocalFile (aTarget);
@@ -6158,7 +1798,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
rc = target.GetNativeLeafName (aNativeTarget);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
length = XPCOM.nsEmbedCString_Length (aNativeTarget);
-@@ -253,54 +253,54 @@
+@@ -259,54 +259,54 @@
return XPCOM.NS_OK;
}
@@ -6226,7 +1866,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
int rc = supports.QueryInterface (nsIHelperAppLauncher.NS_IHELPERAPPLAUNCHER_IID, result);
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -310,11 +310,11 @@
+@@ -316,11 +316,11 @@
}
/* nsIProgressDialog */
@@ -6240,7 +1880,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-@@ -322,17 +322,17 @@
+@@ -328,17 +328,17 @@
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -6261,7 +1901,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
if (helperAppLauncher != null) helperAppLauncher.Release ();
helperAppLauncher = null;
-@@ -342,7 +342,7 @@
+@@ -348,7 +348,7 @@
return XPCOM.NS_OK;
}
@@ -6270,7 +1910,7 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
int currentKBytes = aCurTotalProgress / 1024;
int totalKBytes = aMaxTotalProgress / 1024;
if (shell != null && !shell.isDisposed ()) {
-@@ -355,15 +355,15 @@
+@@ -361,15 +361,15 @@
return XPCOM.NS_OK;
}
@@ -6289,9 +1929,500 @@ diff -ur x86/org/eclipse/swt/browser/Download.java x86_64/org/eclipse/swt/browse
return XPCOM.NS_OK;
}
}
-diff -ur x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt/browser/FilePicker_1_8.java
---- x86/org/eclipse/swt/browser/FilePicker_1_8.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePicker_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/ExternalFactory.java x86_64/org/eclipse/swt/browser/ExternalFactory.java
+--- x86/org/eclipse/swt/browser/ExternalFactory.java 2008-12-02 11:18:46.000000000 -0500
++++ x86_64/org/eclipse/swt/browser/ExternalFactory.java 2009-09-17 08:48:20.000000000 -0400
+@@ -30,17 +30,17 @@
+ void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ };
+
+ factory = new XPCOMObject (new int[] {2, 0, 0, 3, 1}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return LockFactory ((int)/*64*/args[0]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return CreateInstance (args[0], args[1], args[2]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return LockFactory ((int)/*64*/args[0]);}
+ };
+ }
+
+@@ -55,27 +55,27 @@
+ }
+ }
+
+-int /*long*/ getAddress () {
++long /*int*/ getAddress () {
+ return factory.getAddress ();
+ }
+
+-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
++int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+ if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
+ nsID guid = new nsID ();
+ XPCOM.memmove (guid, riid, nsID.sizeof);
+
+ if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsIFactory.NS_IFACTORY_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {factory.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
+
+- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_ERROR_NO_INTERFACE;
+ }
+
+@@ -87,10 +87,10 @@
+
+ /* nsIFactory */
+
+-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
++int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
+ External external = new External ();
+ external.AddRef ();
+- XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (result, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+diff -urN x86/org/eclipse/swt/browser/External.java x86_64/org/eclipse/swt/browser/External.java
+--- x86/org/eclipse/swt/browser/External.java 2009-05-29 17:30:22.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/External.java 2009-09-17 08:48:20.000000000 -0400
+@@ -39,40 +39,40 @@
+ void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ };
+
+ classInfo = new XPCOMObject (new int[] {2, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return getInterfaces (args[0], args[1]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return getContractID (args[0]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return getClassDescription (args[0]);}
+- public int /*long*/ method7 (int /*long*/[] args) {return getClassID (args[0]);}
+- public int /*long*/ method8 (int /*long*/[] args) {return getImplementationLanguage (args[0]);}
+- public int /*long*/ method9 (int /*long*/[] args) {return getFlags (args[0]);}
+- public int /*long*/ method10 (int /*long*/[] args) {return getClassIDNoAlloc (args[0]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return getInterfaces (args[0], args[1]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return getContractID (args[0]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return getClassDescription (args[0]);}
++ public long /*int*/ method7 (long /*int*/[] args) {return getClassID (args[0]);}
++ public long /*int*/ method8 (long /*int*/[] args) {return getImplementationLanguage (args[0]);}
++ public long /*int*/ method9 (long /*int*/[] args) {return getFlags (args[0]);}
++ public long /*int*/ method10 (long /*int*/[] args) {return getClassIDNoAlloc (args[0]);}
+ };
+
+ securityCheckedComponent = new XPCOMObject (new int[] {2, 0, 0, 2, 3, 3, 3}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return canCreateWrapper (args[0], args[1]);}
+- public int /*long*/ method4 (int /*long*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
+- public int /*long*/ method5 (int /*long*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
+- public int /*long*/ method6 (int /*long*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return canCreateWrapper (args[0], args[1]);}
++ public long /*int*/ method4 (long /*int*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
++ public long /*int*/ method5 (long /*int*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
++ public long /*int*/ method6 (long /*int*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
+ };
+
+ external = new XPCOMObject (new int[] {2, 0, 0, 3}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2]);}
+ };
+
+ }
+@@ -88,37 +88,37 @@
+ }
+ }
+
+-int /*long*/ getAddress () {
++long /*int*/ getAddress () {
+ return external.getAddress ();
+ }
+
+-int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
++int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) {
+ if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
+ nsID guid = new nsID ();
+ XPCOM.memmove (guid, riid, nsID.sizeof);
+
+ if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsIClassInfo.NS_ICLASSINFO_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (EXTERNAL_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+
+- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_ERROR_NO_INTERFACE;
+ }
+
+@@ -130,8 +130,8 @@
+
+ /* nsIClassInfo */
+
+-int getClassDescription (int /*long*/ _retValue) {
+- int /*long*/[] result = new int /*long*/[1];
++int getClassDescription (long /*int*/ _retValue) {
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -147,44 +147,44 @@
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
+- int /*long*/ ptr = memory.Alloc (bytes.length);
++ long /*int*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+- C.memmove (_retValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ C.memmove (_retValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+ }
+
+-int getClassID (int /*long*/ _retValue) {
++int getClassID (long /*int*/ _retValue) {
+ return XPCOM.NS_OK;
+ }
+
+-int getClassIDNoAlloc (int /*long*/ _retValue) {
++int getClassIDNoAlloc (long /*int*/ _retValue) {
+ return XPCOM.NS_OK;
+ }
+
+-int getContractID (int /*long*/ _retValue) {
++int getContractID (long /*int*/ _retValue) {
+ return XPCOM.NS_OK;
+ }
+
+-int getFlags (int /*long*/ flags) {
++int getFlags (long /*int*/ flags) {
+ C.memmove (flags, new int[] {nsIClassInfo.MAIN_THREAD_ONLY}, 4); /* PRUint32 */
+ return XPCOM.NS_OK;
+ }
+
+-int getHelperForLanguage (int language, int /*long*/ _retValue) {
+- C.memmove (_retValue, new int /*long*/[] {0}, C.PTR_SIZEOF);
++int getHelperForLanguage (int language, long /*int*/ _retValue) {
++ C.memmove (_retValue, new long /*int*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+ }
+
+-int getImplementationLanguage (int /*long*/ _retValue) {
++int getImplementationLanguage (long /*int*/ _retValue) {
+ C.memmove (_retValue, new int[] {5}, 4); /* nsIProgrammingLanguage.JAVA */ /* PRUint */
+ return XPCOM.NS_OK;
+ }
+
+
+-int getInterfaces (int /*long*/ count, int /*long*/ array) {
+- int /*long*/[] result = new int /*long*/[1];
++int getInterfaces (long /*int*/ count, long /*int*/ array) {
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -199,14 +199,14 @@
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+- int /*long*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
++ long /*int*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
+ XPCOM.memmove (securityCheckedComponentIID, nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
+- int /*long*/ externalIID = memory.Alloc (nsID.sizeof);
++ long /*int*/ externalIID = memory.Alloc (nsID.sizeof);
+ XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);
+- int /*long*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);
+- C.memmove (ptrArray, new int /*long*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
+- C.memmove (ptrArray + C.PTR_SIZEOF, new int /*long*/[] {externalIID}, C.PTR_SIZEOF);
+- C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);
++ long /*int*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);
++ C.memmove (ptrArray, new long /*int*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
++ C.memmove (ptrArray + C.PTR_SIZEOF, new long /*int*/[] {externalIID}, C.PTR_SIZEOF);
++ C.memmove (array, new long /*int*/[] {ptrArray}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ C.memmove (count, new int[] {2}, 4); /* PRUint */
+@@ -215,8 +215,8 @@
+
+ /* nsISecurityCheckedComponent */
+
+-int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
+- int /*long*/[] result = new int /*long*/[1];
++int canCreateWrapper (long /*int*/ iid, long /*int*/ _retVal) {
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -232,16 +232,16 @@
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
+- int /*long*/ ptr = memory.Alloc (bytes.length);
++ long /*int*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+ }
+
+-int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retVal) {
+- int /*long*/[] result = new int /*long*/[1];
++int canCallMethod (long /*int*/ iid, long /*int*/ methodName, long /*int*/ _retVal) {
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -266,16 +266,16 @@
+ } else {
+ bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
+ }
+- int /*long*/ ptr = memory.Alloc (bytes.length);
++ long /*int*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+ }
+
+-int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
+- int /*long*/[] result = new int /*long*/[1];
++int canGetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -291,16 +291,16 @@
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
+- int /*long*/ ptr = memory.Alloc (bytes.length);
++ long /*int*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+ }
+
+-int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
+- int /*long*/[] result = new int /*long*/[1];
++int canSetProperty (long /*int*/ iid, long /*int*/ propertyName, long /*int*/ _retVal) {
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -316,9 +316,9 @@
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
+- int /*long*/ ptr = memory.Alloc (bytes.length);
++ long /*int*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+- C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ C.memmove (_retVal, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+@@ -344,7 +344,7 @@
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return new Double (intResult[0]);
+ case nsIDataType.VTYPE_DOUBLE:
+- int /*long*/ doubleReturn = C.malloc (8);
++ long /*int*/ doubleReturn = C.malloc (8);
+ rc = variant.GetAsDouble (doubleReturn);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ double[] doubleResult = new double[1];
+@@ -353,7 +353,7 @@
+ return new Double (doubleResult[0]);
+ case nsIDataType.VTYPE_WSTRING_SIZE_IS:
+ int[] size = new int[1]; /* PRInt32 */
+- int /*long*/[] wString = new int /*long*/[1];
++ long /*int*/[] wString = new long /*int*/[1];
+ rc = variant.GetAsWStringWithSize (size, wString);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ char[] chars = new char[size[0]];
+@@ -361,11 +361,11 @@
+ return new String (chars);
+ case nsIDataType.VTYPE_ARRAY:
+ Object[] arrayReturn = new Object[0];
+- int /*long*/ iid = C.malloc (nsID.sizeof);
++ long /*int*/ iid = C.malloc (nsID.sizeof);
+ C.memset (iid, 0, nsID.sizeof);
+ int[] count = new int[1]; /* PRUint32 */
+ short[] currentType = new short[1];
+- int /*long*/[] ptr = new int /*long*/[1];
++ long /*int*/[] ptr = new long /*int*/[1];
+ rc = variant.GetAsArray (currentType, iid, count, ptr);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
+@@ -373,7 +373,7 @@
+ XPCOM.memmove (id, iid, nsID.sizeof);
+ C.free (iid);
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -392,7 +392,7 @@
+ if (id.Equals (nsIVariant.NS_IVARIANT_IID)) {
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+- int /*long*/[] arrayPtr = new int /*long*/[1];
++ long /*int*/[] arrayPtr = new long /*int*/[1];
+ C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
+ nsISupports supports = new nsISupports (arrayPtr[0]);
+ rc = supports.QueryInterface (nsIVariant.NS_IVARIANT_IID, result);
+@@ -444,8 +444,8 @@
+ case nsIDataType.VTYPE_WCHAR_STR:
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+- int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
+- int /*long*/[] stringPtr = new int /*long*/[1];
++ long /*int*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
++ long /*int*/[] stringPtr = new long /*int*/[1];
+ C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
+ int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
+ char[] dest = new char[length];
+@@ -468,7 +468,7 @@
+ }
+
+ nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
+ int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);
+ nsIWritableVariant variant = new nsIWritableVariant (result[0]);
+@@ -504,26 +504,26 @@
+ Object[] arrayValue = (Object[])value;
+ int length = arrayValue.length;
+ if (length > 0) {
+- int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
++ long /*int*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
+ for (int i = 0; i < length; i++) {
+ Object currentObject = arrayValue[i];
+ try {
+ nsIVariant currentVariant = convertToJS (currentObject, componentManager);
+- C.memmove (arrayPtr + C.PTR_SIZEOF * i, new int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
++ C.memmove (arrayPtr + C.PTR_SIZEOF * i, new long /*int*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
+ } catch (SWTException e) {
+ /* invalid return value type */
+ C.free (arrayPtr);
+ variant.Release ();
+ /* release the variants that had previously been added to the array */
+ for (int j = 0; j < i; j++) {
+- int /*long*/[] ptr = new int /*long*/[1];
++ long /*int*/[] ptr = new long /*int*/[1];
+ C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);
+ new nsISupports (ptr[0]).Release ();
+ }
+ throw e;
+ }
+ }
+- int /*long*/ idPtr = C.malloc (nsID.sizeof);
++ long /*int*/ idPtr = C.malloc (nsID.sizeof);
+ XPCOM.memmove (idPtr, nsIVariant.NS_IVARIANT_IID, nsID.sizeof);
+ rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
+ C.free (idPtr);
+@@ -538,7 +538,7 @@
+ return null;
+ }
+
+-int callJava (int functionId, int /*long*/ args, int /*long*/ returnPtr) {
++int callJava (int functionId, long /*int*/ args, long /*int*/ returnPtr) {
+ Object key = new Integer (functionId);
+ BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
+ Object returnValue = null;
+@@ -569,7 +569,7 @@
+ }
+ }
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetComponentManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -583,7 +583,7 @@
+ variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);
+ }
+ componentManager.Release ();
+- C.memmove (returnPtr, new int /*long*/[] {variant.getAddress ()}, C.PTR_SIZEOF);
++ C.memmove (returnPtr, new long /*int*/[] {variant.getAddress ()}, C.PTR_SIZEOF);
+
+ return XPCOM.NS_OK;
+ }
+diff -urN x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt/browser/FilePicker_1_8.java
+--- x86/org/eclipse/swt/browser/FilePicker_1_8.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/FilePicker_1_8.java 2009-09-17 08:48:20.000000000 -0400
@@ -17,30 +17,30 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -6357,9 +2488,9 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker_1_8.java x86_64/org/eclipse/swt/
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
return new String (chars);
-diff -ur x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java
---- x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java
+--- x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2007-08-01 15:57:26.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/FilePickerFactory_1_8.java 2009-09-17 08:48:20.000000000 -0400
@@ -18,26 +18,26 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -6397,9 +2528,9 @@ diff -ur x86/org/eclipse/swt/browser/FilePickerFactory_1_8.java x86_64/org/eclip
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/swt/browser/FilePickerFactory.java
---- x86/org/eclipse/swt/browser/FilePickerFactory.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePickerFactory.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/swt/browser/FilePickerFactory.java
+--- x86/org/eclipse/swt/browser/FilePickerFactory.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/FilePickerFactory.java 2009-09-17 08:48:20.000000000 -0400
@@ -30,17 +30,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -6472,9 +2603,9 @@ diff -ur x86/org/eclipse/swt/browser/FilePickerFactory.java x86_64/org/eclipse/s
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/browser/FilePicker.java
---- x86/org/eclipse/swt/browser/FilePicker.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/FilePicker.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/browser/FilePicker.java
+--- x86/org/eclipse/swt/browser/FilePicker.java 2008-09-05 12:40:14.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/FilePicker.java 2009-09-17 08:48:20.000000000 -0400
@@ -21,7 +21,7 @@
int refCount = 0;
@@ -6575,7 +2706,16 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/brow
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -117,20 +117,20 @@
+@@ -112,7 +112,7 @@
+ return refCount;
+ }
+
+-Browser getBrowser (int /*long*/ aDOMWindow) {
++Browser getBrowser (long /*int*/ aDOMWindow) {
+ if (aDOMWindow == 0) return null;
+ nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
+ return Mozilla.findBrowser (window);
+@@ -123,20 +123,20 @@
* answers a java string based on the type of string that is appropriate for the Mozilla
* version being used.
*/
@@ -6599,7 +2739,7 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/brow
if (mode == nsIFilePicker.modeGetFolder) {
/* picking a directory */
int result = showDirectoryPicker ();
-@@ -176,20 +176,20 @@
+@@ -186,20 +186,20 @@
return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK;
}
@@ -6624,7 +2764,7 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/brow
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -198,13 +198,13 @@
+@@ -208,13 +208,13 @@
return XPCOM.NS_OK;
}
@@ -6641,7 +2781,7 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/brow
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
XPCOM.nsEmbedCString_delete (pathname);
-@@ -213,10 +213,10 @@
+@@ -223,10 +223,10 @@
return XPCOM.NS_OK;
}
@@ -6654,7 +2794,7 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/brow
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-@@ -229,31 +229,31 @@
+@@ -239,31 +239,31 @@
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
@@ -6692,10 +2832,10 @@ diff -ur x86/org/eclipse/swt/browser/FilePicker.java x86_64/org/eclipse/swt/brow
/* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2009-02-11 17:43:48.000000000 -0500
-@@ -32,17 +32,17 @@
+diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+--- x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2008-08-21 15:41:30.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java 2009-09-17 08:48:20.000000000 -0400
+@@ -38,17 +38,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -6721,7 +2861,7 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org
};
}
-@@ -57,27 +57,27 @@
+@@ -63,27 +63,27 @@
}
}
@@ -6754,7 +2894,7 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -96,12 +96,12 @@
+@@ -102,12 +102,12 @@
/* nsIHelperAppLauncherDialog */
@@ -6769,7 +2909,7 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org
int length = XPCOM.strlen_PRUnichar (aDefaultFileName);
char[] dest = new char[length];
XPCOM.memmove (dest, aDefaultFileName, length * 2);
-@@ -125,7 +125,7 @@
+@@ -131,7 +131,7 @@
return XPCOM.NS_ERROR_FAILURE;
}
nsEmbedString path = new nsEmbedString (name);
@@ -6778,10 +2918,10 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java x86_64/org
int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result);
path.dispose ();
if (rc != XPCOM.NS_OK) Mozilla.error (rc);
-diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-02-11 17:43:48.000000000 -0500
-@@ -31,17 +31,17 @@
+diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+--- x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-05-29 17:30:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java 2009-09-17 08:48:20.000000000 -0400
+@@ -30,17 +30,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -6807,7 +2947,7 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/
};
}
-@@ -56,27 +56,27 @@
+@@ -55,27 +55,27 @@
}
}
@@ -6840,13 +2980,13 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -88,15 +88,15 @@
+@@ -87,15 +87,15 @@
/* nsIFactory */
-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
+int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) {
- if (isPre_1_9) {
+ if (Mozilla.IsPre_1_9) {
HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
helperAppLauncherDialog.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
@@ -6859,9 +2999,9 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java x86_64/
}
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java
---- x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+--- x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2008-08-21 15:41:30.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/HelperAppLauncherDialog.java 2009-09-17 08:48:20.000000000 -0400
@@ -38,17 +38,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -6958,9 +3098,9 @@ diff -ur x86/org/eclipse/swt/browser/HelperAppLauncherDialog.java x86_64/org/ecl
int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result);
if (rc == XPCOM.NS_OK) {
using_1_8 = true;
-diff -ur x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/browser/InputStream.java
---- x86/org/eclipse/swt/browser/InputStream.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/InputStream.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/browser/InputStream.java
+--- x86/org/eclipse/swt/browser/InputStream.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/InputStream.java 2009-09-17 08:48:20.000000000 -0400
@@ -34,14 +34,14 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -7056,10 +3196,10 @@ diff -ur x86/org/eclipse/swt/browser/InputStream.java x86_64/org/eclipse/swt/bro
/* blocking */
XPCOM.memmove (_retval, new int[] {0}, 4);
return XPCOM.NS_OK;
-diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt/browser/MozillaDelegate.java
---- x86/org/eclipse/swt/browser/MozillaDelegate.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/MozillaDelegate.java 2009-02-11 17:43:48.000000000 -0500
-@@ -18,11 +18,11 @@
+diff -urN x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt/browser/MozillaDelegate.java
+--- x86/org/eclipse/swt/browser/MozillaDelegate.java 2009-08-20 15:16:38.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/MozillaDelegate.java 2009-09-17 08:48:22.000000000 -0400
+@@ -19,11 +19,11 @@
class MozillaDelegate {
Browser browser;
@@ -7072,8 +3212,8 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
+ static long /*int*/ eventProc;
static final int STOP_PROPOGATE = 1;
- static boolean IsLinux;
-@@ -40,8 +40,8 @@
+ static boolean IsSparc;
+@@ -47,8 +47,8 @@
this.browser = browser;
}
@@ -7084,7 +3224,7 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
parent = OS.gtk_widget_get_parent (parent);
if (parent == 0) return 0;
Widget widget = Display.getCurrent ().findWidget (parent);
-@@ -51,12 +51,12 @@
+@@ -58,12 +58,12 @@
return 0;
}
@@ -7099,8 +3239,8 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
Display display = Display.getCurrent ();
return (Browser)display.findWidget (parent);
}
-@@ -69,7 +69,7 @@
- return Converter.wcsToMbcs (codePage, string, terminate);
+@@ -83,7 +83,7 @@
+ return baseWindow.Create ();
}
-int /*long*/ getHandle () {
@@ -7108,7 +3248,7 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
/*
* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
* handle causes problems with some Mozilla plug-ins. For some
-@@ -94,7 +94,7 @@
+@@ -112,7 +112,7 @@
return "swt-xpcominit"; //$NON-NLS-1$
}
@@ -7117,7 +3257,7 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
if (event.type == OS.GDK_BUTTON_PRESS) {
-@@ -160,7 +160,7 @@
+@@ -178,7 +178,7 @@
* forward the event to the parent embedder before Mozilla received and consumed
* them.
*/
@@ -7126,7 +3266,7 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
if (list != 0) {
mozillaHandle = OS.g_list_data (list);
OS.g_list_free (list);
-@@ -186,7 +186,7 @@
+@@ -204,7 +204,7 @@
return true;
}
@@ -7135,8 +3275,8 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
if (listener != null) {
browser.getDisplay ().removeFilter (SWT.FocusIn, listener);
browser.getShell ().removeListener (SWT.Deactivate, listener);
-@@ -195,7 +195,7 @@
- browser = null;
+@@ -216,7 +216,7 @@
+ void removeWindowSubclass () {
}
-void setSize (int /*long*/ embedHandle, int width, int height) {
@@ -7144,10 +3284,10 @@ diff -ur x86/org/eclipse/swt/browser/MozillaDelegate.java x86_64/org/eclipse/swt
OS.gtk_widget_set_size_request (embedHandle, width, height);
}
-diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser/Mozilla.java
---- x86/org/eclipse/swt/browser/Mozilla.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/Mozilla.java 2009-02-11 17:43:48.000000000 -0500
-@@ -21,7 +21,7 @@
+diff -urN x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser/Mozilla.java
+--- x86/org/eclipse/swt/browser/Mozilla.java 2009-08-19 16:24:46.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/Mozilla.java 2009-09-17 08:48:20.000000000 -0400
+@@ -23,7 +23,7 @@
import org.eclipse.swt.layout.*;
class Mozilla extends WebBrowser {
@@ -7156,16 +3296,16 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
nsIWebBrowser webBrowser;
Object webBrowserObject;
MozillaDelegate delegate;
-@@ -41,7 +41,7 @@
- XPCOMObject domEventListener;
+@@ -44,7 +44,7 @@
+ XPCOMObject badCertListener;
int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
- int refCount, lastKeyCode, lastCharCode;
+ int refCount, lastKeyCode, lastCharCode, authCount;
- int /*long*/ request;
+ long /*int*/ request;
Point location, size;
- boolean visible, isChild, ignoreDispose, awaitingNavigate;
+ boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage;
Shell tip = null;
-@@ -97,7 +97,7 @@
+@@ -103,7 +103,7 @@
MozillaClearSessions = new Runnable () {
public void run () {
if (!Initialized) return;
@@ -7174,7 +3314,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -128,9 +128,9 @@
+@@ -133,9 +133,9 @@
rc = cookie.GetExpires (expires);
if (expires[0] == 0) {
/* indicates a session cookie */
@@ -7187,7 +3327,52 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
cookie.GetHost (domain);
cookie.GetName (name);
cookie.GetPath (path);
-@@ -153,7 +153,7 @@
+@@ -158,7 +158,7 @@
+ public void run() {
+ if (!Initialized) return;
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+@@ -172,7 +172,7 @@
+ nsIIOService ioService = new nsIIOService (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
+- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ ioService.Release ();
+@@ -186,7 +186,7 @@
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);
+- int /*long*/ cookieString;
++ long /*int*/ cookieString;
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ nsICookieService cookieService = new nsICookieService (result[0]);
+ result[0] = 0;
+@@ -244,7 +244,7 @@
+ public void run() {
+ if (!Initialized) return;
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+@@ -258,7 +258,7 @@
+ nsIIOService ioService = new nsIIOService (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
+- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ ioService.Release ();
+@@ -298,7 +298,7 @@
delegate = new MozillaDelegate (browser);
final Display display = parent.getDisplay ();
@@ -7196,7 +3381,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
if (!Initialized) {
boolean initLoaded = false;
boolean IsXULRunner = false;
-@@ -208,20 +208,20 @@
+@@ -353,20 +353,20 @@
/* attempt to discover a XULRunner to use as the GRE */
GREVersionRange range = new GREVersionRange ();
byte[] bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_LOWER, true);
@@ -7221,7 +3406,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length);
/*
-@@ -264,7 +264,7 @@
+@@ -409,7 +409,7 @@
if (Device.DEBUG) System.out.println ("cannot use detected XULRunner: " + mozillaPath); //$NON-NLS-1$
/* attempt to XPCOMGlueStartup the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -7230,7 +3415,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
if (ptr == 0) {
IsXULRunner = false;
} else {
-@@ -328,7 +328,7 @@
+@@ -473,7 +473,7 @@
}
/* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */
@@ -7239,16 +3424,38 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
if (ptr != 0) {
int length = C.strlen (ptr);
byte[] buffer = new byte[length];
-@@ -373,7 +373,7 @@
- }
+@@ -547,7 +547,7 @@
+ LocationProvider.setComponentsPath (componentsDir.getAbsolutePath ());
+ }
- if (!Initialized) {
- int /*long*/[] retVal = new int /*long*/[1];
+ long /*int*/[] retVal = new long /*int*/[1];
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, retVal);
pathString.dispose ();
-@@ -547,14 +547,14 @@
+@@ -564,18 +564,18 @@
+ if (IsXULRunner) {
+ int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+ /* alloc memory for two structs, the second is empty to signify the end of the list */
+- int /*long*/ ptr = C.malloc (size * 2);
++ long /*int*/ ptr = C.malloc (size * 2);
+ C.memset (ptr, 0, size * 2);
+ nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding", true); //$NON-NLS-1$
+ functionLoad.functionName = C.malloc (bytes.length);
+ C.memmove (functionLoad.functionName, bytes, bytes.length);
+ functionLoad.function = C.malloc (C.PTR_SIZEOF);
+- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
++ C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
+ XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+ XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+ C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+- int /*long*/ functionPtr = result[0];
++ long /*int*/ functionPtr = result[0];
+ result[0] = 0;
+ C.free (functionLoad.function);
+ C.free (functionLoad.functionName);
+@@ -744,14 +744,14 @@
nsIFile profileDir = new nsIFile (result[0]);
result[0] = 0;
@@ -7265,7 +3472,21 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
buffer = new byte [length];
XPCOM.memmove (buffer, ptr, length);
String profilePath = new String (MozillaDelegate.mbcsToWcs (null, buffer)) + PROFILE_DIR;
-@@ -936,7 +936,7 @@
+@@ -801,11 +801,11 @@
+ functionLoad.functionName = C.malloc (bytes.length);
+ C.memmove (functionLoad.functionName, bytes, bytes.length);
+ functionLoad.function = C.malloc (C.PTR_SIZEOF);
+- C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
++ C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
+ XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+ XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+ C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+- int /*long*/ functionPtr = result[0];
++ long /*int*/ functionPtr = result[0];
+ result[0] = 0;
+ C.free (functionLoad.function);
+ C.free (functionLoad.functionName);
+@@ -1187,7 +1187,7 @@
public void handleEvent (Event event) {
if (BrowserCount > 0) return; /* another display is still active */
@@ -7274,16 +3495,38 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1266,7 +1266,7 @@
+@@ -1258,18 +1258,18 @@
+
+ // int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+ // /* alloc memory for two structs, the second is empty to signify the end of the list */
+-// int /*long*/ ptr = C.malloc (size * 2);
++// long /*int*/ ptr = C.malloc (size * 2);
+ // C.memset (ptr, 0, size * 2);
+ // nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+ // byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_TermEmbedding", true); //$NON-NLS-1$
+ // functionLoad.functionName = C.malloc (bytes.length);
+ // C.memmove (functionLoad.functionName, bytes, bytes.length);
+ // functionLoad.function = C.malloc (C.PTR_SIZEOF);
+-// C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
++// C.memmove (functionLoad.function, new long /*int*/[] {0} , C.PTR_SIZEOF);
+ // XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+ // XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+ // C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+-// int /*long*/ functionPtr = result[0];
++// long /*int*/ functionPtr = result[0];
+ // result[0] = 0;
+ // C.free (functionLoad.function);
+ // C.free (functionLoad.functionName);
+@@ -1530,7 +1530,7 @@
public boolean back () {
- if (awaitingNavigate) return false;
+ htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1280,115 +1280,115 @@
+@@ -1544,122 +1544,122 @@
void createCOMInterfaces () {
// Create each of the interfaces that this object implements
supports = new XPCOMObject (new int[] {2, 0, 0}) {
@@ -7473,18 +3716,63 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
+ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
+ public long /*int*/ method3 (long /*int*/[] args) {return HandleEvent (args[0]);}
};
- }
-@@ -1447,7 +1447,7 @@
- if (awaitingNavigate) return false;
+ badCertListener = new XPCOMObject (new int[] {2, 0, 0, 4}) {
+- public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+- public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+- public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+- public int /*long*/ method3 (int /*long*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
++ public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);}
++ public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();}
++ public long /*int*/ method2 (long /*int*/[] args) {return Release ();}
++ public long /*int*/ method3 (long /*int*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
+ };
+ }
- String url = PREFIX_JAVASCRIPT + script + ";void(0);"; //$NON-NLS-1$
+@@ -1738,7 +1738,7 @@
+ * workaround is to invoke the javascript handler directly via C++, which is
+ * exposed as of mozilla 1.9.
+ */
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
- int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1461,14 +1461,14 @@
+ if (!IsPre_1_9) {
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+@@ -1785,12 +1785,12 @@
+ interfaceRequestor.Release ();
+
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+- int /*long*/ scriptGlobalObject = result[0];
++ long /*int*/ scriptGlobalObject = result[0];
+ result[0] = 0;
+ rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+ if (rc != XPCOM.NS_OK) error (rc);
+- int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+- int /*long*/ globalJSObject = XPCOM.nsIScriptGlobalObject_GetScriptGlobal (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
++ long /*int*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
++ long /*int*/ globalJSObject = XPCOM.nsIScriptGlobalObject_GetScriptGlobal (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+ new nsISupports (scriptGlobalObject).Release ();
+
+ if (scriptContext != 0 && globalJSObject != 0) {
+@@ -1801,7 +1801,7 @@
+ new nsISupports (result[0]).Release ();
+ result[0] = 0;
+
+- int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
++ long /*int*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
+ if (nativeContext != 0) {
+ int length = script.length ();
+ char[] scriptChars = new char[length];
+@@ -1809,7 +1809,7 @@
+ byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
+ rc = principal.GetJSPrincipals (nativeContext, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+- int /*long*/ principals = result[0];
++ long /*int*/ principals = result[0];
+ result[0] = 0;
+ principal.Release ();
+ String mozillaPath = LocationProvider.mozillaPath + delegate.getJSLibraryName () + '\0';
+@@ -1846,12 +1846,12 @@
return rc == XPCOM.NS_OK;
}
@@ -7493,24 +3781,40 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
return MozillaDelegate.findBrowser (handle);
}
+ static Browser findBrowser (nsIDOMWindow aDOMWindow) {
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+@@ -1870,7 +1870,7 @@
+ rc = aDOMWindow.GetTop (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+- int /*long*/ topDOMWindow = result[0];
++ long /*int*/ topDOMWindow = result[0];
+ result[0] = 0;
+ rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+@@ -1898,7 +1898,7 @@
public boolean forward () {
- if (awaitingNavigate) return false;
+ htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1483,7 +1483,7 @@
- public String getText () {
- if (awaitingNavigate) return ""; //$NON-NLS-1$
+@@ -1919,7 +1919,7 @@
+ }
+ public String getText () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1495,7 +1495,7 @@
+@@ -1931,7 +1931,7 @@
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
window.Release ();
@@ -7519,7 +3823,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
result[0] = 0;
rc = XPCOM.NS_GetComponentManager (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -1512,12 +1512,12 @@
+@@ -1948,12 +1948,12 @@
nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]);
result[0] = 0;
@@ -7534,10 +3838,10 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
XPCOM.nsEmbedString_delete (string);
-@@ -1544,13 +1544,13 @@
- public String getUrl () {
- if (awaitingNavigate) return ""; //$NON-NLS-1$
+@@ -1978,13 +1978,13 @@
+ }
+ public String getUrl () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -7550,7 +3854,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = webNavigation.GetCurrentURI (aCurrentURI);
if (rc != XPCOM.NS_OK) error (rc);
webNavigation.Release ();
-@@ -1558,11 +1558,11 @@
+@@ -1992,11 +1992,11 @@
byte[] dest = null;
if (aCurrentURI[0] != 0) {
nsIURI uri = new nsIURI (aCurrentURI[0]);
@@ -7564,25 +3868,25 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -1607,7 +1607,7 @@
- public boolean isBackEnabled () {
- if (awaitingNavigate) return false;
+@@ -2039,7 +2039,7 @@
+ }
+ public boolean isBackEnabled () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1622,7 +1622,7 @@
- public boolean isForwardEnabled () {
- if (awaitingNavigate) return false;
+@@ -2052,7 +2052,7 @@
+ }
+ public boolean isForwardEnabled () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1662,7 +1662,7 @@
+@@ -2095,7 +2095,7 @@
listener = null;
}
@@ -7591,7 +3895,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1696,7 +1696,7 @@
+@@ -2139,7 +2139,7 @@
}
void Activate () {
@@ -7600,16 +3904,16 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1708,7 +1708,7 @@
+@@ -2151,7 +2151,7 @@
}
-
+
void Deactivate () {
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1724,7 +1724,7 @@
+@@ -2167,7 +2167,7 @@
int width = Math.max (1, rect.width);
int height = Math.max (1, rect.height);
@@ -7618,58 +3922,64 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1739,7 +1739,7 @@
+@@ -2182,7 +2182,7 @@
public void refresh () {
- if (awaitingNavigate) return;
+ htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error(rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1792,11 +1792,11 @@
- awaitingNavigate = false;
-
- byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
-- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
-+ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
- byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true); //$NON-NLS-1$
-- int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
-+ long /*int*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+@@ -2244,7 +2244,7 @@
+ */
+ delegate.removeWindowSubclass ();
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
- int rc = XPCOM.NS_GetServiceManager (result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1816,7 +1816,7 @@
- * is about:blank. The fix is to specify the file protocol.
- */
- byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
-- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
-+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
- rc = ioService.NewURI (aSpec, null, 0, result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -1879,7 +1879,7 @@
+ int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ /*
+@@ -2277,9 +2277,9 @@
+ webNavigation.Release ();
+ } else {
+ byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true); //$NON-NLS-1$
+- int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
++ long /*int*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+ byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
++ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+ rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+@@ -2300,7 +2300,7 @@
+ * is about:blank. The fix is to specify the file protocol.
+ */
+ byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+@@ -2345,7 +2345,7 @@
public boolean setUrl (String url) {
- awaitingNavigate = false;
+ htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1895,7 +1895,7 @@
+@@ -2368,7 +2368,7 @@
public void stop () {
- if (awaitingNavigate) return;
+ htmlBytes = null;
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -1954,7 +1954,7 @@
+@@ -2427,7 +2427,7 @@
}
void unhookDOMListeners () {
@@ -7678,7 +3988,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2045,68 +2045,68 @@
+@@ -2518,73 +2518,73 @@
/* nsISupports */
@@ -7755,12 +4065,18 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
AddRef ();
return XPCOM.NS_OK;
}
+ if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) {
+- XPCOM.memmove (ppvObject, new int /*long*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
++ XPCOM.memmove (ppvObject, new long /*int*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
- XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppvObject, new long /*int*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -2123,18 +2123,18 @@
+@@ -2601,18 +2601,18 @@
/* nsIWeakReference */
@@ -7782,7 +4098,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
if (rc != XPCOM.NS_OK) error (rc);
if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2144,15 +2144,15 @@
+@@ -2622,18 +2622,18 @@
return QueryInterface (riid, ppvObject);
}
@@ -7800,17 +4116,12 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
+int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) {
if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
- if (request == 0) request = aRequest;
-@@ -2164,7 +2164,7 @@
- * process. These listeners cannot be added yet because the
- * nsIDOMWindow is not ready to take them at this stage.
- */
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- nsIWebProgress progress = new nsIWebProgress (aWebProgress);
- int rc = progress.GetDOMWindow (result);
- if (rc != XPCOM.NS_OK) error (rc);
-@@ -2181,7 +2181,7 @@
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+
+ /*
+ * When navigating to a site that is known to have a bad certificate, request notification
+@@ -2676,7 +2676,7 @@
* received for every window in a page, which is when these listeners
* are typically added.
*/
@@ -7819,7 +4130,49 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2249,7 +2249,7 @@
+@@ -2718,11 +2718,11 @@
+ */
+ if (htmlBytes != null) {
+ nsIRequest req = new nsIRequest (aRequest);
+- int /*long*/ name = XPCOM.nsEmbedCString_new ();
++ long /*int*/ name = XPCOM.nsEmbedCString_new ();
+ rc = req.GetName (name);
+ if (rc != XPCOM.NS_OK) error (rc);
+ int length = XPCOM.nsEmbedCString_Length (name);
+- int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
+ byte[] dest = new byte[length];
+ XPCOM.memmove (dest, buffer, length);
+ String url = new String (dest);
+@@ -2755,7 +2755,7 @@
+ * is about:blank. The fix is to specify the file protocol.
+ */
+ byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+@@ -2773,15 +2773,15 @@
+ result[0] = 0;
+
+ byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
++ long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+ rc = stream.OpenStream (uri.getAddress (), aContentType);
+ if (rc != XPCOM.NS_OK) error (rc);
+- int /*long*/ ptr = C.malloc (htmlBytes.length);
++ long /*int*/ ptr = C.malloc (htmlBytes.length);
+ XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
+ int pageSize = 8192;
+ int pageCount = htmlBytes.length / pageSize + 1;
+- int /*long*/ current = ptr;
++ long /*int*/ current = ptr;
+ for (int i = 0; i < pageCount; i++) {
+ length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
+ if (length > 0) {
+@@ -2872,7 +2872,7 @@
* Hook DOM listeners to the page's nsIDOMWindow here because this is
* the earliest opportunity to do so.
*/
@@ -7828,16 +4181,16 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
nsIWebProgress progress = new nsIWebProgress (aWebProgress);
int rc = progress.GetDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
-@@ -2288,7 +2288,7 @@
+@@ -2911,7 +2911,7 @@
return XPCOM.NS_OK;
}
-int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
+int OnProgressChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
- if (awaitingNavigate || progressListeners.length == 0) return XPCOM.NS_OK;
+ if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
-@@ -2301,7 +2301,7 @@
+@@ -2924,7 +2924,7 @@
return XPCOM.NS_OK;
}
@@ -7846,8 +4199,8 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
/*
* Feature in Mozilla. When a page is loaded via setText before a previous
* setText page load has completed, the expected OnStateChange STATE_STOP for the
-@@ -2316,13 +2316,13 @@
- if (awaitingNavigate || locationListeners.length == 0) return XPCOM.NS_OK;
+@@ -2939,13 +2939,13 @@
+ if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
- int /*long*/[] aDOMWindow = new int /*long*/[1];
@@ -7862,7 +4215,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = domWindow.GetTop (aTop);
if (rc != XPCOM.NS_OK) error (rc);
if (aTop[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2332,10 +2332,10 @@
+@@ -2955,10 +2955,10 @@
topWindow.Release ();
nsIURI location = new nsIURI (aLocation);
@@ -7875,16 +4228,16 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
-@@ -2365,7 +2365,7 @@
+@@ -2988,7 +2988,7 @@
return XPCOM.NS_OK;
}
-int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
+int OnStatusChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStatus, long /*int*/ aMessage) {
- if (awaitingNavigate || statusTextListeners.length == 0) return XPCOM.NS_OK;
+ if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -2380,13 +2380,13 @@
+@@ -3003,13 +3003,13 @@
return XPCOM.NS_OK;
}
@@ -7897,10 +4250,10 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
-int SetStatus (int statusType, int /*long*/ status) {
+int SetStatus (int statusType, long /*int*/ status) {
- if (awaitingNavigate || statusTextListeners.length == 0) return XPCOM.NS_OK;
+ if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
-@@ -2402,8 +2402,8 @@
+@@ -3025,8 +3025,8 @@
return XPCOM.NS_OK;
}
@@ -7911,7 +4264,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
if (webBrowser != null) {
webBrowser.AddRef ();
ret[0] = webBrowser.getAddress ();
-@@ -2412,13 +2412,13 @@
+@@ -3035,13 +3035,13 @@
return XPCOM.NS_OK;
}
@@ -7927,7 +4280,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int[] ret = new int[1];
ret[0] = chromeFlags;
XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */
-@@ -2458,7 +2458,7 @@
+@@ -3081,7 +3081,7 @@
}
int ShowAsModal () {
@@ -7936,7 +4289,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2488,7 +2488,7 @@
+@@ -3111,7 +3111,7 @@
return XPCOM.NS_OK;
}
@@ -7945,7 +4298,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0 ? 1 : 0;
XPCOM.memmove (retval, new int[] {result}, 4); /* PRBool */
return XPCOM.NS_OK;
-@@ -2514,7 +2514,7 @@
+@@ -3137,7 +3137,7 @@
return XPCOM.NS_OK;
}
@@ -7954,7 +4307,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) {
Point location = browser.getShell ().getLocation ();
if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */
-@@ -2534,7 +2534,7 @@
+@@ -3157,7 +3157,7 @@
}
int SetFocus () {
@@ -7963,7 +4316,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-@@ -2552,7 +2552,7 @@
+@@ -3175,7 +3175,7 @@
return XPCOM.NS_OK;
}
@@ -7972,7 +4325,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
XPCOM.memmove (aVisibility, new int[] {visible ? 1 : 0}, 4); /* PRBool */
return XPCOM.NS_OK;
-@@ -2595,11 +2595,11 @@
+@@ -3218,11 +3218,11 @@
return XPCOM.NS_OK;
}
@@ -7983,10 +4336,10 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
-int SetTitle (int /*long*/ aTitle) {
+int SetTitle (long /*int*/ aTitle) {
- if (awaitingNavigate || titleListeners.length == 0) return XPCOM.NS_OK;
+ if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
-@@ -2623,7 +2623,7 @@
+@@ -3246,7 +3246,7 @@
return XPCOM.NS_OK;
}
@@ -7995,7 +4348,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
/*
* Note. The handle is expected to be an HWND on Windows and
* a GtkWidget* on GTK. This callback is invoked on Windows
-@@ -2631,7 +2631,7 @@
+@@ -3254,7 +3254,7 @@
* dialog comes up. If no handle is returned, the print dialog
* does not come up on this platform.
*/
@@ -8004,30 +4357,27 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
return XPCOM.NS_OK;
}
-@@ -2671,11 +2671,11 @@
+@@ -3294,9 +3294,9 @@
/* nsIContextMenuListener */
-int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
+int OnShowContextMenu (int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) {
- if (awaitingNavigate) return XPCOM.NS_OK;
-
nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
- int /*long*/[] result = new int /*long*/[1];
+ long /*int*/[] result = new long /*int*/[1];
int rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2705,16 +2705,16 @@
+@@ -3326,15 +3326,15 @@
/* nsIURIContentListener */
-int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
+int OnStartURIOpen (long /*int*/ aURI, long /*int*/ retval) {
- if (awaitingNavigate || locationListeners.length == 0) {
- XPCOM.memmove (retval, new int[] {0}, 4); /* PRBool */
- return XPCOM.NS_OK;
- }
+ if (isRetrievingBadCert) return XPCOM.NS_OK;
+ authCount = 0;
+
nsIURI location = new nsIURI (aURI);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
@@ -8038,7 +4388,16 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
buffer = XPCOM.nsEmbedCString_get (aSpec);
byte[] dest = new byte[length];
XPCOM.memmove (dest, buffer, length);
-@@ -2747,11 +2747,11 @@
+@@ -3383,7 +3383,7 @@
+ if (jsEnabledChanged) {
+ jsEnabledChanged = false;
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+@@ -3402,11 +3402,11 @@
return XPCOM.NS_OK;
}
@@ -8052,7 +4411,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
boolean preferred = false;
int size = XPCOM.strlen (aContentType);
if (size > 0) {
-@@ -2762,7 +2762,7 @@
+@@ -3417,7 +3417,7 @@
/* do not attempt to handle known problematic content types */
if (!contentType.equals (XPCOM.CONTENT_MAYBETEXT) && !contentType.equals (XPCOM.CONTENT_MULTIPART)) {
/* determine whether browser can handle the content type */
@@ -8061,7 +4420,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
int rc = XPCOM.NS_GetServiceManager (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2774,7 +2774,7 @@
+@@ -3429,7 +3429,7 @@
rc = serviceManager.GetServiceByContractID (aContractID, nsIWebNavigationInfo.NS_IWEBNAVIGATIONINFO_IID, result);
if (rc == XPCOM.NS_OK) {
byte[] bytes = MozillaDelegate.wcsToMbcs (null, contentType, true);
@@ -8070,7 +4429,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]);
result[0] = 0;
int[] isSupportedResult = new int[1]; /* PRUint32 */
-@@ -2804,34 +2804,34 @@
+@@ -3459,34 +3459,34 @@
XPCOM.memmove(retval, new int[] {preferred ? 1 : 0}, 4); /* PRBool */
if (preferred) {
@@ -8109,10 +4468,10 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
-int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) {
+int OnShowTooltip (int aXCoords, int aYCoords, long /*int*/ aTipText) {
- if (awaitingNavigate) return XPCOM.NS_OK;
-
int length = XPCOM.strlen_PRUnichar (aTipText);
-@@ -2871,21 +2871,21 @@
+ char[] dest = new char[length];
+ XPCOM.memmove (dest, aTipText, length * 2);
+@@ -3524,21 +3524,21 @@
/* nsIDOMEventListener */
@@ -8138,7 +4497,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = domEvent.GetCurrentTarget (result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -2902,7 +2902,7 @@
+@@ -3555,7 +3555,7 @@
}
if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
@@ -8147,7 +4506,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3010,7 +3010,7 @@
+@@ -3663,7 +3663,7 @@
case SWT.SCROLL_LOCK: return XPCOM.NS_OK;
}
@@ -8156,7 +4515,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3060,7 +3060,7 @@
+@@ -3713,7 +3713,7 @@
}
if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
@@ -8165,7 +4524,7 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-@@ -3117,7 +3117,7 @@
+@@ -3770,7 +3770,7 @@
/* mouse event */
@@ -8174,9 +4533,88 @@ diff -ur x86/org/eclipse/swt/browser/Mozilla.java x86_64/org/eclipse/swt/browser
rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-diff -ur x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/eclipse/swt/browser/PromptService2Factory.java
---- x86/org/eclipse/swt/browser/PromptService2Factory.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/PromptService2Factory.java 2009-02-11 17:43:48.000000000 -0500
+@@ -3876,10 +3876,10 @@
+
+ /* nsIBadCertListener2 */
+
+-int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int /*long*/ _suppressError) {
++int NotifyCertProblem (long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, long /*int*/ _suppressError) {
+ /* determine the host name and port */
+ int length = XPCOM.nsEmbedCString_Length (targetSite);
+- int /*long*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
+ byte[] dest = new byte[length];
+ XPCOM.memmove (dest, buffer, length);
+ final String urlPort = new String (dest);
+@@ -3889,7 +3889,7 @@
+
+ /* create text descriptions of the certificate problem(s) */
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ nsISupports supports = new nsISupports (status);
+ int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+@@ -3909,7 +3909,7 @@
+
+ rc = sslStatus.GetIsDomainMismatch (intResult);
+ if (intResult[0] != 0) {
+- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
++ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
+ rc = cert.GetCommonName (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+@@ -3932,7 +3932,7 @@
+ nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
+ result[0] = 0;
+
+- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
++ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
+ rc = validity.GetNotBeforeGMT (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+@@ -3961,7 +3961,7 @@
+
+ rc = sslStatus.GetIsUntrusted (intResult);
+ if (intResult[0] != 0) {
+- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
++ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
+ rc = cert.GetIssuerCommonName (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+@@ -3991,7 +3991,7 @@
+
+ String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
+ if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+@@ -4007,7 +4007,7 @@
+ nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
+ result[0] = 0;
+ byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
+- int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
++ long /*int*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
+ rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
+ browser.setUrl (url);
+ XPCOM.nsEmbedCString_delete (hostString);
+diff -urN x86/org/eclipse/swt/browser/PromptDialog.java x86_64/org/eclipse/swt/browser/PromptDialog.java
+--- x86/org/eclipse/swt/browser/PromptDialog.java 2009-08-19 16:24:46.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/PromptDialog.java 2009-09-17 08:48:20.000000000 -0400
+@@ -141,7 +141,7 @@
+ viewCertButton.setText(Compatibility.getMessage("View Certificate")); //$NON-NLS-1$
+ viewCertButton.addListener(SWT.Selection, new Listener() {
+ public void handleEvent(Event event) {
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+diff -urN x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/eclipse/swt/browser/PromptService2Factory.java
+--- x86/org/eclipse/swt/browser/PromptService2Factory.java 2008-01-29 15:18:56.000000000 -0500
++++ x86_64/org/eclipse/swt/browser/PromptService2Factory.java 2009-09-17 08:48:20.000000000 -0400
@@ -30,17 +30,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -8249,9 +4687,9 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2Factory.java x86_64/org/eclip
return XPCOM.NS_OK;
}
-diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/browser/PromptService2.java
---- x86/org/eclipse/swt/browser/PromptService2.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/PromptService2.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/browser/PromptService2.java
+--- x86/org/eclipse/swt/browser/PromptService2.java 2009-08-19 16:24:46.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/PromptService2.java 2009-09-17 08:48:20.000000000 -0400
@@ -33,41 +33,41 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -8362,21 +4800,15 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-@@ -121,10 +121,10 @@
+@@ -121,13 +121,13 @@
return refCount;
}
-Browser getBrowser (int /*long*/ aDOMWindow) {
+Browser getBrowser (long /*int*/ aDOMWindow) {
if (aDOMWindow == 0) return null;
-
-- int /*long*/[] result = new int /*long*/[1];
-+ long /*int*/[] result = new long /*int*/[1];
- int rc = XPCOM.NS_GetServiceManager (result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-@@ -168,7 +168,7 @@
- return Mozilla.findBrowser (result[0]);
+ nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
+ return Mozilla.findBrowser (window);
}
-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
@@ -8384,16 +4816,16 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
String label = null;
int flag = (buttonFlag & (0xff * index)) / index;
switch (flag) {
-@@ -189,7 +189,7 @@
+@@ -148,7 +148,7 @@
/* nsIPromptService */
-int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) {
+int Alert (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText) {
- Browser browser = getBrowser (aParent);
+ final Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -210,7 +210,7 @@
+@@ -188,7 +188,7 @@
return XPCOM.NS_OK;
}
@@ -8402,7 +4834,7 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -237,11 +237,11 @@
+@@ -215,11 +215,11 @@
return XPCOM.NS_OK;
}
@@ -8416,7 +4848,7 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -264,11 +264,11 @@
+@@ -242,11 +242,11 @@
return XPCOM.NS_OK;
}
@@ -8430,7 +4862,7 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
-@@ -310,7 +310,7 @@
+@@ -288,7 +288,7 @@
return XPCOM.NS_OK;
}
@@ -8439,7 +4871,7 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
Browser browser = getBrowser (aParent);
String titleLabel = null, textLabel, checkLabel = null;
String[] valueLabel = new String[1];
-@@ -328,7 +328,7 @@
+@@ -306,7 +306,7 @@
XPCOM.memmove (dest, aText, length * 2);
textLabel = new String (dest);
@@ -8448,39 +4880,39 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
length = XPCOM.strlen_PRUnichar (valueAddr[0]);
-@@ -359,9 +359,9 @@
+@@ -337,7 +337,7 @@
* value that we override must be freed using the nsIMemory service.
*/
- int cnt, size;
-- int /*long*/ ptr;
-+ long /*int*/ ptr;
- char[] buffer;
-- int /*long*/[] result2 = new int /*long*/[1];
-+ long /*int*/[] result2 = new long /*int*/[1];
if (valueLabel[0] != null) {
- cnt = valueLabel[0].length ();
- buffer = new char[cnt + 1];
-@@ -369,7 +369,7 @@
- size = buffer.length * 2;
- ptr = C.malloc (size);
+- int /*long*/[] result2 = new int /*long*/[1];
++ long /*int*/[] result2 = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result2);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+@@ -357,9 +357,9 @@
+ char[] buffer = new char[cnt + 1];
+ valueLabel[0].getChars (0, cnt, buffer, 0);
+ int size = buffer.length * 2;
+- int /*long*/ ptr = memory.Alloc (size);
++ long /*int*/ ptr = memory.Alloc (size);
XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ XPCOM.memmove (aValue, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
- int rc = XPCOM.NS_GetServiceManager (result2);
-@@ -395,7 +395,7 @@
+ memory.Free (valueAddr[0]);
+@@ -371,7 +371,7 @@
return XPCOM.NS_OK;
}
-int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkboxValue, int /*long*/ _retval) {
+int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkboxValue, long /*int*/ _retval) {
+ nsIAuthInformation auth = new nsIAuthInformation (authInfo);
+
Browser browser = getBrowser (aParent);
- String checkLabel = null;
- int[] checkValue = new int[1];
-@@ -415,11 +415,11 @@
+@@ -425,11 +425,11 @@
- nsIAuthInformation auth = new nsIAuthInformation (authInfo);
+ /* get initial username and password values */
- int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ long /*int*/ ptr = XPCOM.nsEmbedString_new ();
@@ -8492,7 +4924,7 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
char[] chars = new char[length];
XPCOM.memmove (chars, buffer, length * 2);
userLabel[0] = new String (chars);
-@@ -448,13 +448,13 @@
+@@ -458,13 +458,13 @@
XPCOM.nsEmbedString_delete (ptr);
nsIChannel channel = new nsIChannel (aChannel);
@@ -8503,69 +4935,74 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
nsIURI nsURI = new nsIURI (uri[0]);
-- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
-+ long /*int*/ aSpec = XPCOM.nsEmbedCString_new ();
- rc = nsURI.GetHost (aSpec);
+- int /*long*/ host = XPCOM.nsEmbedCString_new ();
++ long /*int*/ host = XPCOM.nsEmbedCString_new ();
+ rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
- length = XPCOM.nsEmbedCString_Length (aSpec);
-@@ -495,7 +495,7 @@
+ length = XPCOM.nsEmbedCString_Length (host);
+@@ -505,7 +505,7 @@
return XPCOM.NS_OK;
}
-int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aUsername, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
+int PromptUsernameAndPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aUsername, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) {
Browser browser = getBrowser (aParent);
- String titleLabel, textLabel, checkLabel = null;
- String[] userLabel = new String[1], passLabel = new String[1];
-@@ -515,7 +515,7 @@
- XPCOM.memmove (dest, aText, length * 2);
- textLabel = new String (dest);
-
-- int /*long*/[] userAddr = new int /*long*/[1];
-+ long /*int*/[] userAddr = new long /*int*/[1];
- XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
- if (userAddr[0] != 0) {
- length = XPCOM.strlen_PRUnichar (userAddr[0]);
-@@ -524,7 +524,7 @@
- userLabel[0] = new String (dest);
- }
-
-- int /*long*/[] passAddr = new int /*long*/[1];
-+ long /*int*/[] passAddr = new long /*int*/[1];
- XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
- if (passAddr[0] != 0) {
- length = XPCOM.strlen_PRUnichar (passAddr[0]);
-@@ -555,9 +555,9 @@
+ String user = null, password = null;
+
+@@ -556,7 +556,7 @@
+ XPCOM.memmove (dest, aText, length * 2);
+ textLabel = new String (dest);
+
+- int /*long*/[] userAddr = new int /*long*/[1];
++ long /*int*/[] userAddr = new long /*int*/[1];
+ XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
+ if (userAddr[0] != 0) {
+ length = XPCOM.strlen_PRUnichar (userAddr[0]);
+@@ -565,7 +565,7 @@
+ userLabel[0] = new String (dest);
+ }
+
+- int /*long*/[] passAddr = new int /*long*/[1];
++ long /*int*/[] passAddr = new long /*int*/[1];
+ XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
+ if (passAddr[0] != 0) {
+ length = XPCOM.strlen_PRUnichar (passAddr[0]);
+@@ -603,12 +603,12 @@
+ * User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
- int cnt, size;
-- int /*long*/ ptr;
-+ long /*int*/ ptr;
- char[] buffer;
-- int /*long*/[] result2 = new int /*long*/[1];
-+ long /*int*/[] result2 = new long /*int*/[1];
- if (userLabel[0] != null) {
- cnt = userLabel[0].length ();
- buffer = new char[cnt + 1];
-@@ -565,7 +565,7 @@
- size = buffer.length * 2;
- ptr = C.malloc (size);
- XPCOM.memmove (ptr, buffer, size);
-- XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
-+ XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-
- if (userAddr[0] != 0) {
- int rc = XPCOM.NS_GetServiceManager (result2);
-@@ -593,7 +593,7 @@
- size = buffer.length * 2;
- ptr = C.malloc (size);
- XPCOM.memmove (ptr, buffer, size);
-- XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
-+ XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
-
- if (passAddr[0] != 0) {
- int rc = XPCOM.NS_GetServiceManager (result2);
-@@ -619,11 +619,11 @@
+- int /*long*/[] userAddr = new int /*long*/[1];
++ long /*int*/[] userAddr = new long /*int*/[1];
+ XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
+- int /*long*/[] passAddr = new int /*long*/[1];
++ long /*int*/[] passAddr = new long /*int*/[1];
+ XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
+
+- int /*long*/[] result = new int /*long*/[1];
++ long /*int*/[] result = new long /*int*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+@@ -633,9 +633,9 @@
+ char[] buffer = new char[cnt + 1];
+ user.getChars (0, cnt, buffer, 0);
+ int size = buffer.length * 2;
+- int /*long*/ ptr = C.malloc (size);
++ long /*int*/ ptr = C.malloc (size);
+ XPCOM.memmove (ptr, buffer, size);
+- XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ XPCOM.memmove (aUsername, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+
+ cnt = password.length ();
+ buffer = new char[cnt + 1];
+@@ -643,17 +643,17 @@
+ size = buffer.length * 2;
+ ptr = C.malloc (size);
+ XPCOM.memmove (ptr, buffer, size);
+- XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
++ XPCOM.memmove (aPassword, new long /*int*/[] {ptr}, C.PTR_SIZEOF);
+ }
+
return XPCOM.NS_OK;
}
@@ -8579,9 +5016,9 @@ diff -ur x86/org/eclipse/swt/browser/PromptService2.java x86_64/org/eclipse/swt/
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
-diff -ur x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/swt/browser/SimpleEnumerator.java
---- x86/org/eclipse/swt/browser/SimpleEnumerator.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/SimpleEnumerator.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/swt/browser/SimpleEnumerator.java
+--- x86/org/eclipse/swt/browser/SimpleEnumerator.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/SimpleEnumerator.java 2009-09-17 08:48:20.000000000 -0400
@@ -36,17 +36,17 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -8662,9 +5099,9 @@ diff -ur x86/org/eclipse/swt/browser/SimpleEnumerator.java x86_64/org/eclipse/sw
return XPCOM.NS_OK;
}
}
-diff -ur x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt/browser/WindowCreator2.java
---- x86/org/eclipse/swt/browser/WindowCreator2.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/browser/WindowCreator2.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt/browser/WindowCreator2.java
+--- x86/org/eclipse/swt/browser/WindowCreator2.java 2007-08-01 15:57:24.000000000 -0400
++++ x86_64/org/eclipse/swt/browser/WindowCreator2.java 2009-09-17 08:48:20.000000000 -0400
@@ -35,24 +35,24 @@
void createCOMInterfaces () {
/* Create each of the interfaces that this object implements */
@@ -8809,9 +5246,9 @@ diff -ur x86/org/eclipse/swt/browser/WindowCreator2.java x86_64/org/eclipse/swt/
} else {
if (cancel != 0) {
C.memmove (cancel, new int[] {1}, 4); /* PRBool */
-diff -ur x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java
---- x86/org/eclipse/swt/dnd/ByteArrayTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java 2009-02-11 17:43:46.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java
+--- x86/org/eclipse/swt/dnd/ByteArrayTransfer.java 2008-06-05 13:31:48.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/ByteArrayTransfer.java 2009-09-17 08:48:20.000000000 -0400
@@ -155,7 +155,7 @@
}
byte[] buffer = (byte[])object;
@@ -8821,10 +5258,10 @@ diff -ur x86/org/eclipse/swt/dnd/ByteArrayTransfer.java x86_64/org/eclipse/swt/d
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length;
-diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipboard.java
---- x86/org/eclipse/swt/dnd/Clipboard.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/Clipboard.java 2009-02-11 17:43:46.000000000 -0500
-@@ -31,14 +31,14 @@
+diff -urN x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipboard.java
+--- x86/org/eclipse/swt/dnd/Clipboard.java 2009-05-29 17:30:20.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/Clipboard.java 2009-09-17 08:48:20.000000000 -0400
+@@ -32,14 +32,14 @@
private Display display;
@@ -8843,7 +5280,7 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary);
buffer = Converter.wcsToMbcs(null, "TARGETS", true);
TARGET = OS.gdk_atom_intern(buffer, false);
-@@ -286,7 +286,7 @@
+@@ -287,7 +287,7 @@
public Object getContents(Transfer transfer, int clipboards) {
checkWidget();
if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT);
@@ -8852,7 +5289,7 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
int[] typeIds = transfer.getTypeIds();
for (int i = 0; i < typeIds.length; i++) {
if ((clipboards & DND.CLIPBOARD) != 0) {
-@@ -548,7 +548,7 @@
+@@ -549,7 +549,7 @@
String[] result = new String[types1.length + types2.length];
int count = 0;
for (int i = 0; i < types1.length; i++) {
@@ -8861,7 +5298,7 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
if (pName == 0) {
continue;
}
-@@ -558,7 +558,7 @@
+@@ -559,7 +559,7 @@
result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer));
}
for (int i = 0; i < types2.length; i++) {
@@ -8870,7 +5307,7 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
if (pName == 0) {
continue;
}
-@@ -577,7 +577,7 @@
+@@ -578,7 +578,7 @@
private int[] getAvailablePrimaryTypes() {
int[] types = new int[0];
@@ -8879,7 +5316,7 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
if (selection_data != 0) {
try {
GtkSelectionData gtkSelectionData = new GtkSelectionData();
-@@ -594,7 +594,7 @@
+@@ -595,7 +595,7 @@
}
private int[] getAvailableClipboardTypes () {
int[] types = new int[0];
@@ -8888,7 +5325,7 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
if (selection_data != 0) {
try {
GtkSelectionData gtkSelectionData = new GtkSelectionData();
-@@ -610,11 +610,11 @@
+@@ -611,11 +611,11 @@
return types;
}
@@ -8902,9 +5339,9 @@ diff -ur x86/org/eclipse/swt/dnd/Clipboard.java x86_64/org/eclipse/swt/dnd/Clipb
display.setData(key, null);
return selection_data;
}
-diff -ur x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd/ClipboardProxy.java
---- x86/org/eclipse/swt/dnd/ClipboardProxy.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/ClipboardProxy.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd/ClipboardProxy.java
+--- x86/org/eclipse/swt/dnd/ClipboardProxy.java 2005-09-27 12:51:54.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/ClipboardProxy.java 2009-09-17 08:48:20.000000000 -0400
@@ -71,7 +71,7 @@
}
}
@@ -8963,10 +5400,10 @@ diff -ur x86/org/eclipse/swt/dnd/ClipboardProxy.java x86_64/org/eclipse/swt/dnd/
if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) {
return false;
}
-diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/DragSource.java
---- x86/org/eclipse/swt/dnd/DragSource.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/DragSource.java 2009-02-11 17:43:48.000000000 -0500
-@@ -105,7 +105,7 @@
+diff -urN x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/DragSource.java
+--- x86/org/eclipse/swt/dnd/DragSource.java 2009-05-29 17:30:20.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/DragSource.java 2009-09-17 08:48:20.000000000 -0400
+@@ -106,7 +106,7 @@
Transfer[] transferAgents = new Transfer[0];
DragSourceEffect dragEffect;
@@ -8975,7 +5412,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
//workaround - remember action performed for DragEnd
boolean moveData = false;
-@@ -206,28 +206,28 @@
+@@ -207,28 +207,28 @@
return style;
}
@@ -9008,7 +5445,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
-@@ -296,15 +296,15 @@
+@@ -297,15 +297,15 @@
int actions = opToOsOp(getStyle());
Image image = event.image;
@@ -9027,7 +5464,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
/*
* Bug in GTK. If a drag is initiated using gtk_drag_begin and the
* mouse is released immediately, the mouse and keyboard remain
-@@ -340,7 +340,7 @@
+@@ -341,7 +341,7 @@
moveData = false;
}
@@ -9036,7 +5473,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
if (selection_data == 0) return;
GtkSelectionData gtkSelectionData = new GtkSelectionData();
OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof);
-@@ -374,7 +374,7 @@
+@@ -376,7 +376,7 @@
return;
}
@@ -9045,7 +5482,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
moveData = true;
}
-@@ -562,7 +562,7 @@
+@@ -564,7 +564,7 @@
}
}
@@ -9054,7 +5491,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
-@@ -573,29 +573,29 @@
+@@ -575,29 +575,29 @@
}
}
@@ -9092,7 +5529,7 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -614,10 +614,10 @@
+@@ -616,10 +616,10 @@
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -9105,10 +5542,10 @@ diff -ur x86/org/eclipse/swt/dnd/DragSource.java x86_64/org/eclipse/swt/dnd/Drag
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/DropTarget.java
---- x86/org/eclipse/swt/dnd/DropTarget.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/DropTarget.java 2009-02-11 17:43:48.000000000 -0500
-@@ -243,33 +243,33 @@
+diff -urN x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/DropTarget.java
+--- x86/org/eclipse/swt/dnd/DropTarget.java 2009-05-29 17:30:20.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/DropTarget.java 2009-09-17 08:48:20.000000000 -0400
+@@ -245,33 +245,33 @@
return style;
}
@@ -9147,7 +5584,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
Display display = Display.findDisplay(Thread.currentThread());
if (display == null || display.isDisposed()) return null;
Widget widget = display.findWidget(handle);
-@@ -330,7 +330,7 @@
+@@ -332,7 +332,7 @@
}
}
@@ -9156,7 +5593,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
DNDEvent event = new DNDEvent();
if (data == 0 || !setEventData(context, x, y, time, event)) {
keyOperation = -1;
-@@ -378,7 +378,7 @@
+@@ -380,7 +380,7 @@
return;
}
@@ -9165,7 +5602,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
DNDEvent event = new DNDEvent();
if (!setEventData(context, x, y, time, event)) {
keyOperation = -1;
-@@ -415,7 +415,7 @@
+@@ -417,7 +417,7 @@
return true;
}
@@ -9174,7 +5611,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
updateDragOverHover(0, null);
if (keyOperation == -1) return;
-@@ -428,7 +428,7 @@
+@@ -430,7 +430,7 @@
notifyListeners(DND.DragLeave, event);
}
@@ -9182,8 +5619,8 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
+boolean drag_motion ( long /*int*/ widget, long /*int*/ context, int x, int y, int time){
int oldKeyOperation = keyOperation;
- if (oldKeyOperation == -1) { //drag enter
-@@ -687,7 +687,7 @@
+ /*
+@@ -694,7 +694,7 @@
}
}
@@ -9192,7 +5629,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
for (int i = 0; i < targets.length; i++) {
OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof);
}
-@@ -695,7 +695,7 @@
+@@ -702,7 +702,7 @@
int actions = opToOsOp(getStyle());
if (control instanceof Combo) {
if ((control.getStyle() & SWT.READ_ONLY) == 0) {
@@ -9201,7 +5638,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
if (entryHandle != 0) {
OS.gtk_drag_dest_unset(entryHandle);
}
-@@ -721,7 +721,7 @@
+@@ -728,7 +728,7 @@
dropEffect = effect;
}
@@ -9210,7 +5647,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
if (context == 0) return false;
GdkDragContext dragContext = new GdkDragContext();
OS.memmove(dragContext, context, GdkDragContext.sizeof);
-@@ -747,7 +747,7 @@
+@@ -754,7 +754,7 @@
int length = OS.g_list_length(dragContext.targets);
TransferData[] dataTypes = new TransferData[0];
for (int i = 0; i < length; i++) {
@@ -9219,7 +5656,7 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
GtkTargetPair gtkTargetPair = new GtkTargetPair();
OS.memmove(gtkTargetPair, pData, GtkTargetPair.sizeof);
TransferData data = new TransferData();
-@@ -765,7 +765,7 @@
+@@ -772,7 +772,7 @@
}
if (dataTypes.length == 0) return false;
@@ -9228,10 +5665,10 @@ diff -ur x86/org/eclipse/swt/dnd/DropTarget.java x86_64/org/eclipse/swt/dnd/Drop
int [] origin_x = new int[1], origin_y = new int[1];
OS.gdk_window_get_origin(window, origin_x, origin_y);
Point coordinates = new Point(origin_x[0] + x, origin_y[0] + y);
-diff -ur x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/FileTransfer.java
---- x86/org/eclipse/swt/dnd/FileTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/FileTransfer.java 2009-02-11 17:43:48.000000000 -0500
-@@ -76,13 +76,13 @@
+diff -urN x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/FileTransfer.java
+--- x86/org/eclipse/swt/dnd/FileTransfer.java 2009-05-29 17:30:22.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/FileTransfer.java 2009-09-17 08:48:20.000000000 -0400
+@@ -85,13 +85,13 @@
if (length == 0) continue;
char[] chars = new char[length];
string.getChars(0, length, chars, 0);
@@ -9249,7 +5686,7 @@ diff -ur x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/Fi
OS.g_free(localePtr);
if (error[0] != 0 || uriPtr == 0) continue;
length = OS.strlen(uriPtr);
-@@ -102,7 +102,7 @@
+@@ -111,7 +111,7 @@
buffer = newBuffer;
}
if (buffer.length == 0) return;
@@ -9258,29 +5695,32 @@ diff -ur x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/Fi
OS.memset(ptr, '\0', buffer.length+1);
OS.memmove(ptr, buffer, buffer.length);
transferData.pValue = ptr;
-@@ -126,16 +126,16 @@
- int length = transferData.length;
- byte[] temp = new byte[length];
+@@ -137,7 +137,7 @@
OS.memmove(temp, transferData.pValue, length);
+ boolean gnomeList = transferData.type == GNOME_LIST_ID;
+ int sepLength = gnomeList ? 1 : 2;
- int /*long*/[] files = new int /*long*/[0];
+ long /*int*/[] files = new long /*int*/[0];
int offset = 0;
for (int i = 0; i < temp.length - 1; i++) {
- if (temp[i] == '\r' && temp[i+1] == '\n') {
- int size = i - offset;
-- int /*long*/ file = OS.g_malloc(size + 1);
-+ long /*int*/ file = OS.g_malloc(size + 1);
- byte[] fileBuffer = new byte[size + 1];
- System.arraycopy(temp, offset, fileBuffer, 0, size);
- OS.memmove(file, fileBuffer, size + 1);
-- int /*long*/[] newFiles = new int /*long*/[files.length + 1];
-+ long /*int*/[] newFiles = new long /*int*/[files.length + 1];
- System.arraycopy(files, 0, newFiles, 0, files.length);
- newFiles[files.length] = file;
- files = newFiles;
-@@ -144,26 +144,26 @@
- }
- if (offset < temp.length - 2) {
+ boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n';
+@@ -145,11 +145,11 @@
+ if (!(gnomeList && offset == 0)) {
+ /* The content of the first line in a gnome-list is always either 'copy' or 'cut' */
+ int size = i - offset;
+- int /*long*/ file = OS.g_malloc(size + 1);
++ long /*int*/ file = OS.g_malloc(size + 1);
+ byte[] fileBuffer = new byte[size + 1];
+ System.arraycopy(temp, offset, fileBuffer, 0, size);
+ OS.memmove(file, fileBuffer, size + 1);
+- int /*long*/[] newFiles = new int /*long*/[files.length + 1];
++ long /*int*/[] newFiles = new long /*int*/[files.length + 1];
+ System.arraycopy(files, 0, newFiles, 0, files.length);
+ newFiles[files.length] = file;
+ files = newFiles;
+@@ -159,26 +159,26 @@
+ }
+ if (offset < temp.length - sepLength) {
int size = temp.length - offset;
- int /*long*/ file = OS.g_malloc(size + 1);
+ long /*int*/ file = OS.g_malloc(size + 1);
@@ -9312,9 +5752,9 @@ diff -ur x86/org/eclipse/swt/dnd/FileTransfer.java x86_64/org/eclipse/swt/dnd/Fi
OS.g_free(utf8Ptr);
length = (int)/*64*/items_written[0];
char[] buffer = new char[length];
-diff -ur x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/HTMLTransfer.java
---- x86/org/eclipse/swt/dnd/HTMLTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/HTMLTransfer.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/HTMLTransfer.java
+--- x86/org/eclipse/swt/dnd/HTMLTransfer.java 2008-06-05 13:31:50.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/HTMLTransfer.java 2009-09-17 08:48:20.000000000 -0400
@@ -65,7 +65,7 @@
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
@@ -9324,9 +5764,9 @@ diff -ur x86/org/eclipse/swt/dnd/HTMLTransfer.java x86_64/org/eclipse/swt/dnd/HT
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
-diff -ur x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/ImageTransfer.java
---- x86/org/eclipse/swt/dnd/ImageTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/ImageTransfer.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/ImageTransfer.java
+--- x86/org/eclipse/swt/dnd/ImageTransfer.java 2009-05-29 17:30:20.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/ImageTransfer.java 2009-09-17 08:48:20.000000000 -0400
@@ -89,12 +89,12 @@
ImageData imgData = (ImageData)object;
if (imgData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -9343,15 +5783,17 @@ diff -ur x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/I
OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height);
String typeStr = "";
-@@ -110,7 +110,7 @@
+@@ -110,8 +110,8 @@
if (transferData.type == XPM_ID) typeStr = "xpm";
if (transferData.type == XV_ID) typeStr = "xv";
byte[] type = Converter.wcsToMbcs(null, typeStr , true);
- int /*long*/ [] buffer = new int /*long*/ [1];
+- int /*long*/ [] len = new int /*long*/ [1];
+ long /*int*/ [] buffer = new long /*int*/ [1];
- int [] len = new int [1];
++ long /*int*/ [] len = new long /*int*/ [1];
if (type == null) return;
- OS.gdk_pixbuf_save_to_buffer(pixbuf, buffer, len, type , null, null);
+ OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
+ OS.g_object_unref(pixbuf);
@@ -136,15 +136,15 @@
ImageData imgData = null;
if (transferData.length > 0)
@@ -9372,9 +5814,9 @@ diff -ur x86/org/eclipse/swt/dnd/ImageTransfer.java x86_64/org/eclipse/swt/dnd/I
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.g_object_unref(loader);
Image img = Image.gtk_new(Display.getCurrent(), SWT.BITMAP, handle, 0);
-diff -ur x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RTFTransfer.java
---- x86/org/eclipse/swt/dnd/RTFTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/RTFTransfer.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RTFTransfer.java
+--- x86/org/eclipse/swt/dnd/RTFTransfer.java 2008-06-05 13:31:48.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/RTFTransfer.java 2009-09-17 08:48:20.000000000 -0400
@@ -65,7 +65,7 @@
}
String string = (String)object;
@@ -9384,9 +5826,9 @@ diff -ur x86/org/eclipse/swt/dnd/RTFTransfer.java x86_64/org/eclipse/swt/dnd/RTF
if (pValue == 0) return;
OS.memmove(pValue, buffer, buffer.length);
transferData.length = buffer.length - 1;
-diff -ur x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java
---- x86/org/eclipse/swt/dnd/TableDragSourceEffect.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java
+--- x86/org/eclipse/swt/dnd/TableDragSourceEffect.java 2008-06-05 13:31:50.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/TableDragSourceEffect.java 2009-09-17 08:48:20.000000000 -0400
@@ -88,26 +88,26 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
@@ -9437,9 +5879,9 @@ diff -ur x86/org/eclipse/swt/dnd/TableDragSourceEffect.java x86_64/org/eclipse/s
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
-diff -ur x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java
---- x86/org/eclipse/swt/dnd/TableDropTargetEffect.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java
+--- x86/org/eclipse/swt/dnd/TableDropTargetEffect.java 2008-06-05 13:31:48.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/TableDropTargetEffect.java 2009-09-17 08:48:20.000000000 -0400
@@ -102,7 +102,7 @@
*/
public void dragLeave(DropTargetEvent event) {
@@ -9468,9 +5910,9 @@ diff -ur x86/org/eclipse/swt/dnd/TableDropTargetEffect.java x86_64/org/eclipse/s
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-diff -ur x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/TextTransfer.java
---- x86/org/eclipse/swt/dnd/TextTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TextTransfer.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/TextTransfer.java
+--- x86/org/eclipse/swt/dnd/TextTransfer.java 2008-06-05 13:31:50.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/TextTransfer.java 2009-09-17 08:48:20.000000000 -0400
@@ -66,9 +66,9 @@
String string = (String)object;
byte[] utf8 = Converter.wcsToMbcs (null, string, true);
@@ -9514,9 +5956,9 @@ diff -ur x86/org/eclipse/swt/dnd/TextTransfer.java x86_64/org/eclipse/swt/dnd/Te
OS.memmove(ptr, list[0], OS.PTR_SIZEOF);
int length = OS.strlen(ptr[0]);
byte[] utf8 = new byte[length];
-diff -ur x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/TransferData.java
---- x86/org/eclipse/swt/dnd/TransferData.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TransferData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/TransferData.java
+--- x86/org/eclipse/swt/dnd/TransferData.java 2008-06-05 13:31:48.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/TransferData.java 2009-09-17 08:48:20.000000000 -0400
@@ -38,7 +38,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -9535,9 +5977,9 @@ diff -ur x86/org/eclipse/swt/dnd/TransferData.java x86_64/org/eclipse/swt/dnd/Tr
/**
* The result field contains the result of converting a
-diff -ur x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java
---- x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+--- x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2008-06-05 13:31:48.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/TreeDragSourceEffect.java 2009-09-17 08:48:20.000000000 -0400
@@ -87,26 +87,26 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
@@ -9588,9 +6030,9 @@ diff -ur x86/org/eclipse/swt/dnd/TreeDragSourceEffect.java x86_64/org/eclipse/sw
GdkColor color = new GdkColor();
color.pixel = 0;
OS.gdk_gc_set_foreground(gcMask, color);
-diff -ur x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java
---- x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java
+--- x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2008-06-05 13:31:48.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/TreeDropTargetEffect.java 2009-09-17 08:48:20.000000000 -0400
@@ -111,7 +111,7 @@
*/
public void dragLeave(DropTargetEvent event) {
@@ -9618,10 +6060,10 @@ diff -ur x86/org/eclipse/swt/dnd/TreeDropTargetEffect.java x86_64/org/eclipse/sw
if (indices != 0) {
int depth = OS.gtk_tree_path_get_depth(path[0]);
int[] temp = new int[depth];
-diff -ur x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/URLTransfer.java
---- x86/org/eclipse/swt/dnd/URLTransfer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/dnd/URLTransfer.java 2009-02-11 17:43:48.000000000 -0500
-@@ -65,7 +65,7 @@
+diff -urN x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/URLTransfer.java
+--- x86/org/eclipse/swt/dnd/URLTransfer.java 2009-05-29 17:30:22.000000000 -0400
++++ x86_64/org/eclipse/swt/dnd/URLTransfer.java 2009-09-17 08:48:20.000000000 -0400
+@@ -66,7 +66,7 @@
char [] chars = new char[charCount +1];
string.getChars(0, charCount , chars, 0);
int byteCount = chars.length*2;
@@ -9630,9 +6072,9 @@ diff -ur x86/org/eclipse/swt/dnd/URLTransfer.java x86_64/org/eclipse/swt/dnd/URL
if (pValue == 0) return;
OS.memmove(pValue, chars, byteCount);
transferData.length = byteCount;
-diff -ur x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphics/Color.java
---- x86/org/eclipse/swt/graphics/Color.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Color.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphics/Color.java
+--- x86/org/eclipse/swt/graphics/Color.java 2008-06-05 13:32:00.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Color.java 2009-09-17 08:48:24.000000000 -0400
@@ -115,7 +115,7 @@
device.gdkColors[pixel] = null;
}
@@ -9651,9 +6093,9 @@ diff -ur x86/org/eclipse/swt/graphics/Color.java x86_64/org/eclipse/swt/graphics
if (!OS.gdk_colormap_alloc_color(colormap, gdkColor, true, true)) {
/* Allocate black. */
gdkColor = new GdkColor();
-diff -ur x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphics/Cursor.java
---- x86/org/eclipse/swt/graphics/Cursor.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Cursor.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphics/Cursor.java
+--- x86/org/eclipse/swt/graphics/Cursor.java 2008-06-05 13:32:00.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Cursor.java 2009-09-17 08:48:24.000000000 -0400
@@ -52,7 +52,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -9706,9 +6148,9 @@ diff -ur x86/org/eclipse/swt/graphics/Cursor.java x86_64/org/eclipse/swt/graphic
Cursor cursor = new Cursor(device);
cursor.handle = handle;
return cursor;
-diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphics/Device.java
---- x86/org/eclipse/swt/graphics/Device.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Device.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphics/Device.java
+--- x86/org/eclipse/swt/graphics/Device.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Device.java 2009-09-17 08:48:24.000000000 -0400
@@ -34,8 +34,8 @@
* platforms and should never be accessed from application code.
* </p>
@@ -9747,7 +6189,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
boolean useXRender;
-@@ -162,7 +162,7 @@
+@@ -160,7 +160,7 @@
try {
/* Check if cairo is available on the system */
byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true);
@@ -9756,7 +6198,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
if (libcairo != 0) {
OS.dlclose(libcairo);
} else {
-@@ -261,7 +261,7 @@
+@@ -259,7 +259,7 @@
}
}
@@ -9765,7 +6207,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
for (int i=0; i<Devices.length; i++) {
Device device = Devices [i];
if (device != null && device.xDisplay == xDisplay) {
-@@ -416,13 +416,13 @@
+@@ -414,13 +414,13 @@
public FontData[] getFontList (String faceName, boolean scalable) {
checkDevice ();
if (!scalable) return new FontData[0];
@@ -9784,7 +6226,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
OS.pango_context_list_families(context, families, n_families);
int nFds = 0;
FontData[] fds = new FontData[faceName != null ? 4 : n_families[0]];
-@@ -430,7 +430,7 @@
+@@ -428,7 +428,7 @@
OS.memmove(family, families[0] + i * OS.PTR_SIZEOF, OS.PTR_SIZEOF);
boolean match = true;
if (faceName != null) {
@@ -9793,7 +6235,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
int length = OS.strlen(familyName);
byte[] buffer = new byte[length];
OS.memmove(buffer, familyName, length);
-@@ -441,7 +441,7 @@
+@@ -439,7 +439,7 @@
OS.pango_font_family_list_faces(family[0], faces, n_faces);
for (int j=0; j<n_faces[0]; j++) {
OS.memmove(face, faces[0] + j * OS.PTR_SIZEOF, OS.PTR_SIZEOF);
@@ -9802,7 +6244,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
Font font = Font.gtk_new(this, fontDesc);
FontData data = font.getFontData()[0];
if (nFds == fds.length) {
-@@ -652,7 +652,7 @@
+@@ -650,7 +650,7 @@
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -9811,7 +6253,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
/**
* Invokes platform specific functionality to dispose a GC handle.
-@@ -667,7 +667,7 @@
+@@ -665,7 +665,7 @@
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -9820,7 +6262,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
/**
* Returns <code>true</code> if the device has been disposed,
-@@ -708,7 +708,7 @@
+@@ -706,7 +706,7 @@
return OS.FcConfigAppFontAddFile (0, buffer);
}
@@ -9829,7 +6271,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
if (warningLevel == 0) {
if (DEBUG || debug) {
new Error ().printStackTrace ();
-@@ -779,7 +779,7 @@
+@@ -777,7 +777,7 @@
shellHandle = 0;
if (gdkColors != null) {
@@ -9838,7 +6280,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
for (int i = 0; i < gdkColors.length; i++) {
GdkColor color = gdkColors [i];
if (color != null) {
-@@ -855,7 +855,7 @@
+@@ -870,7 +870,7 @@
}
}
@@ -9847,7 +6289,7 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
Device device = findDevice (xDisplay);
if (device != null) {
if (device.warningLevel == 0) {
-@@ -871,7 +871,7 @@
+@@ -886,7 +886,7 @@
return 0;
}
@@ -9856,9 +6298,9 @@ diff -ur x86/org/eclipse/swt/graphics/Device.java x86_64/org/eclipse/swt/graphic
Device device = findDevice (xDisplay);
if (device != null) {
if (DEBUG || device.debug) {
-diff -ur x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/graphics/Drawable.java
---- x86/org/eclipse/swt/graphics/Drawable.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Drawable.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/graphics/Drawable.java
+--- x86/org/eclipse/swt/graphics/Drawable.java 2009-05-29 17:30:12.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Drawable.java 2009-09-17 08:48:24.000000000 -0400
@@ -43,7 +43,7 @@
* @return the platform specific GC handle
*/
@@ -9876,9 +6318,9 @@ diff -ur x86/org/eclipse/swt/graphics/Drawable.java x86_64/org/eclipse/swt/graph
+public void internal_dispose_GC (long /*int*/ handle, GCData data);
}
-diff -ur x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics/Font.java
---- x86/org/eclipse/swt/graphics/Font.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Font.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics/Font.java
+--- x86/org/eclipse/swt/graphics/Font.java 2008-06-05 13:32:00.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Font.java 2009-09-17 08:48:24.000000000 -0400
@@ -42,7 +42,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -9915,10 +6357,10 @@ diff -ur x86/org/eclipse/swt/graphics/Font.java x86_64/org/eclipse/swt/graphics/
Font font = new Font(device);
font.handle = handle;
return font;
-diff -ur x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphics/GCData.java
---- x86/org/eclipse/swt/graphics/GCData.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/GCData.java 2009-02-11 17:43:50.000000000 -0500
-@@ -33,7 +33,7 @@
+diff -urN x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphics/GCData.java
+--- x86/org/eclipse/swt/graphics/GCData.java 2009-05-29 17:30:24.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/GCData.java 2009-09-17 08:48:24.000000000 -0400
+@@ -34,7 +34,7 @@
public Font font;
public Pattern foregroundPattern;
public Pattern backgroundPattern;
@@ -9927,7 +6369,7 @@ diff -ur x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphic
public float lineWidth;
public int lineStyle = SWT.LINE_SOLID;
public float[] lineDashes;
-@@ -45,12 +45,12 @@
+@@ -46,12 +46,12 @@
public int alpha = 0xFF;
public int interpolation = SWT.DEFAULT;
@@ -9945,10 +6387,10 @@ diff -ur x86/org/eclipse/swt/graphics/GCData.java x86_64/org/eclipse/swt/graphic
public double cairoXoffset, cairoYoffset;
public boolean disposeCairo;
public double[] clippingTransform;
-diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC.java
---- x86/org/eclipse/swt/graphics/GC.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/GC.java 2009-02-11 17:43:50.000000000 -0500
-@@ -59,7 +59,7 @@
+diff -urN x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC.java
+--- x86/org/eclipse/swt/graphics/GC.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/GC.java 2009-09-17 08:48:24.000000000 -0400
+@@ -67,7 +67,7 @@
* platforms and should never be accessed from application code.
* </p>
*/
@@ -9957,7 +6399,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
Drawable drawable;
GCData data;
-@@ -146,7 +146,7 @@
+@@ -154,7 +154,7 @@
if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
GCData data = new GCData();
data.style = checkStyle(style);
@@ -9966,7 +6408,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
Device device = data.device;
if (device == null) device = Device.getDevice();
if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
-@@ -155,10 +155,10 @@
+@@ -163,10 +163,10 @@
init();
}
@@ -9979,7 +6421,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.pango_layout_set_text(layout, buffer, -1);
OS.pango_layout_set_font_description(layout, font.handle);
-@@ -184,7 +184,7 @@
+@@ -192,7 +192,7 @@
return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT);
}
@@ -9988,7 +6430,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
GC gc = new GC();
gc.device = data.device;
gc.init(null, data, handle);
-@@ -193,7 +193,7 @@
+@@ -201,7 +201,7 @@
public static GC gtk_new(Drawable drawable, GCData data) {
GC gc = new GC();
@@ -9997,7 +6439,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
gc.device = data.device;
gc.init(drawable, data, gdkGC);
return gc;
-@@ -204,7 +204,7 @@
+@@ -212,7 +212,7 @@
if ((state & mask) == mask) return;
state = (state ^ mask) & mask;
data.state |= mask;
@@ -10006,7 +6448,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if ((state & (BACKGROUND | FOREGROUND)) != 0) {
GdkColor color;
-@@ -220,7 +220,7 @@
+@@ -228,7 +228,7 @@
}
if (pattern != null) {
if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) {
@@ -10015,7 +6457,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend(newPattern, Cairo.CAIRO_EXTEND_REPEAT);
double[] matrix = {-1, 0, 0, 1, 0, 0};
-@@ -380,10 +380,10 @@
+@@ -388,10 +388,10 @@
}
}
@@ -10029,7 +6471,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
int[] pointArray = new int[8];
-@@ -410,7 +410,7 @@
+@@ -418,7 +418,7 @@
Cairo.cairo_matrix_transform_point(matrix, x, y);
pointArray[6] = (int)x[0];
pointArray[7] = (int)Math.round(y[0]);
@@ -10038,7 +6480,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_union(newRgn, polyRgn);
OS.gdk_region_destroy(polyRgn);
}
-@@ -439,7 +439,7 @@
+@@ -447,7 +447,7 @@
if (image == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (image.type != SWT.BITMAP || image.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
Rectangle rect = image.getBounds();
@@ -10047,7 +6489,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow(gdkGC, OS.GDK_INCLUDE_INFERIORS);
OS.gdk_draw_drawable(image.pixmap, gdkGC, data.drawable, x, y, 0, 0, rect.width, rect.height);
-@@ -487,7 +487,7 @@
+@@ -495,7 +495,7 @@
if (width <= 0 || height <= 0) return;
int deltaX = destX - srcX, deltaY = destY - srcY;
if (deltaX == 0 && deltaY == 0) return;
@@ -10056,7 +6498,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (data.image == null && paint) OS.gdk_gc_set_exposures(handle, true);
OS.gdk_draw_drawable(drawable, handle, drawable, srcX, srcY, destX, destY, width, height);
if (data.image == null & paint) {
-@@ -527,10 +527,10 @@
+@@ -535,10 +535,10 @@
}
void createLayout() {
@@ -10069,7 +6511,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
data.layout = layout;
OS.pango_context_set_language(context, OS.gtk_get_default_language());
-@@ -550,13 +550,13 @@
+@@ -558,13 +558,13 @@
void destroy() {
if (data.disposeCairo) {
@@ -10085,7 +6527,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (clipRgn != 0) OS.gdk_region_destroy(clipRgn);
Image image = data.image;
if (image != null) {
-@@ -619,7 +619,7 @@
+@@ -627,7 +627,7 @@
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -10094,7 +6536,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -670,8 +670,8 @@
+@@ -678,8 +678,8 @@
* are not valid in the default style. The fix is to use a style
* from a widget.
*/
@@ -10105,7 +6547,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
checkGC(FOREGROUND);
int[] lineWidth = new int[1];
-@@ -776,7 +776,7 @@
+@@ -784,7 +784,7 @@
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
}
@@ -10114,7 +6556,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if (data.alpha != 0) {
srcImage.createSurface();
-@@ -798,7 +798,7 @@
+@@ -806,7 +806,7 @@
case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break;
case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break;
}
@@ -10123,7 +6565,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
/*
-@@ -817,8 +817,8 @@
+@@ -825,8 +825,8 @@
* the image that was created or the edges are still faded.
*/
if (Cairo.cairo_version () >= Cairo.CAIRO_VERSION_ENCODE(1, 4, 0)) {
@@ -10134,7 +6576,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight);
Cairo.cairo_paint(cr);
Cairo.cairo_scale(cr, -1, -1);
-@@ -841,7 +841,7 @@
+@@ -849,7 +849,7 @@
Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3);
Cairo.cairo_paint(cr);
Cairo.cairo_destroy(cr);
@@ -10143,7 +6585,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
Cairo.cairo_surface_destroy(surface);
if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_destroy(pattern);
-@@ -881,7 +881,7 @@
+@@ -889,7 +889,7 @@
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1);
return;
}
@@ -10152,7 +6594,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (pixbuf != 0) {
OS.gdk_pixbuf_render_to_drawable(pixbuf, data.drawable, handle, 0, 0, destX, destY, destWidth, destHeight, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(pixbuf);
-@@ -898,12 +898,12 @@
+@@ -906,12 +906,12 @@
drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8);
return;
}
@@ -10168,7 +6610,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
byte[] line = new byte[stride];
byte alpha = (byte)srcImage.alpha;
byte[] alphaData = srcImage.alphaData;
-@@ -916,7 +916,7 @@
+@@ -924,7 +924,7 @@
OS.memmove(pixels + (y * stride), line, stride);
}
if (srcWidth != destWidth || srcHeight != destHeight) {
@@ -10177,7 +6619,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.g_object_unref(pixbuf);
if (scaledPixbuf == 0) return;
pixbuf = scaledPixbuf;
-@@ -933,33 +933,33 @@
+@@ -941,33 +941,33 @@
OS.g_object_unref(pixbuf);
}
void drawImageMask(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, boolean simple, int imgWidth, int imgHeight) {
@@ -10221,7 +6663,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<srcWidth; x++) {
if (maskLine[x * 3] == 0) {
-@@ -969,10 +969,10 @@
+@@ -977,10 +977,10 @@
OS.memmove(offset, line, stride);
}
OS.g_object_unref(maskPixbuf);
@@ -10235,7 +6677,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_pixbuf_render_pixmap_and_mask(scaledPixbuf, colorBuffer, maskBuffer, 128);
colorPixmap = colorBuffer[0];
maskPixmap = maskBuffer[0];
-@@ -993,9 +993,9 @@
+@@ -1001,9 +1001,9 @@
int newHeight = srcY + srcHeight;
int bytesPerLine = (newWidth + 7) / 8;
byte[] maskData = new byte[bytesPerLine * newHeight];
@@ -10247,7 +6689,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_offset(data.clipRgn, -destX + srcX, -destY + srcY);
OS.gdk_gc_set_clip_region(gc, data.clipRgn);
OS.gdk_region_offset(data.clipRgn, destX - srcX, destY - srcY);
-@@ -1027,19 +1027,19 @@
+@@ -1035,19 +1035,19 @@
/* Destroy the image mask if the there is a GC created on the image */
if (srcImage.transparentPixel != -1 && srcImage.memGC != null) srcImage.destroyMask();
}
@@ -10272,7 +6714,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (maskPixmap != 0) {
int attribCount = 0;
XRenderPictureAttributes attrib = null;
-@@ -1051,10 +1051,10 @@
+@@ -1059,10 +1059,10 @@
maskPict = OS.XRenderCreatePicture(xDisplay, OS.gdk_x11_drawable_get_xid(maskPixmap), OS.XRenderFindStandardFormat(xDisplay, maskType), attribCount, attrib);
if (maskPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -10286,7 +6728,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (srcPict == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (srcWidth != destWidth || srcHeight != destHeight) {
int[] transform = new int[]{(int)(((float)srcWidth / destWidth) * 65536), 0, 0, 0, (int)(((float)srcHeight / destHeight) * 65536), 0, 0, 0, 65536};
-@@ -1063,7 +1063,7 @@
+@@ -1071,7 +1071,7 @@
srcX *= destWidth / (float)srcWidth;
srcY *= destHeight / (float)srcHeight;
}
@@ -10295,7 +6737,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (data.damageRgn != 0) {
if (clipping == 0) {
clipping = data.damageRgn;
-@@ -1075,7 +1075,7 @@
+@@ -1083,7 +1083,7 @@
}
if (clipping != 0) {
int[] nRects = new int[1];
@@ -10304,7 +6746,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_get_rectangles(clipping, rects, nRects);
GdkRectangle rect = new GdkRectangle();
short[] xRects = new short[nRects[0] * 4];
-@@ -1097,12 +1097,12 @@
+@@ -1105,12 +1105,12 @@
OS.XRenderFreePicture(xDisplay, srcPict);
if (maskPict != 0) OS.XRenderFreePicture(xDisplay, maskPict);
}
@@ -10321,7 +6763,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.g_object_unref(pixbuf);
return scaledPixbuf;
}
-@@ -1123,7 +1123,7 @@
+@@ -1131,7 +1131,7 @@
public void drawLine(int x1, int y1, int x2, int y2) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -10330,7 +6772,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_move_to(cairo, x1 + xOffset, y1 + yOffset);
-@@ -1166,7 +1166,7 @@
+@@ -1174,7 +1174,7 @@
y = y + height;
height = -height;
}
@@ -10339,7 +6781,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (width == height) {
-@@ -1213,11 +1213,11 @@
+@@ -1221,11 +1221,11 @@
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(DRAW);
@@ -10353,7 +6795,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1245,7 +1245,7 @@
+@@ -1253,7 +1253,7 @@
public void drawPoint (int x, int y) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
checkGC(DRAW);
@@ -10362,7 +6804,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, 1, 1);
Cairo.cairo_fill(cairo);
-@@ -1275,7 +1275,7 @@
+@@ -1283,7 +1283,7 @@
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -10371,7 +6813,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_stroke(cairo);
-@@ -1305,7 +1305,7 @@
+@@ -1313,7 +1313,7 @@
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(DRAW);
@@ -10380,7 +6822,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
drawPolyline(cairo, pointArray, false);
Cairo.cairo_stroke(cairo);
-@@ -1314,7 +1314,7 @@
+@@ -1322,7 +1322,7 @@
OS.gdk_draw_lines(data.drawable, handle, pointArray, pointArray.length / 2);
}
@@ -10389,7 +6831,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
int count = pointArray.length / 2;
if (count == 0) return;
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
-@@ -1351,7 +1351,7 @@
+@@ -1359,7 +1359,7 @@
y = y + height;
height = -height;
}
@@ -10398,7 +6840,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
Cairo.cairo_rectangle(cairo, x + xOffset, y + yOffset, width, height);
-@@ -1421,7 +1421,7 @@
+@@ -1429,7 +1429,7 @@
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -10407,7 +6849,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset;
if (naw == 0 || nah == 0) {
-@@ -1447,7 +1447,7 @@
+@@ -1455,7 +1455,7 @@
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -10416,7 +6858,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760);
-@@ -1607,7 +1607,7 @@
+@@ -1615,7 +1615,7 @@
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (string.length() == 0) return;
@@ -10425,25 +6867,24 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-@@ -1653,14 +1653,14 @@
+@@ -1664,13 +1664,13 @@
if (!data.xorMode) {
OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
} else {
- int /*long*/ layout = data.layout;
+ long /*int*/ layout = data.layout;
- int[] w = new int[1], h = new int[1];
- OS.pango_layout_get_size(layout, w, h);
- int width = OS.PANGO_PIXELS(w[0]);
- int height = OS.PANGO_PIXELS(h[0]);
-- int /*long*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);
-+ long /*int*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);
+ if (data.stringWidth == -1) {
+ computeStringSize();
+ }
+- int /*long*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), data.stringWidth, data.stringHeight, -1);
++ long /*int*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), data.stringWidth, data.stringHeight, -1);
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
- int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);
+ long /*int*/ gdkGC = OS.gdk_gc_new(pixmap);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkColor black = new GdkColor();
OS.gdk_gc_set_foreground(gdkGC, black);
-@@ -1733,7 +1733,7 @@
+@@ -1743,7 +1743,7 @@
height = -height;
}
if (width == 0 || height == 0 || arcAngle == 0) return;
@@ -10452,7 +6893,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if (width == height) {
if (arcAngle >= 0) {
-@@ -1810,9 +1810,9 @@
+@@ -1820,9 +1820,9 @@
fillRectangle(x, y, width, height);
return;
}
@@ -10464,7 +6905,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (vertical) {
pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0);
} else {
-@@ -1862,7 +1862,7 @@
+@@ -1872,7 +1872,7 @@
y = y + height;
height = -height;
}
@@ -10473,7 +6914,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if (width == height) {
Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI);
-@@ -1908,8 +1908,8 @@
+@@ -1918,8 +1918,8 @@
if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
initCairo();
checkGC(FILL);
@@ -10484,7 +6925,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -1939,7 +1939,7 @@
+@@ -1949,7 +1949,7 @@
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
checkGC(FILL);
@@ -10493,7 +6934,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
drawPolyline(cairo, pointArray, true);
Cairo.cairo_fill(cairo);
-@@ -1974,7 +1974,7 @@
+@@ -1984,7 +1984,7 @@
y = y + height;
height = -height;
}
@@ -10502,7 +6943,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
Cairo.cairo_fill(cairo);
-@@ -2040,7 +2040,7 @@
+@@ -2050,7 +2050,7 @@
}
if (naw < 0) naw = 0 - naw;
if (nah < 0) nah = 0 - nah;
@@ -10511,7 +6952,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if (naw == 0 || nah == 0) {
Cairo.cairo_rectangle(cairo, x, y, width, height);
-@@ -2065,7 +2065,7 @@
+@@ -2075,7 +2075,7 @@
}
int naw2 = naw / 2;
int nah2 = nah / 2;
@@ -10520,7 +6961,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (nw > naw) {
if (nh > nah) {
OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760);
-@@ -2284,11 +2284,11 @@
+@@ -2294,11 +2294,11 @@
height = h[0];
}
/* Intersect visible bounds with clipping in device space and then convert then to user space */
@@ -10536,7 +6977,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
GdkRectangle rect = new GdkRectangle();
rect.width = width;
rect.height = height;
-@@ -2344,10 +2344,10 @@
+@@ -2354,10 +2354,10 @@
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (region == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -10550,7 +6991,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (clipRgn == 0) {
GdkRectangle rect = new GdkRectangle();
if (data.width != -1 && data.height != -1) {
-@@ -2363,7 +2363,7 @@
+@@ -2373,7 +2373,7 @@
} else {
/* Convert clipping to device space if needed */
if (data.clippingTransform != null) {
@@ -10559,7 +7000,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
} else {
-@@ -2378,7 +2378,7 @@
+@@ -2388,7 +2388,7 @@
double[] matrix = new double[6];
Cairo.cairo_get_matrix(cairo, matrix);
Cairo.cairo_matrix_invert(matrix);
@@ -10568,7 +7009,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_subtract(clipping, clipping);
OS.gdk_region_union(clipping, rgn);
OS.gdk_region_destroy(rgn);
-@@ -2399,7 +2399,7 @@
+@@ -2409,7 +2409,7 @@
*/
public int getFillRule() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -10577,7 +7018,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo == 0) return SWT.FILL_EVEN_ODD;
return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD;
}
-@@ -2435,9 +2435,9 @@
+@@ -2445,9 +2445,9 @@
if (data.context == 0) createLayout();
checkGC(FONT);
Font font = data.font;
@@ -10590,7 +7031,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
FontMetrics fm = new FontMetrics();
fm.ascent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_ascent(metrics));
fm.descent = OS.PANGO_PIXELS(OS.pango_font_metrics_get_descent(metrics));
-@@ -2680,13 +2680,13 @@
+@@ -2691,13 +2691,13 @@
if (data.cairo == 0) return SWT.DEFAULT;
int antialias = Cairo.CAIRO_ANTIALIAS_DEFAULT;
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
@@ -10606,7 +7047,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options);
}
}
-@@ -2721,7 +2721,7 @@
+@@ -2732,7 +2732,7 @@
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (transform == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -10615,7 +7056,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
Cairo.cairo_get_matrix(cairo, transform.handle);
double[] identity = identity();
-@@ -2781,7 +2781,7 @@
+@@ -2792,7 +2792,7 @@
return identity;
}
@@ -10624,7 +7065,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (data.foreground != null) data.state &= ~FOREGROUND;
if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG);
if (data.font != null) data.state &= ~FONT;
-@@ -2801,26 +2801,26 @@
+@@ -2812,26 +2812,26 @@
handle = gdkGC;
if ((data.style & SWT.MIRRORED) != 0) {
initCairo();
@@ -10658,7 +7099,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_window_get_internal_paint_info(drawable, real_drawable, x, y);
xDrawable = OS.gdk_x11_drawable_get_xid(real_drawable[0]);
translateX = -x[0];
-@@ -2830,7 +2830,7 @@
+@@ -2841,7 +2841,7 @@
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(drawable, w, h);
int width = w[0], height = h[0];
@@ -10667,7 +7108,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_surface_set_device_offset(surface, translateX, translateY);
data.cairo = cairo = Cairo.cairo_create(surface);
-@@ -2944,7 +2944,7 @@
+@@ -2962,7 +2962,7 @@
} catch (SWTException e) {}
} else {
if (!data.disposeCairo) return;
@@ -10676,7 +7117,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
-@@ -3023,7 +3023,7 @@
+@@ -3042,7 +3042,7 @@
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -10685,7 +7126,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
Cairo.cairo_set_antialias(cairo, mode);
}
-@@ -3085,12 +3085,12 @@
+@@ -3104,12 +3104,12 @@
data.state &= ~BACKGROUND;
}
@@ -10701,25 +7142,23 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
int length = OS.strlen(family);
byte[] buffer = new byte[length + 1];
OS.memmove(buffer, family, length);
-@@ -3107,14 +3107,14 @@
+@@ -3126,12 +3126,12 @@
Cairo.cairo_set_font_size(cairo, height);
}
--static void setCairoClip(int /*long*/ cairo, int /*long*/ clipRgn) {
-+static void setCairoClip(long /*int*/ cairo, long /*int*/ clipRgn) {
- Cairo.cairo_reset_clip(cairo);
- if (clipRgn == 0) return;
+-static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
++static void setCairoRegion(long /*int*/ cairo, long /*int*/ rgn) {
if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
- OS.gdk_cairo_region(cairo, clipRgn);
+ OS.gdk_cairo_region(cairo, rgn);
} else {
int[] nRects = new int[1];
- int /*long*/[] rects = new int /*long*/[1];
+ long /*int*/[] rects = new long /*int*/[1];
- OS.gdk_region_get_rectangles(clipRgn, rects, nRects);
+ OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
for (int i=0; i<nRects[0]; i++) {
-@@ -3126,7 +3126,7 @@
- Cairo.cairo_clip(cairo);
+@@ -3142,7 +3142,7 @@
+ }
}
-static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int alpha) {
@@ -10727,10 +7166,21 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
GdkColor color = c.handle;
double aa = (alpha & 0xFF) / (double)0xFF;
double red = ((color.red & 0xFFFF) / (double)0xFFFF);
-@@ -3135,8 +3135,8 @@
+@@ -3151,8 +3151,8 @@
Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);
}
+-void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
+- int /*long*/ cairo = data.cairo;
++void setCairoClip(long /*int*/ damageRgn, long /*int*/ clipRgn) {
++ long /*int*/ cairo = data.cairo;
+ Cairo.cairo_reset_clip(cairo);
+ if (damageRgn != 0) {
+ double[] matrix = new double[6];
+@@ -3170,8 +3170,8 @@
+ }
+ }
+
-void setClipping(int /*long*/ clipRgn) {
- int /*long*/ cairo = data.cairo;
+void setClipping(long /*int*/ clipRgn) {
@@ -10738,25 +7188,25 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (clipRgn == 0) {
if (data.clipRgn != 0) {
OS.gdk_region_destroy(data.clipRgn);
-@@ -3146,7 +3146,7 @@
+@@ -3181,7 +3181,7 @@
data.clippingTransform = null;
- setCairoClip(cairo, clipRgn);
+ setCairoClip(data.damageRgn, 0);
} else {
- int /*long*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;
+ long /*int*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;
OS.gdk_gc_set_clip_region(handle, clipping);
}
} else {
-@@ -3158,7 +3158,7 @@
+@@ -3193,7 +3193,7 @@
Cairo.cairo_get_matrix(cairo, data.clippingTransform);
- setCairoClip(cairo, clipRgn);
+ setCairoClip(data.damageRgn, clipRgn);
} else {
- int /*long*/ clipping = clipRgn;
+ long /*int*/ clipping = clipRgn;
if (data.damageRgn != 0) {
clipping = OS.gdk_region_new();
OS.gdk_region_union(clipping, clipRgn);
-@@ -3199,7 +3199,7 @@
+@@ -3234,7 +3234,7 @@
rect.y = y;
rect.width = width;
rect.height = height;
@@ -10765,7 +7215,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
OS.gdk_region_union_with_rect(clipRgn, rect);
setClipping(clipRgn);
OS.gdk_region_destroy(clipRgn);
-@@ -3237,8 +3237,8 @@
+@@ -3272,8 +3272,8 @@
setClipping(0);
if (path != null) {
initCairo();
@@ -10776,7 +7226,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Cairo.cairo_append_path(cairo, copy);
Cairo.cairo_path_destroy(copy);
-@@ -3341,7 +3341,7 @@
+@@ -3376,7 +3376,7 @@
}
//TODO - need fill rule in X, GDK has no API
initCairo();
@@ -10785,7 +7235,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
Cairo.cairo_set_fill_rule(cairo, cairo_mode);
}
-@@ -3732,7 +3732,7 @@
+@@ -3767,7 +3767,7 @@
}
byte[] buffer;
int mnemonic, length = string.length ();
@@ -10794,7 +7244,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
char[] text = new char[length];
string.getChars(0, length, text, 0);
if ((flags & SWT.DRAW_MNEMONIC) != 0 && (mnemonic = fixMnemonic(text)) != -1) {
-@@ -3745,8 +3745,8 @@
+@@ -3780,8 +3780,8 @@
buffer = new byte[buffer1.length + buffer2.length];
System.arraycopy(buffer1, 0, buffer, 0, buffer1.length);
System.arraycopy(buffer2, 0, buffer, buffer1.length, buffer2.length);
@@ -10805,7 +7255,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
PangoAttribute attribute = new PangoAttribute();
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = buffer1.length;
-@@ -3808,7 +3808,7 @@
+@@ -3843,7 +3843,7 @@
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
initCairo();
@@ -10814,7 +7264,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
Cairo.cairo_font_options_set_antialias(options, mode);
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
Cairo.cairo_set_font_options(data.cairo, options);
-@@ -3850,7 +3850,7 @@
+@@ -3885,7 +3885,7 @@
if (transform != null && transform.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (data.cairo == 0 && transform == null) return;
initCairo();
@@ -10823,7 +7273,7 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
double[] identity = identity();
if (transform != null) {
Cairo.cairo_matrix_multiply(identity, transform.handle, identity);
-@@ -3966,7 +3966,7 @@
+@@ -4001,7 +4001,7 @@
public Point textExtent(String string, int flags) {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -10832,9 +7282,9 @@ diff -ur x86/org/eclipse/swt/graphics/GC.java x86_64/org/eclipse/swt/graphics/GC
if (cairo != 0) {
if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) {
//TODO - honor flags
-diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics/Image.java
---- x86/org/eclipse/swt/graphics/Image.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Image.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics/Image.java
+--- x86/org/eclipse/swt/graphics/Image.java 2008-10-21 12:10:46.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Image.java 2009-09-17 08:48:24.000000000 -0400
@@ -92,7 +92,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -10896,7 +7346,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
/* Apply transformation */
switch (flag) {
-@@ -533,7 +533,7 @@
+@@ -539,7 +539,7 @@
char [] chars = new char [length];
filename.getChars (0, length, chars, 0);
byte [] buffer = Converter.wcsToMbcs(null, chars, true);
@@ -10905,7 +7355,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
if (pixbuf != 0) {
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf);
if (hasAlpha) {
-@@ -547,7 +547,7 @@
+@@ -553,7 +553,7 @@
int width = OS.gdk_pixbuf_get_width(pixbuf);
int height = OS.gdk_pixbuf_get_height(pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride(pixbuf);
@@ -10914,7 +7364,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
byte[] line = new byte[stride];
alphaData = new byte[width * height];
for (int y = 0; y < height; y++) {
-@@ -560,7 +560,7 @@
+@@ -566,7 +566,7 @@
}
createAlphaMask(width, height);
}
@@ -10923,7 +7373,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0);
this.type = SWT.BITMAP;
this.pixmap = pixmap_return[0];
-@@ -577,14 +577,14 @@
+@@ -580,14 +580,14 @@
if (device.useXRender && (alpha != -1 || alphaData != null)) {
mask = OS.gdk_pixmap_new(0, alpha != -1 ? 1 : width, alpha != -1 ? 1 : height, 8);
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
@@ -10940,7 +7390,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, imagePtr);
-@@ -613,7 +613,7 @@
+@@ -616,7 +616,7 @@
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
}
@@ -10949,7 +7399,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
ImageData mask = image.getTransparencyMask();
byte[] data = mask.data;
byte[] maskData = copy ? new byte[data.length] : data;
-@@ -635,21 +635,21 @@
+@@ -638,21 +638,21 @@
OS.gdk_drawable_get_size(pixmap, w, h);
int width = w[0], height = h[0];
if (mask != 0 || alpha != -1 || alphaData != null) {
@@ -10977,7 +7427,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
for (int y=0; y<height; y++) {
OS.memmove(line, offset, stride);
OS.memmove(maskLine, maskOffset, maskStride);
-@@ -667,7 +667,7 @@
+@@ -670,7 +670,7 @@
}
OS.g_object_unref(maskPixbuf);
} else if (alpha != -1) {
@@ -10986,7 +7436,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
for (int y=0; y<height; y++) {
OS.memmove(line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -687,7 +687,7 @@
+@@ -690,7 +690,7 @@
offset += stride;
}
} else if (alphaData != null) {
@@ -10995,7 +7445,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
for (int y = 0; y < h [0]; y++) {
OS.memmove (line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -708,7 +708,7 @@
+@@ -711,7 +711,7 @@
offset += stride;
}
} else {
@@ -11004,7 +7454,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
for (int y = 0; y < h [0]; y++) {
OS.memmove (line, offset, stride);
for (int x=0, offset1=0; x<width; x++, offset1 += 4) {
-@@ -726,9 +726,9 @@
+@@ -729,9 +729,9 @@
surface = Cairo.cairo_image_surface_create_for_data(surfaceData, Cairo.CAIRO_FORMAT_ARGB32, width, height, stride);
OS.g_object_unref(pixbuf);
} else {
@@ -11017,7 +7467,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height);
}
/* Destroy the image mask if the there is a GC created on the image */
-@@ -838,12 +838,12 @@
+@@ -841,12 +841,12 @@
int[] w = new int[1], h = new int[1];
OS.gdk_drawable_get_size(pixmap, w, h);
int width = w[0], height = h[0];
@@ -11033,7 +7483,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
byte[] srcData = new byte[stride * height];
OS.memmove(srcData, pixels, srcData.length);
OS.g_object_unref(pixbuf);
-@@ -855,7 +855,7 @@
+@@ -857,7 +857,7 @@
if (transparentPixel == -1 && type == SWT.ICON && mask != 0) {
/* Get the icon mask data */
@@ -11042,7 +7492,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove(gdkImage, gdkImagePtr);
-@@ -907,7 +907,7 @@
+@@ -909,7 +909,7 @@
*
* @private
*/
@@ -11051,7 +7501,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
Image image = new Image(device);
image.type = type;
image.pixmap = pixmap;
-@@ -943,9 +943,9 @@
+@@ -945,9 +945,9 @@
white.red = (short)0xFFFF;
white.green = (short)0xFFFF;
white.blue = (short)0xFFFF;
@@ -11063,7 +7513,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
OS.gdk_gc_set_foreground(gdkGC, white);
OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height);
OS.g_object_unref(gdkGC);
-@@ -960,10 +960,10 @@
+@@ -962,10 +962,10 @@
if (!(((image.depth == 1 || image.depth == 2 || image.depth == 4 || image.depth == 8) && !palette.isDirect) ||
((image.depth == 8) || (image.depth == 16 || image.depth == 24 || image.depth == 32) && palette.isDirect)))
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
@@ -11076,7 +7526,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
byte[] buffer = image.data;
if (!palette.isDirect || image.depth != 24 || stride != image.bytesPerLine || palette.redMask != 0xFF0000 || palette.greenMask != 0xFF00 || palette.blueMask != 0xFF) {
buffer = new byte[stride * height];
-@@ -994,9 +994,9 @@
+@@ -996,9 +996,9 @@
}
}
OS.memmove(data, buffer, stride * height);
@@ -11088,7 +7538,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.gdk_pixbuf_render_to_drawable(pixbuf, pixmap, gdkGC, 0, 0, 0, 0, width, height, OS.GDK_RGB_DITHER_NORMAL, 0, 0);
OS.g_object_unref(gdkGC);
-@@ -1017,7 +1017,7 @@
+@@ -1019,7 +1019,7 @@
transparentPixel = rgb.red << 16 | rgb.green << 8 | rgb.blue;
}
}
@@ -11097,7 +7547,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES);
this.mask = mask;
if (isIcon) {
-@@ -1051,12 +1051,12 @@
+@@ -1053,12 +1053,12 @@
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -11112,7 +7562,7 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
if (data != null) {
int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
if ((data.style & mask) == 0) {
-@@ -1089,7 +1089,7 @@
+@@ -1091,7 +1091,7 @@
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -11121,9 +7571,9 @@ diff -ur x86/org/eclipse/swt/graphics/Image.java x86_64/org/eclipse/swt/graphics
OS.g_object_unref(gdkGC);
}
-diff -ur x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics/Path.java
---- x86/org/eclipse/swt/graphics/Path.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Path.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics/Path.java
+--- x86/org/eclipse/swt/graphics/Path.java 2008-06-05 13:32:04.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Path.java 2009-09-17 08:48:24.000000000 -0400
@@ -47,7 +47,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -11213,9 +7663,9 @@ diff -ur x86/org/eclipse/swt/graphics/Path.java x86_64/org/eclipse/swt/graphics/
Cairo.memmove(data, offset, cairo_path_data_t.sizeof);
switch (data.type) {
case Cairo.CAIRO_PATH_MOVE_TO:
-diff -ur x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graphics/Pattern.java
---- x86/org/eclipse/swt/graphics/Pattern.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Pattern.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graphics/Pattern.java
+--- x86/org/eclipse/swt/graphics/Pattern.java 2008-06-05 13:32:04.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Pattern.java 2009-09-17 08:48:24.000000000 -0400
@@ -44,9 +44,9 @@
* platforms and should never be accessed from application code.
* </p>
@@ -11228,9 +7678,9 @@ diff -ur x86/org/eclipse/swt/graphics/Pattern.java x86_64/org/eclipse/swt/graphi
/**
* Constructs a new Pattern given an image. Drawing with the resulting
-diff -ur x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphics/Region.java
---- x86/org/eclipse/swt/graphics/Region.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/Region.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphics/Region.java
+--- x86/org/eclipse/swt/graphics/Region.java 2008-06-05 13:32:00.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/Region.java 2009-09-17 08:48:24.000000000 -0400
@@ -38,7 +38,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -11294,9 +7744,9 @@ diff -ur x86/org/eclipse/swt/graphics/Region.java x86_64/org/eclipse/swt/graphic
OS.gdk_region_subtract(handle, rectRgn);
OS.gdk_region_destroy(rectRgn);
}
-diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/graphics/TextLayout.java
---- x86/org/eclipse/swt/graphics/TextLayout.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/graphics/TextLayout.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/graphics/TextLayout.java
+--- x86/org/eclipse/swt/graphics/TextLayout.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/graphics/TextLayout.java 2009-09-17 08:48:24.000000000 -0400
@@ -51,7 +51,7 @@
int[] segments;
int[] tabs;
@@ -11341,6 +7791,15 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
attribute.end_index = byteEnd;
@@ -202,7 +202,7 @@
break;
+ case SWT.UNDERLINE_LINK: {
+ if (style.foreground == null) {
+- int /*long*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);
++ long /*int*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);
+ OS.memmove (attribute, attr, PangoAttribute.sizeof);
+ attribute.start_index = byteStart;
+ attribute.end_index = byteEnd;
+@@ -216,7 +216,7 @@
+ }
}
if (underlineStyle != OS.PANGO_UNDERLINE_NONE && style.underlineColor == null) {
- int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle);
@@ -11348,7 +7807,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -211,7 +211,7 @@
+@@ -225,7 +225,7 @@
}
}
if (style.strikeout && style.strikeoutColor == null) {
@@ -11357,7 +7816,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove(attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -221,7 +221,7 @@
+@@ -235,7 +235,7 @@
Color foreground = style.foreground;
if (foreground != null && !foreground.isDisposed()) {
GdkColor fg = foreground.handle;
@@ -11366,7 +7825,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -231,7 +231,7 @@
+@@ -245,7 +245,7 @@
Color background = style.background;
if (background != null && !background.isDisposed()) {
GdkColor bg = background.handle;
@@ -11375,7 +7834,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -244,7 +244,7 @@
+@@ -258,7 +258,7 @@
rect.y = -(metrics.ascent * OS.PANGO_SCALE);
rect.height = (metrics.ascent + metrics.descent) * OS.PANGO_SCALE;
rect.width = metrics.width * OS.PANGO_SCALE;
@@ -11384,7 +7843,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -253,7 +253,7 @@
+@@ -267,7 +267,7 @@
}
int rise = style.rise;
if (rise != 0) {
@@ -11393,7 +7852,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove (attribute, attr, PangoAttribute.sizeof);
attribute.start_index = byteStart;
attribute.end_index = byteEnd;
-@@ -378,15 +378,15 @@
+@@ -392,15 +392,15 @@
int length = text.length();
boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1;
GCData data = gc.data;
@@ -11413,7 +7872,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (selectionBackground == null) selectionBackground = device.getSystemColor(SWT.COLOR_LIST_SELECTION);
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_save(cairo);
-@@ -473,7 +473,7 @@
+@@ -487,7 +487,7 @@
boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1;
if (fullSelection) {
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
@@ -11422,7 +7881,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if ((data.style & SWT.MIRRORED) != 0) {
Cairo.cairo_save(cairo);
Cairo.cairo_scale(cairo, -1, 1);
-@@ -488,7 +488,7 @@
+@@ -502,7 +502,7 @@
drawBorder(gc, x, y, selectionForeground.handle);
}
} else {
@@ -11431,7 +7890,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
int byteSelStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionStart) - ptr);
int byteSelEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, selectionEnd + 1) - ptr);
int strlen = OS.strlen(ptr);
-@@ -510,7 +510,7 @@
+@@ -524,7 +524,7 @@
OS.gdk_draw_layout(data.drawable, gc.handle, x, y, layout);
drawBorder(gc, x, y, null);
int[] ranges = new int[]{byteSelStart, byteSelEnd};
@@ -11440,7 +7899,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (rgn != 0) {
OS.gdk_gc_set_clip_region(gc.handle, rgn);
OS.gdk_region_destroy(rgn);
-@@ -526,7 +526,7 @@
+@@ -540,7 +540,7 @@
void drawWithCairo(GC gc, int x, int y, int start, int end, boolean fullSelection, GdkColor fg, GdkColor bg) {
GCData data = gc.data;
@@ -11449,7 +7908,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
Cairo.cairo_save(cairo);
if (!fullSelection) {
Cairo.cairo_move_to(cairo, x, y);
-@@ -534,7 +534,7 @@
+@@ -548,7 +548,7 @@
drawBorder(gc, x, y, null);
}
int[] ranges = new int[]{start, end};
@@ -11458,7 +7917,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (rgn != 0) {
OS.gdk_cairo_region(cairo, rgn);
Cairo.cairo_clip(cairo);
-@@ -551,9 +551,9 @@
+@@ -565,9 +565,9 @@
void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
GCData data = gc.data;
@@ -11471,7 +7930,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
GdkGCValues gcValues = null;
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_save(cairo);
-@@ -573,10 +573,10 @@
+@@ -587,10 +587,10 @@
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -11484,7 +7943,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -651,10 +651,10 @@
+@@ -665,10 +665,10 @@
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -11497,7 +7956,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -677,8 +677,8 @@
+@@ -691,8 +691,8 @@
Font font = style.font;
if (font == null) font = this.font;
if (font == null) font = device.systemFont;
@@ -11508,7 +7967,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
underlinePosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_position(metrics));
underlineThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_underline_thickness(metrics));
OS.pango_font_metrics_unref(metrics);
-@@ -749,10 +749,10 @@
+@@ -764,10 +764,10 @@
int byteStart = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, start) - ptr);
int byteEnd = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, end + 1) - ptr);
int[] ranges = new int[]{byteStart, byteEnd};
@@ -11521,7 +7980,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
GdkColor color = null;
-@@ -775,8 +775,8 @@
+@@ -790,8 +790,8 @@
Font font = style.font;
if (font == null) font = this.font;
if (font == null) font = device.systemFont;
@@ -11532,7 +7991,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
strikeoutPosition = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_position(metrics));
strikeoutThickness = OS.PANGO_PIXELS(OS.pango_font_metrics_get_strikethrough_thickness(metrics));
OS.pango_font_metrics_unref(metrics);
-@@ -914,14 +914,14 @@
+@@ -930,14 +930,14 @@
end = Math.min(Math.max(0, end), length - 1);
start = translateOffset(start);
end = translateOffset(end);
@@ -11549,7 +8008,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (clipRegion == 0) return new Rectangle(0, 0, 0, 0);
GdkRectangle rect = new GdkRectangle();
-@@ -931,9 +931,9 @@
+@@ -947,9 +947,9 @@
* is to subtract these areas from the clip region.
*/
PangoRectangle pangoRect = new PangoRectangle();
@@ -11561,7 +8020,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int lineEnd = 0;
do {
-@@ -1048,17 +1048,17 @@
+@@ -1064,17 +1064,17 @@
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -11583,7 +8042,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (runPtr != 0) {
OS.memmove(run, runPtr, PangoLayoutRun.sizeof);
OS.memmove(item, run.item, PangoItem.sizeof);
-@@ -1090,7 +1090,7 @@
+@@ -1106,7 +1106,7 @@
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
if (!(0 <= lineIndex && lineIndex < lineCount)) SWT.error(SWT.ERROR_INVALID_RANGE);
@@ -11592,7 +8051,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
for (int i = 0; i < lineIndex; i++) OS.pango_layout_iter_next_line(iter);
PangoRectangle rect = new PangoRectangle();
-@@ -1146,11 +1146,11 @@
+@@ -1162,11 +1162,11 @@
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
offset = translateOffset(offset);
int line = 0;
@@ -11607,7 +8066,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
while (OS.pango_layout_iter_next_line(iter)) {
if (OS.pango_layout_iter_get_index(iter) > byteOffset) break;
-@@ -1182,9 +1182,9 @@
+@@ -1198,9 +1198,9 @@
PangoLayoutLine line = new PangoLayoutLine();
OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof);
if (line.runs == 0) {
@@ -11620,7 +8079,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
ascent = OS.pango_font_metrics_get_ascent(metrics);
descent = OS.pango_font_metrics_get_descent(metrics);
OS.pango_font_metrics_unref(metrics);
-@@ -1215,10 +1215,10 @@
+@@ -1231,10 +1231,10 @@
computeRuns();
int lineCount = OS.pango_layout_get_line_count(layout);
int[] offsets = new int [lineCount + 1];
@@ -11633,7 +8092,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
OS.memmove(line, linePtr, PangoLayoutLine.sizeof);
int pos = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + line.start_index);
offsets[i] = untranslateOffset(pos);
-@@ -1249,7 +1249,7 @@
+@@ -1265,7 +1265,7 @@
int length = text.length();
if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
offset = translateOffset(offset);
@@ -11642,7 +8101,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
int byteOffset = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, offset) - ptr);
int strlen = OS.strlen(ptr);
byteOffset = Math.min(byteOffset, strlen);
-@@ -1299,7 +1299,7 @@
+@@ -1315,7 +1315,7 @@
}
int step = forward ? 1 : -1;
if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
@@ -11651,7 +8110,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
int[] nAttrs = new int[1];
OS.pango_layout_get_log_attrs(layout, attrs, nAttrs);
if (attrs[0] == 0) return offset + step;
-@@ -1396,7 +1396,7 @@
+@@ -1412,7 +1412,7 @@
* visual offset. The fix is to clamp the coordinates inside the
* line bounds.
*/
@@ -11660,7 +8119,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES);
PangoRectangle rect = new PangoRectangle();
do {
-@@ -1416,7 +1416,7 @@
+@@ -1432,7 +1432,7 @@
int[] index = new int[1];
int[] piTrailing = new int[1];
OS.pango_layout_xy_to_index(layout, x * OS.PANGO_SCALE, y * OS.PANGO_SCALE, index, piTrailing);
@@ -11669,7 +8128,7 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
int offset = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]);
if (trailing != null) trailing[0] = piTrailing[0];
return untranslateOffset(offset);
-@@ -2021,7 +2021,7 @@
+@@ -2037,7 +2037,7 @@
if (tabs == null) {
OS.pango_layout_set_tabs(layout, device.emptyTab);
} else {
@@ -11678,79 +8137,98 @@ diff -ur x86/org/eclipse/swt/graphics/TextLayout.java x86_64/org/eclipse/swt/gra
if (tabArray != 0) {
for (int i = 0; i < tabs.length; i++) {
OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]);
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-02-11 17:43:48.000000000 -0500
-@@ -17,12 +17,12 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java 2009-09-17 08:48:24.000000000 -0400
+@@ -18,17 +18,17 @@
public class AtkActionIface {
// GTypeInterface parent;
+ /** @field cast=(gboolean (*)()) */
- public int /*long*/ do_action;
-- public int /*long*/ get_n_actions;
-- public int /*long*/ get_description;
-- public int /*long*/ get_name;
-- public int /*long*/ get_keybinding;
-- public int /*long*/ set_description;
+ public long /*int*/ do_action;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_n_actions;
+ public long /*int*/ get_n_actions;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_description;
+ public long /*int*/ get_description;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_name;
+ public long /*int*/ get_name;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_keybinding;
+ public long /*int*/ get_keybinding;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_description;
+ public long /*int*/ set_description;
// AtkFunction pad1;
// AtkFunction pad2;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,17 +16,17 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,29 +17,29 @@
public class AtkComponentIface {
+ /** @field cast=(guint (*)()) */
- public int /*long*/ add_focus_handler;
-- public int /*long*/ contains;
-- public int /*long*/ ref_accessible_at_point;
-- public int /*long*/ get_extents;
-- public int /*long*/ get_position;
-- public int /*long*/ get_size;
-- public int /*long*/ grab_focus;
-- public int /*long*/ remove_focus_handler;
-- public int /*long*/ set_extents;
-- public int /*long*/ set_position;
-- public int /*long*/ set_size;
-- public int /*long*/ get_layer;
-- public int /*long*/ get_mdi_zorder;
+ public long /*int*/ add_focus_handler;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ contains;
+ public long /*int*/ contains;
+ /** @field cast=(AtkObject *(*)()) */
+- public int /*long*/ ref_accessible_at_point;
+ public long /*int*/ ref_accessible_at_point;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_extents;
+ public long /*int*/ get_extents;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_position;
+ public long /*int*/ get_position;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_size;
+ public long /*int*/ get_size;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ grab_focus;
+ public long /*int*/ grab_focus;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ remove_focus_handler;
+ public long /*int*/ remove_focus_handler;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_extents;
+ public long /*int*/ set_extents;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_position;
+ public long /*int*/ set_position;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_size;
+ public long /*int*/ set_size;
+ /** @field cast=(AtkLayer (*)()) */
+- public int /*long*/ get_layer;
+ public long /*int*/ get_layer;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_mdi_zorder;
+ public long /*int*/ get_mdi_zorder;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,9 +17,9 @@
public class AtkHypertextIface {
+ /** @field cast=(AtkHyperlink *(*)()) */
- public int /*long*/ get_link;
-- public int /*long*/ get_n_links;
-- public int /*long*/ get_link_index;
+ public long /*int*/ get_link;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_n_links;
+ public long /*int*/ get_n_links;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_link_index;
+ public long /*int*/ get_link_index;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/ATK.java 2009-09-17 08:48:24.000000000 -0400
@@ -90,8 +90,8 @@
public static final native int AtkObjectFactoryClass_sizeof ();
@@ -11817,10 +8295,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _GTK_ACCESSIBLE(handle);
-@@ -144,8 +144,8 @@
- lock.unlock();
+@@ -145,8 +145,8 @@
}
}
+ /** @param object cast=(AtkObject *) */
-public static final native void _atk_focus_tracker_notify (int /*long*/ object);
-public static final void atk_focus_tracker_notify (int /*long*/ object) {
+public static final native void _atk_focus_tracker_notify (long /*int*/ object);
@@ -11828,7 +8306,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
_atk_focus_tracker_notify(object);
-@@ -153,8 +153,8 @@
+@@ -154,8 +154,8 @@
lock.unlock();
}
}
@@ -11839,10 +8317,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_get_default_registry();
-@@ -162,8 +162,8 @@
- lock.unlock();
- }
- }
+@@ -167,8 +167,8 @@
+ * @param factory cast=(AtkObjectFactory *)
+ * @param obj cast=(GObject *)
+ */
-public static final native int /*long*/ _atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj);
-public static final int /*long*/ atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj) {
+public static final native long /*int*/ _atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj);
@@ -11850,10 +8328,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_object_factory_create_accessible(factory, obj);
-@@ -171,8 +171,8 @@
- lock.unlock();
+@@ -177,8 +177,8 @@
}
}
+ /** @param factory cast=(AtkObjectFactory *) */
-public static final native int /*long*/ _atk_object_factory_get_accessible_type (int /*long*/ factory);
-public static final int /*long*/ atk_object_factory_get_accessible_type (int /*long*/ factory) {
+public static final native long /*int*/ _atk_object_factory_get_accessible_type (long /*int*/ factory);
@@ -11861,10 +8339,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_object_factory_get_accessible_type(factory);
-@@ -180,8 +180,8 @@
- lock.unlock();
- }
- }
+@@ -190,8 +190,8 @@
+ * @param accessible cast=(AtkObject *)
+ * @param data cast=(gpointer)
+ */
-public static final native void _atk_object_initialize (int /*long*/ accessible, int /*long*/ data);
-public static final void atk_object_initialize (int /*long*/ accessible, int /*long*/ data) {
+public static final native void _atk_object_initialize (long /*int*/ accessible, long /*int*/ data);
@@ -11872,10 +8350,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
_atk_object_initialize(accessible, data);
-@@ -189,8 +189,8 @@
- lock.unlock();
+@@ -200,8 +200,8 @@
}
}
+ /** @param accessible cast=(AtkObject *) */
-public static final native int /*long*/ _atk_object_ref_relation_set (int /*long*/ accessible);
-public static final int /*long*/ atk_object_ref_relation_set (int /*long*/ accessible) {
+public static final native long /*int*/ _atk_object_ref_relation_set (long /*int*/ accessible);
@@ -11883,10 +8361,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_object_ref_relation_set(accessible);
-@@ -198,8 +198,8 @@
- lock.unlock();
- }
- }
+@@ -213,8 +213,8 @@
+ * @param registry cast=(AtkRegistry *)
+ * @param type cast=(GType)
+ */
-public static final native int /*long*/ _atk_registry_get_factory (int /*long*/ registry, int /*long*/ type);
-public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry, int /*long*/ type) {
+public static final native long /*int*/ _atk_registry_get_factory (long /*int*/ registry, long /*int*/ type);
@@ -11894,10 +8372,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_registry_get_factory(registry, type);
-@@ -207,8 +207,8 @@
- lock.unlock();
- }
- }
+@@ -227,8 +227,8 @@
+ * @param type cast=(GType)
+ * @param factory_type cast=(GType)
+ */
-public static final native void _atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type);
-public static final void atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type) {
+public static final native void _atk_registry_set_factory_type (long /*int*/ registry, long /*int*/ type, long /*int*/ factory_type);
@@ -11905,10 +8383,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
_atk_registry_set_factory_type(registry, type, factory_type);
-@@ -216,8 +216,8 @@
- lock.unlock();
+@@ -237,8 +237,8 @@
}
}
+ /** @param set cast=(AtkRelationSet *) */
-public static final native int _atk_relation_set_get_n_relations (int /*long*/ set);
-public static final int atk_relation_set_get_n_relations (int /*long*/ set) {
+public static final native int _atk_relation_set_get_n_relations (long /*int*/ set);
@@ -11916,10 +8394,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_relation_set_get_n_relations(set);
-@@ -225,8 +225,8 @@
- lock.unlock();
+@@ -247,8 +247,8 @@
}
}
+ /** @param set cast=(AtkRelationSet *) */
-public static final native int /*long*/ _atk_relation_set_get_relation (int /*long*/ set, int i);
-public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set, int i) {
+public static final native long /*int*/ _atk_relation_set_get_relation (long /*int*/ set, int i);
@@ -11927,10 +8405,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_relation_set_get_relation (set, i);
-@@ -234,8 +234,8 @@
- lock.unlock();
- }
- }
+@@ -260,8 +260,8 @@
+ * @param set cast=(AtkRelationSet *)
+ * @param relation cast=(AtkRelation *)
+ */
-public static final native void _atk_relation_set_remove (int /*long*/ set, int /*long*/ relation);
-public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/ relation) {
+public static final native void _atk_relation_set_remove (long /*int*/ set, long /*int*/ relation);
@@ -11938,10 +8416,10 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
_atk_relation_set_remove (set, relation);
-@@ -243,8 +243,8 @@
- lock.unlock();
- }
- }
+@@ -273,8 +273,8 @@
+ * @param set cast=(AtkStateSet *)
+ * @param type cast=(AtkStateType)
+ */
-public static final native boolean _atk_state_set_add_state (int /*long*/ set, int type);
-public static final boolean atk_state_set_add_state (int /*long*/ set, int type) {
+public static final native boolean _atk_state_set_add_state (long /*int*/ set, int type);
@@ -11949,7 +8427,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_state_set_add_state(set, type);
-@@ -252,8 +252,8 @@
+@@ -282,8 +282,8 @@
lock.unlock();
}
}
@@ -11960,7 +8438,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _atk_state_set_new();
-@@ -261,8 +261,8 @@
+@@ -291,8 +291,8 @@
lock.unlock();
}
}
@@ -11971,7 +8449,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _call(function, arg0);
-@@ -270,8 +270,8 @@
+@@ -300,8 +300,8 @@
lock.unlock();
}
}
@@ -11982,7 +8460,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _call(function, arg0, arg1);
-@@ -279,8 +279,8 @@
+@@ -309,8 +309,8 @@
lock.unlock();
}
}
@@ -11993,7 +8471,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _call(function, arg0, arg1, arg2);
-@@ -288,8 +288,8 @@
+@@ -318,8 +318,8 @@
lock.unlock();
}
}
@@ -12004,7 +8482,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3);
-@@ -297,8 +297,8 @@
+@@ -327,8 +327,8 @@
lock.unlock();
}
}
@@ -12015,7 +8493,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4);
-@@ -306,8 +306,8 @@
+@@ -336,8 +336,8 @@
lock.unlock();
}
}
@@ -12026,7 +8504,7 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5);
-@@ -315,19 +315,19 @@
+@@ -345,19 +345,19 @@
lock.unlock();
}
}
@@ -12061,159 +8539,209 @@ diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/ATK.java x86_64/org/ecli
+public static final native void memmove (long /*int*/ dest, AtkSelectionIface src);
+public static final native void memmove (long /*int*/ dest, AtkTextIface src);
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,27 +16,27 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,49 +17,49 @@
public class AtkObjectClass {
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
- public int /*long*/ get_name;
-- public int /*long*/ get_description;
-- public int /*long*/ get_parent;
-- public int /*long*/ get_n_children;
-- public int /*long*/ ref_child;
-- public int /*long*/ get_index_in_parent;
-- public int /*long*/ ref_relation_set;
-- public int /*long*/ get_role;
-- public int /*long*/ get_layer;
-- public int /*long*/ get_mdi_zorder;
-- public int /*long*/ ref_state_set;
-- public int /*long*/ set_name;
-- public int /*long*/ set_description;
-- public int /*long*/ set_parent;
-- public int /*long*/ set_role;
-- public int /*long*/ connect_property_change_handler;
-- public int /*long*/ remove_property_change_handler;
-- public int /*long*/ initialize;
-- public int /*long*/ children_changed;
-- public int /*long*/ focus_event;
-- public int /*long*/ property_change;
-- public int /*long*/ state_change;
-- public int /*long*/ visible_data_changed;
+ public long /*int*/ get_name;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
+- public int /*long*/ get_description;
+ public long /*int*/ get_description;
+ /** @field cast=(AtkObject *(*)()) */
+- public int /*long*/ get_parent;
+ public long /*int*/ get_parent;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_n_children;
+ public long /*int*/ get_n_children;
+ /** @field cast=(AtkObject *(*)()) */
+- public int /*long*/ ref_child;
+ public long /*int*/ ref_child;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_index_in_parent;
+ public long /*int*/ get_index_in_parent;
+ /** @field cast=(AtkRelationSet *(*)()) */
+- public int /*long*/ ref_relation_set;
+ public long /*int*/ ref_relation_set;
+ /** @field cast=(AtkRole (*)()) */
+- public int /*long*/ get_role;
+ public long /*int*/ get_role;
+ /** @field cast=(AtkLayer (*)()) */
+- public int /*long*/ get_layer;
+ public long /*int*/ get_layer;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_mdi_zorder;
+ public long /*int*/ get_mdi_zorder;
+ /** @field cast=(AtkStateSet *(*)()) */
+- public int /*long*/ ref_state_set;
+ public long /*int*/ ref_state_set;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ set_name;
+ public long /*int*/ set_name;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ set_description;
+ public long /*int*/ set_description;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ set_parent;
+ public long /*int*/ set_parent;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ set_role;
+ public long /*int*/ set_role;
+ /** @field cast=(guint (*)()) */
+- public int /*long*/ connect_property_change_handler;
+ public long /*int*/ connect_property_change_handler;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ remove_property_change_handler;
+ public long /*int*/ remove_property_change_handler;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ initialize;
+ public long /*int*/ initialize;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ children_changed;
+ public long /*int*/ children_changed;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ focus_event;
+ public long /*int*/ focus_event;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ property_change;
+ public long /*int*/ property_change;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ state_change;
+ public long /*int*/ state_change;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ visible_data_changed;
+ public long /*int*/ visible_data_changed;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,9 +17,9 @@
public class AtkObjectFactoryClass {
+ /** @field cast=(AtkObject *(*)()) */
- public int /*long*/ create_accessible;
-- public int /*long*/ invalidate;
-- public int /*long*/ get_accessible_type;
+ public long /*int*/ create_accessible;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ invalidate;
+ public long /*int*/ invalidate;
+ /** @field cast=(GType (*)()) */
+- public int /*long*/ get_accessible_type;
+ public long /*int*/ get_accessible_type;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,12 +16,12 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,19 +17,19 @@
public class AtkSelectionIface {
+ /** @field cast=(gboolean (*)()) */
- public int /*long*/ add_selection;
-- public int /*long*/ clear_selection;
-- public int /*long*/ ref_selection;
-- public int /*long*/ get_selection_count;
-- public int /*long*/ is_child_selected;
-- public int /*long*/ remove_selection;
-- public int /*long*/ select_all_selection;
-- public int /*long*/ selection_changed;
+ public long /*int*/ add_selection;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ clear_selection;
+ public long /*int*/ clear_selection;
+ /** @field cast=(AtkObject *(*)()) */
+- public int /*long*/ ref_selection;
+ public long /*int*/ ref_selection;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_selection_count;
+ public long /*int*/ get_selection_count;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ is_child_selected;
+ public long /*int*/ is_child_selected;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ remove_selection;
+ public long /*int*/ remove_selection;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ select_all_selection;
+ public long /*int*/ select_all_selection;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ selection_changed;
+ public long /*int*/ selection_changed;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,24 +16,24 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,43 +17,43 @@
public class AtkTextIface {
+ /** @field cast=(gchar *(*)()) */
- public int /*long*/ get_text;
-- public int /*long*/ get_text_after_offset;
-- public int /*long*/ get_text_at_offset;
-- public int /*long*/ get_character_at_offset;
-- public int /*long*/ get_text_before_offset;
-- public int /*long*/ get_caret_offset;
-- public int /*long*/ get_run_attributes;
-- public int /*long*/ get_default_attributes;
-- public int /*long*/ get_character_extents;
-- public int /*long*/ get_character_count;
-- public int /*long*/ get_offset_at_point;
-- public int /*long*/ get_n_selections;
-- public int /*long*/ get_selection;
-- public int /*long*/ add_selection;
-- public int /*long*/ remove_selection;
-- public int /*long*/ set_selection;
-- public int /*long*/ set_caret_offset;
-- public int /*long*/ text_changed;
-- public int /*long*/ text_caret_moved;
-- public int /*long*/ text_selection_changed;
+ public long /*int*/ get_text;
+ /** @field cast=(gchar *(*)()) */
+- public int /*long*/ get_text_after_offset;
+ public long /*int*/ get_text_after_offset;
+ /** @field cast=(gchar *(*)()) */
+- public int /*long*/ get_text_at_offset;
+ public long /*int*/ get_text_at_offset;
+ /** @field cast=(gunichar (*)()) */
+- public int /*long*/ get_character_at_offset;
+ public long /*int*/ get_character_at_offset;
+ /** @field cast=(gchar *(*)()) */
+- public int /*long*/ get_text_before_offset;
+ public long /*int*/ get_text_before_offset;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_caret_offset;
+ public long /*int*/ get_caret_offset;
+ /** @field cast=(AtkAttributeSet *(*)()) */
+- public int /*long*/ get_run_attributes;
+ public long /*int*/ get_run_attributes;
+ /** @field cast=(AtkAttributeSet *(*)()) */
+- public int /*long*/ get_default_attributes;
+ public long /*int*/ get_default_attributes;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_character_extents;
+ public long /*int*/ get_character_extents;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_character_count;
+ public long /*int*/ get_character_count;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_offset_at_point;
+ public long /*int*/ get_offset_at_point;
+ /** @field cast=(gint (*)()) */
+- public int /*long*/ get_n_selections;
+ public long /*int*/ get_n_selections;
+ /** @field cast=(gchar *(*)()) */
+- public int /*long*/ get_selection;
+ public long /*int*/ get_selection;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ add_selection;
+ public long /*int*/ add_selection;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ remove_selection;
+ public long /*int*/ remove_selection;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_selection;
+ public long /*int*/ set_selection;
+ /** @field cast=(gboolean (*)()) */
+- public int /*long*/ set_caret_offset;
+ public long /*int*/ set_caret_offset;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ text_changed;
+ public long /*int*/ text_changed;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ text_caret_moved;
+ public long /*int*/ text_caret_moved;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ text_selection_changed;
+ public long /*int*/ text_selection_changed;
}
-diff -ur x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
---- x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,5 +16,5 @@
-
+diff -urN x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+--- x86/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-05-29 17:30:18.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,5 +17,5 @@
public class GtkAccessible {
+ /** @field cast=(GtkWidget *) */
- public int /*long*/ widget;
+ public long /*int*/ widget;
}
-diff -ur x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/internal/BidiUtil.java
---- x86/org/eclipse/swt/internal/BidiUtil.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/BidiUtil.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/internal/BidiUtil.java
+--- x86/org/eclipse/swt/internal/BidiUtil.java 2008-06-05 13:31:46.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/BidiUtil.java 2009-09-17 08:48:24.000000000 -0400
@@ -42,7 +42,7 @@
/*
* Not implemented.
@@ -12241,13 +8769,13 @@ diff -ur x86/org/eclipse/swt/internal/BidiUtil.java x86_64/org/eclipse/swt/inter
return false;
}
public static boolean setOrientation (Control control, int orientation) {
-diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/internal/cairo/Cairo.java
---- x86/org/eclipse/swt/internal/cairo/Cairo.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cairo/Cairo.java 2009-02-11 17:43:48.000000000 -0500
-@@ -105,8 +105,8 @@
-
- /** Natives */
- public static final native int CAIRO_VERSION_ENCODE(int major, int minor, int micro);
+diff -urN x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/internal/cairo/Cairo.java
+--- x86/org/eclipse/swt/internal/cairo/Cairo.java 2009-05-29 17:30:14.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/cairo/Cairo.java 2009-09-17 08:48:22.000000000 -0400
+@@ -109,8 +109,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param path cast=(cairo_path_t *)
+ */
-public static final native void _cairo_append_path(int /*long*/ cr, int /*long*/ path);
-public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {
+public static final native void _cairo_append_path(long /*int*/ cr, long /*int*/ path);
@@ -12255,10 +8783,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_append_path(cr, path);
-@@ -114,8 +114,8 @@
- lock.unlock();
+@@ -119,8 +119,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);
-public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
+public static final native void _cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2);
@@ -12266,10 +8794,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_arc(cr, xc, yc, radius, angle1, angle2);
-@@ -123,8 +123,8 @@
- lock.unlock();
+@@ -129,8 +129,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);
-public static final void cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
+public static final native void _cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2);
@@ -12277,10 +8805,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_arc_negative(cr, xc, yc, radius, angle1, angle2);
-@@ -132,8 +132,8 @@
- lock.unlock();
+@@ -139,8 +139,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_clip(int /*long*/ cr);
-public static final void cairo_clip(int /*long*/ cr) {
+public static final native void _cairo_clip(long /*int*/ cr);
@@ -12288,10 +8816,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_clip(cr);
-@@ -141,8 +141,8 @@
- lock.unlock();
+@@ -149,8 +149,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_clip_preserve(int /*long*/ cr);
-public static final void cairo_clip_preserve(int /*long*/ cr) {
+public static final native void _cairo_clip_preserve(long /*int*/ cr);
@@ -12299,10 +8827,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_clip_preserve(cr);
-@@ -150,8 +150,8 @@
- lock.unlock();
+@@ -159,8 +159,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_close_path(int /*long*/ cr);
-public static final void cairo_close_path(int /*long*/ cr) {
+public static final native void _cairo_close_path(long /*int*/ cr);
@@ -12310,10 +8838,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_close_path(cr);
-@@ -159,8 +159,8 @@
- lock.unlock();
+@@ -169,8 +169,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_copy_page(int /*long*/ cr);
-public static final void cairo_copy_page(int /*long*/ cr) {
+public static final native void _cairo_copy_page(long /*int*/ cr);
@@ -12321,10 +8849,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_copy_page(cr);
-@@ -168,8 +168,8 @@
- lock.unlock();
+@@ -179,8 +179,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_copy_path(int /*long*/ cr);
-public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_copy_path(long /*int*/ cr);
@@ -12332,10 +8860,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_copy_path(cr);
-@@ -177,8 +177,8 @@
- lock.unlock();
+@@ -189,8 +189,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_copy_path_flat(int /*long*/ cr);
-public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_copy_path_flat(long /*int*/ cr);
@@ -12343,10 +8871,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_copy_path_flat(cr);
-@@ -186,8 +186,8 @@
- lock.unlock();
+@@ -199,8 +199,8 @@
}
}
+ /** @param target cast=(cairo_surface_t *) */
-public static final native int /*long*/ _cairo_create(int /*long*/ target);
-public static final int /*long*/ cairo_create(int /*long*/ target) {
+public static final native long /*int*/ _cairo_create(long /*int*/ target);
@@ -12354,10 +8882,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_create(target);
-@@ -195,8 +195,8 @@
- lock.unlock();
+@@ -209,8 +209,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);
-public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) {
+public static final native void _cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);
@@ -12365,10 +8893,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_curve_to(cr, x1, y1, x2, y2, x3, y3);
-@@ -204,8 +204,8 @@
- lock.unlock();
+@@ -219,8 +219,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_destroy(int /*long*/ cr);
-public static final void cairo_destroy(int /*long*/ cr) {
+public static final native void _cairo_destroy(long /*int*/ cr);
@@ -12376,10 +8904,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_destroy(cr);
-@@ -213,8 +213,8 @@
- lock.unlock();
+@@ -229,8 +229,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_device_to_user(int /*long*/ cr, double[] x, double[] y);
-public static final void cairo_device_to_user(int /*long*/ cr, double[] x, double[] y) {
+public static final native void _cairo_device_to_user(long /*int*/ cr, double[] x, double[] y);
@@ -12387,10 +8915,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_device_to_user(cr, x, y);
-@@ -222,8 +222,8 @@
- lock.unlock();
+@@ -239,8 +239,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy);
-public static final void cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy) {
+public static final native void _cairo_device_to_user_distance(long /*int*/ cr, double[] dx, double[] dy);
@@ -12398,10 +8926,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_device_to_user_distance(cr, dx, dy);
-@@ -231,8 +231,8 @@
- lock.unlock();
+@@ -249,8 +249,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_fill(int /*long*/ cr);
-public static final void cairo_fill(int /*long*/ cr) {
+public static final native void _cairo_fill(long /*int*/ cr);
@@ -12409,10 +8937,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_fill(cr);
-@@ -240,8 +240,8 @@
- lock.unlock();
+@@ -259,8 +259,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
-public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
+public static final native void _cairo_fill_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
@@ -12420,10 +8948,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_fill_extents(cr, x1, y1, x2, y2);
-@@ -249,8 +249,8 @@
- lock.unlock();
+@@ -269,8 +269,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_fill_preserve(int /*long*/ cr);
-public static final void cairo_fill_preserve(int /*long*/ cr) {
+public static final native void _cairo_fill_preserve(long /*int*/ cr);
@@ -12431,10 +8959,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_fill_preserve(cr);
-@@ -258,8 +258,8 @@
- lock.unlock();
+@@ -279,8 +279,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents);
-public static final void cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents) {
+public static final native void _cairo_font_extents(long /*int*/ cr, cairo_font_extents_t extents);
@@ -12442,7 +8970,7 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_font_extents(cr, extents);
-@@ -267,8 +267,8 @@
+@@ -288,8 +288,8 @@
lock.unlock();
}
}
@@ -12453,10 +8981,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_font_options_create();
-@@ -276,8 +276,8 @@
- lock.unlock();
+@@ -298,8 +298,8 @@
}
}
+ /** @param options cast=(cairo_font_options_t *) */
-public static final native void _cairo_font_options_destroy(int /*long*/ options);
-public static final void cairo_font_options_destroy(int /*long*/ options) {
+public static final native void _cairo_font_options_destroy(long /*int*/ options);
@@ -12464,10 +8992,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_font_options_destroy(options);
-@@ -285,8 +285,8 @@
- lock.unlock();
+@@ -308,8 +308,8 @@
}
}
+ /** @param options cast=(cairo_font_options_t *) */
-public static final native int _cairo_font_options_get_antialias(int /*long*/ options);
-public static final int cairo_font_options_get_antialias(int /*long*/ options) {
+public static final native int _cairo_font_options_get_antialias(long /*int*/ options);
@@ -12475,10 +9003,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_font_options_get_antialias(options);
-@@ -294,8 +294,8 @@
- lock.unlock();
+@@ -318,8 +318,8 @@
}
}
+ /** @param options cast=(cairo_font_options_t *) */
-public static final native void _cairo_font_options_set_antialias(int /*long*/ options, int antialias);
-public static final void cairo_font_options_set_antialias(int /*long*/ options, int antialias) {
+public static final native void _cairo_font_options_set_antialias(long /*int*/ options, int antialias);
@@ -12486,10 +9014,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_font_options_set_antialias(options, antialias);
-@@ -303,8 +303,8 @@
- lock.unlock();
+@@ -328,8 +328,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_antialias(int /*long*/ cr);
-public static final int cairo_get_antialias(int /*long*/ cr) {
+public static final native int _cairo_get_antialias(long /*int*/ cr);
@@ -12497,10 +9025,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_antialias(cr);
-@@ -312,8 +312,8 @@
- lock.unlock();
+@@ -338,8 +338,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_get_current_point(int /*long*/ cr, double[] x, double[] y);
-public static final void cairo_get_current_point(int /*long*/ cr, double[] x, double[] y) {
+public static final native void _cairo_get_current_point(long /*int*/ cr, double[] x, double[] y);
@@ -12508,10 +9036,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_get_current_point(cr, x, y);
-@@ -321,8 +321,8 @@
- lock.unlock();
+@@ -348,8 +348,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_fill_rule(int /*long*/ cr);
-public static final int cairo_get_fill_rule(int /*long*/ cr) {
+public static final native int _cairo_get_fill_rule(long /*int*/ cr);
@@ -12519,10 +9047,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_fill_rule(cr);
-@@ -330,8 +330,8 @@
- lock.unlock();
+@@ -358,8 +358,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_get_font_face(int /*long*/ cr);
-public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_get_font_face(long /*int*/ cr);
@@ -12530,10 +9058,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_font_face(cr);
-@@ -339,8 +339,8 @@
- lock.unlock();
- }
- }
+@@ -371,8 +371,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_get_font_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_get_font_matrix(long /*int*/ cr, double[] matrix);
@@ -12541,10 +9069,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_get_font_matrix(cr, matrix);
-@@ -348,8 +348,8 @@
- lock.unlock();
- }
- }
+@@ -384,8 +384,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param options cast=(cairo_font_options_t *)
+ */
-public static final native void _cairo_get_font_options(int /*long*/ cr, int /*long*/ options);
-public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ options) {
+public static final native void _cairo_get_font_options(long /*int*/ cr, long /*int*/ options);
@@ -12552,10 +9080,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_get_font_options(cr, options);
-@@ -357,8 +357,8 @@
- lock.unlock();
+@@ -394,8 +394,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_line_cap(int /*long*/ cr);
-public static final int cairo_get_line_cap(int /*long*/ cr) {
+public static final native int _cairo_get_line_cap(long /*int*/ cr);
@@ -12563,10 +9091,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_line_cap(cr);
-@@ -366,8 +366,8 @@
- lock.unlock();
+@@ -404,8 +404,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_line_join(int /*long*/ cr);
-public static final int cairo_get_line_join(int /*long*/ cr) {
+public static final native int _cairo_get_line_join(long /*int*/ cr);
@@ -12574,10 +9102,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_line_join(cr);
-@@ -375,8 +375,8 @@
- lock.unlock();
+@@ -414,8 +414,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native double _cairo_get_line_width(int /*long*/ cr);
-public static final double cairo_get_line_width(int /*long*/ cr) {
+public static final native double _cairo_get_line_width(long /*int*/ cr);
@@ -12585,10 +9113,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_line_width(cr);
-@@ -384,8 +384,8 @@
- lock.unlock();
- }
- }
+@@ -427,8 +427,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_get_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_get_matrix(long /*int*/ cr, double[] matrix);
@@ -12596,10 +9124,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_get_matrix(cr, matrix);
-@@ -393,8 +393,8 @@
- lock.unlock();
+@@ -437,8 +437,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native double _cairo_get_miter_limit(int /*long*/ cr);
-public static final double cairo_get_miter_limit(int /*long*/ cr) {
+public static final native double _cairo_get_miter_limit(long /*int*/ cr);
@@ -12607,10 +9135,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_miter_limit(cr);
-@@ -402,8 +402,8 @@
- lock.unlock();
+@@ -447,8 +447,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_get_operator(int /*long*/ cr);
-public static final int cairo_get_operator(int /*long*/ cr) {
+public static final native int _cairo_get_operator(long /*int*/ cr);
@@ -12618,10 +9146,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_operator(cr);
-@@ -411,8 +411,8 @@
- lock.unlock();
+@@ -457,8 +457,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_get_source(int /*long*/ cr);
-public static final int /*long*/ cairo_get_source(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_get_source(long /*int*/ cr);
@@ -12629,10 +9157,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_source(cr);
-@@ -420,8 +420,8 @@
- lock.unlock();
+@@ -467,8 +467,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_get_target(int /*long*/ cr);
-public static final int /*long*/ cairo_get_target(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_get_target(long /*int*/ cr);
@@ -12640,10 +9168,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_target(cr);
-@@ -429,8 +429,8 @@
- lock.unlock();
+@@ -477,8 +477,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native double _cairo_get_tolerance(int /*long*/ cr);
-public static final double cairo_get_tolerance(int /*long*/ cr) {
+public static final native double _cairo_get_tolerance(long /*int*/ cr);
@@ -12651,10 +9179,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_get_tolerance(cr);
-@@ -438,8 +438,8 @@
- lock.unlock();
- }
- }
+@@ -491,8 +491,8 @@
+ * @param glyphs cast=(cairo_glyph_t *)
+ * @param extents cast=(cairo_text_extents_t *)
+ */
-public static final native void _cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents);
-public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents) {
+public static final native void _cairo_glyph_extents(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs, long /*int*/ extents);
@@ -12662,10 +9190,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_glyph_extents(cr, glyphs, num_glyphs, extents);
-@@ -447,8 +447,8 @@
- lock.unlock();
- }
- }
+@@ -504,8 +504,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param glyphs cast=(cairo_glyph_t *)
+ */
-public static final native void _cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
-public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {
+public static final native void _cairo_glyph_path(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs);
@@ -12673,10 +9201,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_glyph_path(cr, glyphs, num_glyphs);
-@@ -456,8 +456,8 @@
- lock.unlock();
+@@ -514,8 +514,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_identity_matrix(int /*long*/ cr);
-public static final void cairo_identity_matrix(int /*long*/ cr) {
+public static final native void _cairo_identity_matrix(long /*int*/ cr);
@@ -12684,7 +9212,7 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_identity_matrix(cr);
-@@ -465,8 +465,8 @@
+@@ -523,8 +523,8 @@
lock.unlock();
}
}
@@ -12695,10 +9223,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_image_surface_create(format, width, height);
-@@ -474,8 +474,8 @@
- lock.unlock();
+@@ -533,8 +533,8 @@
}
}
+ /** @param data cast=(unsigned char *) */
-public static final native int /*long*/ _cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride);
-public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride) {
+public static final native long /*int*/ _cairo_image_surface_create_for_data(long /*int*/ data, int format, int width, int height, int stride);
@@ -12706,10 +9234,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_image_surface_create_for_data(data, format, width, height, stride);
-@@ -483,8 +483,8 @@
- lock.unlock();
+@@ -543,8 +543,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native int _cairo_image_surface_get_height(int /*long*/ surface);
-public static final int cairo_image_surface_get_height(int /*long*/ surface) {
+public static final native int _cairo_image_surface_get_height(long /*int*/ surface);
@@ -12717,10 +9245,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_image_surface_get_height(surface);
-@@ -492,8 +492,8 @@
- lock.unlock();
+@@ -553,8 +553,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native int _cairo_image_surface_get_width(int /*long*/ surface);
-public static final int cairo_image_surface_get_width(int /*long*/ surface) {
+public static final native int _cairo_image_surface_get_width(long /*int*/ surface);
@@ -12728,10 +9256,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_image_surface_get_width(surface);
-@@ -501,8 +501,8 @@
- lock.unlock();
+@@ -563,8 +563,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_in_fill(int /*long*/ cr, double x, double y);
-public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {
+public static final native int _cairo_in_fill(long /*int*/ cr, double x, double y);
@@ -12739,10 +9267,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_in_fill(cr, x, y);
-@@ -510,8 +510,8 @@
- lock.unlock();
+@@ -573,8 +573,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_in_stroke(int /*long*/ cr, double x, double y);
-public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {
+public static final native int _cairo_in_stroke(long /*int*/ cr, double x, double y);
@@ -12750,10 +9278,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_in_stroke(cr, x, y);
-@@ -519,8 +519,8 @@
- lock.unlock();
+@@ -583,8 +583,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_line_to(int /*long*/ cr, double x, double y);
-public static final void cairo_line_to(int /*long*/ cr, double x, double y) {
+public static final native void _cairo_line_to(long /*int*/ cr, double x, double y);
@@ -12761,10 +9289,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_line_to(cr, x, y);
-@@ -528,8 +528,8 @@
- lock.unlock();
- }
- }
+@@ -596,8 +596,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param pattern cast=(cairo_pattern_t *)
+ */
-public static final native void _cairo_mask(int /*long*/ cr, int /*long*/ pattern);
-public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {
+public static final native void _cairo_mask(long /*int*/ cr, long /*int*/ pattern);
@@ -12772,10 +9300,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_mask(cr, pattern);
-@@ -537,8 +537,8 @@
- lock.unlock();
- }
- }
+@@ -609,8 +609,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param surface cast=(cairo_surface_t *)
+ */
-public static final native void _cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y);
-public static final void cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y) {
+public static final native void _cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y);
@@ -12783,10 +9311,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_mask_surface(cr, surface, surface_x, surface_y);
-@@ -654,8 +654,8 @@
- lock.unlock();
+@@ -743,8 +743,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_move_to(int /*long*/ cr, double x, double y);
-public static final void cairo_move_to(int /*long*/ cr, double x, double y) {
+public static final native void _cairo_move_to(long /*int*/ cr, double x, double y);
@@ -12794,10 +9322,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_move_to(cr, x, y);
-@@ -663,8 +663,8 @@
- lock.unlock();
+@@ -753,8 +753,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_new_path(int /*long*/ cr);
-public static final void cairo_new_path(int /*long*/ cr) {
+public static final native void _cairo_new_path(long /*int*/ cr);
@@ -12805,10 +9333,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_new_path(cr);
-@@ -672,8 +672,8 @@
- lock.unlock();
+@@ -763,8 +763,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_paint(int /*long*/ cr);
-public static final void cairo_paint(int /*long*/ cr) {
+public static final native void _cairo_paint(long /*int*/ cr);
@@ -12816,10 +9344,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_paint(cr);
-@@ -681,8 +681,8 @@
- lock.unlock();
+@@ -773,8 +773,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_paint_with_alpha(int /*long*/ cr, double alpha);
-public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {
+public static final native void _cairo_paint_with_alpha(long /*int*/ cr, double alpha);
@@ -12827,10 +9355,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_paint_with_alpha(cr, alpha);
-@@ -690,8 +690,8 @@
- lock.unlock();
+@@ -783,8 +783,8 @@
}
}
+ /** @param path cast=(cairo_path_t *) */
-public static final native void _cairo_path_destroy(int /*long*/ path);
-public static final void cairo_path_destroy(int /*long*/ path) {
+public static final native void _cairo_path_destroy(long /*int*/ path);
@@ -12838,10 +9366,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_path_destroy(path);
-@@ -699,8 +699,8 @@
- lock.unlock();
+@@ -793,8 +793,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue);
-public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue) {
+public static final native void _cairo_pattern_add_color_stop_rgb(long /*int*/ pattern, double offset, double red, double green, double blue);
@@ -12849,10 +9377,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_add_color_stop_rgb(pattern, offset, red, green, blue);
-@@ -708,8 +708,8 @@
- lock.unlock();
+@@ -803,8 +803,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha);
-public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha) {
+public static final native void _cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha);
@@ -12860,10 +9388,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha);
-@@ -717,8 +717,8 @@
- lock.unlock();
+@@ -813,8 +813,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native int /*long*/ _cairo_pattern_create_for_surface(int /*long*/ surface);
-public static final int /*long*/ cairo_pattern_create_for_surface(int /*long*/ surface) {
+public static final native long /*int*/ _cairo_pattern_create_for_surface(long /*int*/ surface);
@@ -12871,7 +9399,7 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_pattern_create_for_surface(surface);
-@@ -726,8 +726,8 @@
+@@ -822,8 +822,8 @@
lock.unlock();
}
}
@@ -12882,7 +9410,7 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_pattern_create_linear(x0, y0, x1, y1);
-@@ -735,8 +735,8 @@
+@@ -831,8 +831,8 @@
lock.unlock();
}
}
@@ -12893,10 +9421,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_pattern_create_radial(cx0, cy0, radius0, cx1, cy1, radius1);
-@@ -744,8 +744,8 @@
- lock.unlock();
+@@ -841,8 +841,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_destroy(int /*long*/ pattern);
-public static final void cairo_pattern_destroy(int /*long*/ pattern) {
+public static final native void _cairo_pattern_destroy(long /*int*/ pattern);
@@ -12904,10 +9432,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_destroy(pattern);
-@@ -753,8 +753,8 @@
- lock.unlock();
+@@ -851,8 +851,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native int _cairo_pattern_get_extend(int /*long*/ pattern);
-public static final int cairo_pattern_get_extend(int /*long*/ pattern) {
+public static final native int _cairo_pattern_get_extend(long /*int*/ pattern);
@@ -12915,10 +9443,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_pattern_get_extend(pattern);
-@@ -762,8 +762,8 @@
- lock.unlock();
+@@ -861,8 +861,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native int _cairo_pattern_get_filter(int /*long*/ pattern);
-public static final int cairo_pattern_get_filter(int /*long*/ pattern) {
+public static final native int _cairo_pattern_get_filter(long /*int*/ pattern);
@@ -12926,10 +9454,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_pattern_get_filter(pattern);
-@@ -771,8 +771,8 @@
- lock.unlock();
- }
- }
+@@ -874,8 +874,8 @@
+ * @param pattern cast=(cairo_pattern_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix);
-public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix) {
+public static final native void _cairo_pattern_get_matrix(long /*int*/ pattern, double[] matrix);
@@ -12937,10 +9465,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_get_matrix(pattern, matrix);
-@@ -780,8 +780,8 @@
- lock.unlock();
+@@ -884,8 +884,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_reference(int /*long*/ pattern);
-public static final void cairo_pattern_reference(int /*long*/ pattern) {
+public static final native void _cairo_pattern_reference(long /*int*/ pattern);
@@ -12948,10 +9476,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_reference(pattern);
-@@ -789,8 +789,8 @@
- lock.unlock();
+@@ -894,8 +894,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_set_extend(int /*long*/ pattern, int extend);
-public static final void cairo_pattern_set_extend(int /*long*/ pattern, int extend) {
+public static final native void _cairo_pattern_set_extend(long /*int*/ pattern, int extend);
@@ -12959,10 +9487,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_set_extend(pattern, extend);
-@@ -798,8 +798,8 @@
- lock.unlock();
+@@ -904,8 +904,8 @@
}
}
+ /** @param pattern cast=(cairo_pattern_t *) */
-public static final native void _cairo_pattern_set_filter(int /*long*/ pattern, int filter);
-public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filter) {
+public static final native void _cairo_pattern_set_filter(long /*int*/ pattern, int filter);
@@ -12970,10 +9498,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_set_filter(pattern, filter);
-@@ -807,8 +807,8 @@
- lock.unlock();
- }
- }
+@@ -917,8 +917,8 @@
+ * @param pattern cast=(cairo_pattern_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix);
-public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix) {
+public static final native void _cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix);
@@ -12981,10 +9509,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pattern_set_matrix(pattern, matrix);
-@@ -816,8 +816,8 @@
- lock.unlock();
- }
- }
+@@ -930,8 +930,8 @@
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
-public static final native void _cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);
-public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {
+public static final native void _cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points);
@@ -12992,10 +9520,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_pdf_surface_set_size(surface, width_in_points, height_in_points);
-@@ -825,8 +825,8 @@
- lock.unlock();
- }
- }
+@@ -943,8 +943,8 @@
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
-public static final native void _cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);
-public static final void cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {
+public static final native void _cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points);
@@ -13003,10 +9531,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_ps_surface_set_size(surface, width_in_points, height_in_points);
-@@ -834,8 +834,8 @@
- lock.unlock();
+@@ -953,8 +953,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height);
-public static final void cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height) {
+public static final native void _cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height);
@@ -13014,10 +9542,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_rectangle(cr, x, y, width, height);
-@@ -843,8 +843,8 @@
- lock.unlock();
+@@ -963,8 +963,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int /*long*/ _cairo_reference(int /*long*/ cr);
-public static final int /*long*/ cairo_reference(int /*long*/ cr) {
+public static final native long /*int*/ _cairo_reference(long /*int*/ cr);
@@ -13025,10 +9553,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_reference(cr);
-@@ -852,8 +852,8 @@
- lock.unlock();
+@@ -973,8 +973,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);
-public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) {
+public static final native void _cairo_rel_curve_to(long /*int*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);
@@ -13036,10 +9564,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_rel_curve_to(cr, dx1, dy1, dx2, dy2, dx3, dy3);
-@@ -861,8 +861,8 @@
- lock.unlock();
+@@ -983,8 +983,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rel_line_to(int /*long*/ cr, double dx, double dy);
-public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy) {
+public static final native void _cairo_rel_line_to(long /*int*/ cr, double dx, double dy);
@@ -13047,10 +9575,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_rel_line_to(cr, dx, dy);
-@@ -870,8 +870,8 @@
- lock.unlock();
+@@ -993,8 +993,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rel_move_to(int /*long*/ cr, double dx, double dy);
-public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy) {
+public static final native void _cairo_rel_move_to(long /*int*/ cr, double dx, double dy);
@@ -13058,10 +9586,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_rel_move_to(cr, dx, dy);
-@@ -879,8 +879,8 @@
- lock.unlock();
+@@ -1003,8 +1003,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_reset_clip(int /*long*/ cr);
-public static final void cairo_reset_clip(int /*long*/ cr) {
+public static final native void _cairo_reset_clip(long /*int*/ cr);
@@ -13069,10 +9597,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_reset_clip(cr);
-@@ -888,8 +888,8 @@
- lock.unlock();
+@@ -1013,8 +1013,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_restore(int /*long*/ cr);
-public static final void cairo_restore(int /*long*/ cr) {
+public static final native void _cairo_restore(long /*int*/ cr);
@@ -13080,10 +9608,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_restore(cr);
-@@ -897,8 +897,8 @@
- lock.unlock();
+@@ -1023,8 +1023,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_rotate(int /*long*/ cr, double angle);
-public static final void cairo_rotate(int /*long*/ cr, double angle) {
+public static final native void _cairo_rotate(long /*int*/ cr, double angle);
@@ -13091,10 +9619,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_rotate(cr, angle);
-@@ -906,8 +906,8 @@
- lock.unlock();
+@@ -1033,8 +1033,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_save(int /*long*/ cr);
-public static final void cairo_save(int /*long*/ cr) {
+public static final native void _cairo_save(long /*int*/ cr);
@@ -13102,10 +9630,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_save(cr);
-@@ -915,8 +915,8 @@
- lock.unlock();
+@@ -1043,8 +1043,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_scale(int /*long*/ cr, double sx, double sy);
-public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {
+public static final native void _cairo_scale(long /*int*/ cr, double sx, double sy);
@@ -13113,10 +9641,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_scale(cr, sx, sy);
-@@ -924,8 +924,8 @@
- lock.unlock();
- }
- }
+@@ -1056,8 +1056,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param family cast=(const char *)
+ */
-public static final native void _cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight);
-public static final void cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight) {
+public static final native void _cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight);
@@ -13124,10 +9652,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_select_font_face(cr, family, slant, weight);
-@@ -933,8 +933,8 @@
- lock.unlock();
+@@ -1066,8 +1066,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_antialias(int /*long*/ cr, int antialias);
-public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {
+public static final native void _cairo_set_antialias(long /*int*/ cr, int antialias);
@@ -13135,10 +9663,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_antialias(cr, antialias);
-@@ -942,8 +942,8 @@
- lock.unlock();
+@@ -1076,8 +1076,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset);
-public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset) {
+public static final native void _cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset);
@@ -13146,10 +9674,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_dash(cr, dashes, ndash, offset);
-@@ -951,8 +951,8 @@
- lock.unlock();
+@@ -1086,8 +1086,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_fill_rule(int /*long*/ cr, int fill_rule);
-public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {
+public static final native void _cairo_set_fill_rule(long /*int*/ cr, int fill_rule);
@@ -13157,10 +9685,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_fill_rule(cr, fill_rule);
-@@ -960,8 +960,8 @@
- lock.unlock();
- }
- }
+@@ -1099,8 +1099,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param font_face cast=(cairo_font_face_t *)
+ */
-public static final native void _cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face);
-public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face) {
+public static final native void _cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face);
@@ -13168,10 +9696,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_font_face(cr, font_face);
-@@ -969,8 +969,8 @@
- lock.unlock();
- }
- }
+@@ -1112,8 +1112,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_set_font_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_set_font_matrix(long /*int*/ cr, double[] matrix);
@@ -13179,10 +9707,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_font_matrix(cr, matrix);
-@@ -978,8 +978,8 @@
- lock.unlock();
- }
- }
+@@ -1125,8 +1125,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param options cast=(cairo_font_options_t *)
+ */
-public static final native void _cairo_set_font_options(int /*long*/ cr, int /*long*/ options);
-public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ options) {
+public static final native void _cairo_set_font_options(long /*int*/ cr, long /*int*/ options);
@@ -13190,10 +9718,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_font_options(cr, options);
-@@ -987,8 +987,8 @@
- lock.unlock();
+@@ -1135,8 +1135,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_font_size(int /*long*/ cr, double size);
-public static final void cairo_set_font_size(int /*long*/ cr, double size) {
+public static final native void _cairo_set_font_size(long /*int*/ cr, double size);
@@ -13201,10 +9729,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_font_size(cr, size);
-@@ -996,8 +996,8 @@
- lock.unlock();
+@@ -1145,8 +1145,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_line_cap(int /*long*/ cr, int line_cap);
-public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {
+public static final native void _cairo_set_line_cap(long /*int*/ cr, int line_cap);
@@ -13212,10 +9740,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_line_cap(cr, line_cap);
-@@ -1005,8 +1005,8 @@
- lock.unlock();
+@@ -1155,8 +1155,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_line_join(int /*long*/ cr, int line_join);
-public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {
+public static final native void _cairo_set_line_join(long /*int*/ cr, int line_join);
@@ -13223,10 +9751,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_line_join(cr, line_join);
-@@ -1014,8 +1014,8 @@
- lock.unlock();
+@@ -1165,8 +1165,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_line_width(int /*long*/ cr, double width);
-public static final void cairo_set_line_width(int /*long*/ cr, double width) {
+public static final native void _cairo_set_line_width(long /*int*/ cr, double width);
@@ -13234,10 +9762,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_line_width(cr, width);
-@@ -1023,8 +1023,8 @@
- lock.unlock();
- }
- }
+@@ -1178,8 +1178,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_set_matrix(int /*long*/ cr, double[] matrix);
-public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_set_matrix(long /*int*/ cr, double[] matrix);
@@ -13245,10 +9773,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_matrix(cr, matrix);
-@@ -1032,8 +1032,8 @@
- lock.unlock();
+@@ -1188,8 +1188,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_miter_limit(int /*long*/ cr, double limit);
-public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {
+public static final native void _cairo_set_miter_limit(long /*int*/ cr, double limit);
@@ -13256,10 +9784,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_miter_limit(cr, limit);
-@@ -1041,8 +1041,8 @@
- lock.unlock();
+@@ -1198,8 +1198,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_operator(int /*long*/ cr, int op);
-public static final void cairo_set_operator(int /*long*/ cr, int op) {
+public static final native void _cairo_set_operator(long /*int*/ cr, int op);
@@ -13267,10 +9795,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_operator(cr, op);
-@@ -1050,8 +1050,8 @@
- lock.unlock();
- }
- }
+@@ -1211,8 +1211,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param source cast=(cairo_pattern_t *)
+ */
-public static final native void _cairo_set_source(int /*long*/ cr, int /*long*/ source);
-public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source) {
+public static final native void _cairo_set_source(long /*int*/ cr, long /*int*/ source);
@@ -13278,10 +9806,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_source(cr, source);
-@@ -1059,8 +1059,8 @@
- lock.unlock();
+@@ -1221,8 +1221,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue);
-public static final void cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue) {
+public static final native void _cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue);
@@ -13289,10 +9817,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_source_rgb(cr, red, green, blue);
-@@ -1068,8 +1068,8 @@
- lock.unlock();
+@@ -1231,8 +1231,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha);
-public static final void cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha) {
+public static final native void _cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha);
@@ -13300,10 +9828,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_source_rgba(cr, red, green, blue, alpha);
-@@ -1077,8 +1077,8 @@
- lock.unlock();
- }
- }
+@@ -1244,8 +1244,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param surface cast=(cairo_surface_t *)
+ */
-public static final native void _cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y);
-public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y) {
+public static final native void _cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y);
@@ -13311,10 +9839,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_source_surface(cr, surface, x, y);
-@@ -1086,8 +1086,8 @@
- lock.unlock();
+@@ -1254,8 +1254,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_set_tolerance(int /*long*/ cr, double tolerance);
-public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance) {
+public static final native void _cairo_set_tolerance(long /*int*/ cr, double tolerance);
@@ -13322,10 +9850,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_set_tolerance(cr, tolerance);
-@@ -1095,8 +1095,8 @@
- lock.unlock();
- }
- }
+@@ -1267,8 +1267,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param glyphs cast=(cairo_glyph_t *)
+ */
-public static final native void _cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
-public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {
+public static final native void _cairo_show_glyphs(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs);
@@ -13333,10 +9861,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_show_glyphs(cr, glyphs, num_glyphs);
-@@ -1104,8 +1104,8 @@
- lock.unlock();
+@@ -1277,8 +1277,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_show_page(int /*long*/ cr);
-public static final void cairo_show_page(int /*long*/ cr) {
+public static final native void _cairo_show_page(long /*int*/ cr);
@@ -13344,10 +9872,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_show_page(cr);
-@@ -1113,8 +1113,8 @@
- lock.unlock();
- }
- }
+@@ -1290,8 +1290,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param utf8 cast=(const char *)
+ */
-public static final native void _cairo_show_text(int /*long*/ cr, byte[] utf8);
-public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {
+public static final native void _cairo_show_text(long /*int*/ cr, byte[] utf8);
@@ -13355,10 +9883,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_show_text(cr, utf8);
-@@ -1122,8 +1122,8 @@
- lock.unlock();
+@@ -1300,8 +1300,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native int _cairo_status(int /*long*/ cr);
-public static final int cairo_status(int /*long*/ cr) {
+public static final native int _cairo_status(long /*int*/ cr);
@@ -13366,7 +9894,7 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_status(cr);
-@@ -1131,8 +1131,8 @@
+@@ -1309,8 +1309,8 @@
lock.unlock();
}
}
@@ -13377,10 +9905,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_status_to_string(status);
-@@ -1140,8 +1140,8 @@
- lock.unlock();
+@@ -1319,8 +1319,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_stroke(int /*long*/ cr);
-public static final void cairo_stroke(int /*long*/ cr) {
+public static final native void _cairo_stroke(long /*int*/ cr);
@@ -13388,10 +9916,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_stroke(cr);
-@@ -1149,8 +1149,8 @@
- lock.unlock();
+@@ -1329,8 +1329,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
-public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
+public static final native void _cairo_stroke_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
@@ -13399,10 +9927,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_stroke_extents(cr, x1, y1, x2, y2);
-@@ -1158,8 +1158,8 @@
- lock.unlock();
+@@ -1339,8 +1339,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_stroke_preserve(int /*long*/ cr);
-public static final void cairo_stroke_preserve(int /*long*/ cr) {
+public static final native void _cairo_stroke_preserve(long /*int*/ cr);
@@ -13410,10 +9938,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_stroke_preserve(cr);
-@@ -1167,8 +1167,8 @@
- lock.unlock();
+@@ -1349,8 +1349,8 @@
}
}
+ /** @param other cast=(cairo_surface_t *) */
-public static final native int /*long*/ _cairo_surface_create_similar(int /*long*/ other, int format, int width, int height);
-public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other, int format, int width, int height) {
+public static final native long /*int*/ _cairo_surface_create_similar(long /*int*/ other, int format, int width, int height);
@@ -13421,10 +9949,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_surface_create_similar(other, format, width, height);
-@@ -1176,8 +1176,8 @@
- lock.unlock();
+@@ -1359,8 +1359,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_destroy(int /*long*/ surface);
-public static final void cairo_surface_destroy(int /*long*/ surface) {
+public static final native void _cairo_surface_destroy(long /*int*/ surface);
@@ -13432,10 +9960,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_surface_destroy(surface);
-@@ -1185,8 +1185,8 @@
- lock.unlock();
+@@ -1369,8 +1369,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_finish(int /*long*/ surface);
-public static final void cairo_surface_finish(int /*long*/ surface) {
+public static final native void _cairo_surface_finish(long /*int*/ surface);
@@ -13443,10 +9971,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_surface_finish(surface);
-@@ -1194,8 +1194,8 @@
- lock.unlock();
- }
- }
+@@ -1382,8 +1382,8 @@
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
-public static final native int _cairo_surface_get_type(int /*long*/ surface);
-public static final int cairo_surface_get_type(int /*long*/ surface) {
+public static final native int _cairo_surface_get_type(long /*int*/ surface);
@@ -13454,10 +9982,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_surface_get_type(surface);
-@@ -1203,8 +1203,8 @@
- lock.unlock();
- }
- }
+@@ -1395,8 +1395,8 @@
+ * @param surface cast=(cairo_surface_t *)
+ * @param key cast=(cairo_user_data_key_t *)
+ */
-public static final native int /*long*/ _cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key);
-public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key) {
+public static final native long /*int*/ _cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key);
@@ -13465,10 +9993,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_surface_get_user_data(surface, key);
-@@ -1212,8 +1212,8 @@
- lock.unlock();
+@@ -1405,8 +1405,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_reference(int /*long*/ surface);
-public static final void cairo_surface_reference(int /*long*/ surface) {
+public static final native void _cairo_surface_reference(long /*int*/ surface);
@@ -13476,10 +10004,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_surface_reference(surface);
-@@ -1221,8 +1221,8 @@
- lock.unlock();
+@@ -1415,8 +1415,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset);
-public static final void cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset) {
+public static final native void _cairo_surface_set_device_offset(long /*int*/ surface, double x_offset, double y_offset);
@@ -13487,10 +10015,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_surface_set_device_offset(surface, x_offset, y_offset);
-@@ -1230,8 +1230,8 @@
- lock.unlock();
+@@ -1425,8 +1425,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);
-public static final void cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) {
+public static final native void _cairo_surface_set_fallback_resolution(long /*int*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);
@@ -13498,10 +10026,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
-@@ -1239,8 +1239,8 @@
- lock.unlock();
- }
- }
+@@ -1440,8 +1440,8 @@
+ * @param user_data cast=(void *)
+ * @param destroy cast=(cairo_destroy_func_t)
+ */
-public static final native int _cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy);
-public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy) {
+public static final native int _cairo_surface_set_user_data(long /*int*/ surface, long /*int*/ key, long /*int*/ user_data, long /*int*/ destroy);
@@ -13509,10 +10037,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_surface_set_user_data(surface, key, user_data, destroy);
-@@ -1248,8 +1248,8 @@
- lock.unlock();
- }
- }
+@@ -1454,8 +1454,8 @@
+ * @param utf8 cast=(const char *)
+ * @param extents cast=(cairo_text_extents_t *)
+ */
-public static final native void _cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents);
-public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents) {
+public static final native void _cairo_text_extents(long /*int*/ cr, byte[] utf8, cairo_text_extents_t extents);
@@ -13520,10 +10048,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_text_extents(cr, utf8, extents);
-@@ -1257,8 +1257,8 @@
- lock.unlock();
- }
- }
+@@ -1467,8 +1467,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param utf8 cast=(const char *)
+ */
-public static final native void _cairo_text_path(int /*long*/ cr, byte[] utf8);
-public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {
+public static final native void _cairo_text_path(long /*int*/ cr, byte[] utf8);
@@ -13531,10 +10059,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_text_path(cr, utf8);
-@@ -1266,8 +1266,8 @@
- lock.unlock();
- }
- }
+@@ -1480,8 +1480,8 @@
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
-public static final native void _cairo_transform(int /*long*/ cr, double[] matrix);
-public static final void cairo_transform(int /*long*/ cr, double[] matrix) {
+public static final native void _cairo_transform(long /*int*/ cr, double[] matrix);
@@ -13542,10 +10070,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_transform(cr, matrix);
-@@ -1275,8 +1275,8 @@
- lock.unlock();
+@@ -1490,8 +1490,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_translate(int /*long*/ cr, double tx, double ty);
-public static final void cairo_translate(int /*long*/ cr, double tx, double ty) {
+public static final native void _cairo_translate(long /*int*/ cr, double tx, double ty);
@@ -13553,10 +10081,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_translate(cr, tx, ty);
-@@ -1284,8 +1284,8 @@
- lock.unlock();
+@@ -1500,8 +1500,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_user_to_device(int /*long*/ cr, double[] x, double[] y);
-public static final void cairo_user_to_device(int /*long*/ cr, double[] x, double[] y) {
+public static final native void _cairo_user_to_device(long /*int*/ cr, double[] x, double[] y);
@@ -13564,10 +10092,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_user_to_device(cr, x, y);
-@@ -1293,8 +1293,8 @@
- lock.unlock();
+@@ -1510,8 +1510,8 @@
}
}
+ /** @param cr cast=(cairo_t *) */
-public static final native void _cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy);
-public static final void cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy) {
+public static final native void _cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy);
@@ -13575,10 +10103,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_user_to_device_distance(cr, dx, dy);
-@@ -1303,8 +1303,8 @@
- }
- }
- public static final native int cairo_version();
+@@ -1525,8 +1525,8 @@
+ * @param drawable cast=(Drawable)
+ * @param visual cast=(Visual *)
+ */
-public static final native int /*long*/ _cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height);
-public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height) {
+public static final native long /*int*/ _cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height);
@@ -13586,10 +10114,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_xlib_surface_create(dpy, drawable, visual, width, height);
-@@ -1312,8 +1312,8 @@
- lock.unlock();
- }
- }
+@@ -1539,8 +1539,8 @@
+ * @param pixmap cast=(Pixmap)
+ * @param screen cast=(Screen *)
+ */
-public static final native int /*long*/ _cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height);
-public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height) {
+public static final native long /*int*/ _cairo_xlib_surface_create_for_bitmap(long /*int*/ dpy, long /*int*/ pixmap, long /*int*/ screen, int width, int height);
@@ -13597,10 +10125,10 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _cairo_xlib_surface_create_for_bitmap(dpy, pixmap, screen, width, height);
-@@ -1321,8 +1321,8 @@
- lock.unlock();
+@@ -1549,8 +1549,8 @@
}
}
+ /** @param surface cast=(cairo_surface_t *) */
-public static final native void _cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height);
-public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height) {
+public static final native void _cairo_xlib_surface_set_size(long /*int*/ surface, int width, int height);
@@ -13608,33 +10136,43 @@ diff -ur x86/org/eclipse/swt/internal/cairo/Cairo.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_cairo_xlib_surface_set_size(surface, width, height);
-@@ -1330,8 +1330,8 @@
- lock.unlock();
- }
- }
+@@ -1563,18 +1563,18 @@
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(cairo_path_t dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(cairo_path_data_t dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(double[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(cairo_path_t dest, long /*int*/ src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(cairo_path_data_t dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(double[] dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(double[] dest, long /*int*/ src, long /*int*/ size);
}
-diff -ur x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java
---- x86/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-02-11 17:43:48.000000000 -0500
-@@ -23,7 +23,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/cairo/cairo_path_t.java x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java
+--- x86/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-05-29 17:30:14.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/cairo/cairo_path_t.java 2009-09-17 08:48:22.000000000 -0400
+@@ -24,7 +24,7 @@
public class cairo_path_t {
public int status;
+ /** @field cast=(cairo_path_data_t *) */
- public int /*long*/ data;
+ public long /*int*/ data;
public int num_data;
public static final int sizeof = Cairo.cairo_path_t_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/internal/Callback.java
---- x86/org/eclipse/swt/internal/Callback.java 2009-06-24 21:13:52.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/Callback.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/internal/Callback.java
+--- x86/org/eclipse/swt/internal/Callback.java 2007-05-31 18:04:10.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/Callback.java 2009-09-17 08:48:24.000000000 -0400
@@ -28,7 +28,7 @@
Object object;
String method, signature;
@@ -13671,13 +10209,13 @@ diff -ur x86/org/eclipse/swt/internal/Callback.java x86_64/org/eclipse/swt/inter
return address;
}
-diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/internal/cde/CDE.java
---- x86/org/eclipse/swt/internal/cde/CDE.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cde/CDE.java 2009-02-11 17:43:48.000000000 -0500
-@@ -25,8 +25,8 @@
- public static final native int DtActionArg_sizeof();
-
- /** Natives */
+diff -urN x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/internal/cde/CDE.java
+--- x86/org/eclipse/swt/internal/cde/CDE.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/cde/CDE.java 2009-09-17 08:48:24.000000000 -0400
+@@ -33,8 +33,8 @@
+ * @param appName cast=(char *)
+ * @param appClass cast=(char *)
+ */
-public static final native boolean _DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass);
-public static final boolean DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass) {
+public static final native boolean _DtAppInitialize(long /*int*/ appContext, long /*int*/ display, long /*int*/ topWiget, byte[] appName, byte[] appClass);
@@ -13685,7 +10223,7 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _DtAppInitialize(appContext, display, topWiget, appName, appClass);
-@@ -43,8 +43,8 @@
+@@ -51,8 +51,8 @@
lock.unlock();
}
}
@@ -13696,10 +10234,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _DtDtsDataTypeNames();
-@@ -52,8 +52,8 @@
- lock.unlock();
+@@ -61,8 +61,8 @@
}
}
+ /** @param fileName cast=(char *) */
-public static final native int /*long*/ _DtDtsFileToDataType(byte[] fileName);
-public static final int /*long*/ DtDtsFileToDataType(byte[] fileName) {
+public static final native long /*int*/ _DtDtsFileToDataType(byte[] fileName);
@@ -13707,10 +10245,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _DtDtsFileToDataType(fileName);
-@@ -70,8 +70,8 @@
- lock.unlock();
- }
- }
+@@ -85,8 +85,8 @@
+ * @param attrName cast=(char *)
+ * @param optName cast=(char *)
+ */
-public static final native int /*long*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);
-public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) {
+public static final native long /*int*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);
@@ -13718,10 +10256,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _DtDtsDataTypeToAttributeValue(dataType, attrName, optName);
-@@ -79,8 +79,8 @@
- lock.unlock();
+@@ -95,8 +95,8 @@
}
}
+ /** @param dataType cast=(char *) */
-public static final native void _DtDtsFreeDataType(int /*long*/ dataType);
-public static final void DtDtsFreeDataType(int /*long*/ dataType) {
+public static final native void _DtDtsFreeDataType(long /*int*/ dataType);
@@ -13729,10 +10267,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_DtDtsFreeDataType(dataType);
-@@ -88,8 +88,8 @@
- lock.unlock();
+@@ -105,8 +105,8 @@
}
}
+ /** @param dataTypeList cast=(char **) */
-public static final native void _DtDtsFreeDataTypeNames(int /*long*/ dataTypeList);
-public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {
+public static final native void _DtDtsFreeDataTypeNames(long /*int*/ dataTypeList);
@@ -13740,10 +10278,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_DtDtsFreeDataTypeNames(dataTypeList);
-@@ -97,8 +97,8 @@
- lock.unlock();
+@@ -115,8 +115,8 @@
}
}
+ /** @param attrValue cast=(char *) */
-public static final native void _DtDtsFreeAttributeValue(int /*long*/ attrValue);
-public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {
+public static final native void _DtDtsFreeAttributeValue(long /*int*/ attrValue);
@@ -13751,10 +10289,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_DtDtsFreeAttributeValue(attrValue);
-@@ -106,8 +106,8 @@
- lock.unlock();
- }
- }
+@@ -133,8 +133,8 @@
+ * @param callback cast=(DtActionCallbackProc)
+ * @param clientData cast=(XtPointer)
+ */
-public static final native long _DtActionInvoke(int /*long*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, int /*long*/ callback, int /*long*/ clientData);
-public static final long DtActionInvoke(int /*long*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, int /*long*/ callback, int /*long*/ clientData) {
+public static final native long _DtActionInvoke(long /*int*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, long /*int*/ callback, long /*int*/ clientData);
@@ -13762,10 +10300,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _DtActionInvoke(topWidget, action, args, argCount, termOpts, execHost, contextDir, useIndicator, callback, clientData);
-@@ -115,8 +115,8 @@
- lock.unlock();
+@@ -143,8 +143,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _topLevelShellWidgetClass();
-public static final int /*long*/ topLevelShellWidgetClass() {
+public static final native long /*int*/ _topLevelShellWidgetClass();
@@ -13773,10 +10311,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _topLevelShellWidgetClass();
-@@ -124,8 +124,8 @@
- lock.unlock();
- }
- }
+@@ -159,8 +159,8 @@
+ * @param display cast=(Display *)
+ * @param argList cast=(ArgList)
+ */
-public static final native int /*long*/ _XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount);
-public static final int /*long*/ XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount) {
+public static final native long /*int*/ _XtAppCreateShell(byte[] appName, byte[] appClass, long /*int*/ widgetClass, long /*int*/ display, long /*int*/ [] argList, int argCount);
@@ -13784,7 +10322,7 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XtAppCreateShell(appName, appClass, widgetClass, display, argList, argCount);
-@@ -133,8 +133,8 @@
+@@ -168,8 +168,8 @@
lock.unlock();
}
}
@@ -13795,10 +10333,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
return _XtCreateApplicationContext();
-@@ -142,8 +142,8 @@
- lock.unlock();
- }
- }
+@@ -187,8 +187,8 @@
+ * @param argc cast=(int *)
+ * @param argv cast=(String *)
+ */
-public static final native void _XtDisplayInitialize(int /*long*/ app_context, int /*long*/ display, byte[] appName, byte[] appClass, int /*long*/ options, int num_options, int /*long*/ [] argc, int argv);
-public static final void XtDisplayInitialize(int /*long*/ appContext, int /*long*/ display, byte[] appName, byte[] appClass, int /*long*/ options, int num_options, int /*long*/ [] argc, int argv) {
+public static final native void _XtDisplayInitialize(long /*int*/ app_context, long /*int*/ display, byte[] appName, byte[] appClass, long /*int*/ options, int num_options, long /*int*/ [] argc, int argv);
@@ -13806,10 +10344,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XtDisplayInitialize(appContext, display, appName, appClass, options, num_options, argc, argv);
-@@ -151,8 +151,8 @@
- lock.unlock();
+@@ -197,8 +197,8 @@
}
}
+ /** @param widget cast=(Widget) */
-public static final native void _XtRealizeWidget(int /*long*/ widget);
-public static final void XtRealizeWidget(int /*long*/ widget) {
+public static final native void _XtRealizeWidget(long /*int*/ widget);
@@ -13817,10 +10355,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XtRealizeWidget(widget);
-@@ -160,8 +160,8 @@
- lock.unlock();
+@@ -207,8 +207,8 @@
}
}
+ /** @param widget cast=(Widget) */
-public static final native void _XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth);
-public static final void XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth) {
+public static final native void _XtResizeWidget(long /*int*/ widget, int width, int height, int borderWidth);
@@ -13828,10 +10366,10 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XtResizeWidget(widget, width, height, borderWidth);
-@@ -169,8 +169,8 @@
- lock.unlock();
+@@ -217,8 +217,8 @@
}
}
+ /** @param widget cast=(Widget) */
-public static final native void _XtSetMappedWhenManaged(int /*long*/ widget, boolean flag);
-public static final void XtSetMappedWhenManaged(int /*long*/ widget, boolean flag) {
+public static final native void _XtSetMappedWhenManaged(long /*int*/ widget, boolean flag);
@@ -13839,73 +10377,164 @@ diff -ur x86/org/eclipse/swt/internal/cde/CDE.java x86_64/org/eclipse/swt/intern
lock.lock();
try {
_XtSetMappedWhenManaged(widget, flag);
-diff -ur x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/swt/internal/cde/DtActionArg.java
---- x86/org/eclipse/swt/internal/cde/DtActionArg.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/cde/DtActionArg.java 2009-02-11 17:43:48.000000000 -0500
-@@ -13,6 +13,6 @@
-
+diff -urN x86/org/eclipse/swt/internal/cde/DtActionArg.java x86_64/org/eclipse/swt/internal/cde/DtActionArg.java
+--- x86/org/eclipse/swt/internal/cde/DtActionArg.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/cde/DtActionArg.java 2009-09-17 08:48:24.000000000 -0400
+@@ -14,6 +14,6 @@
public class DtActionArg {
public int argClass;
+ /** @field accessor=u.file.name,cast=(char *) */
- public int /*long*/ name;
+ public long /*int*/ name;
public static final int sizeof = CDE.DtActionArg_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/C.java x86_64/org/eclipse/swt/internal/C.java
---- x86/org/eclipse/swt/internal/C.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/C.java 2009-02-11 17:43:48.000000000 -0500
-@@ -23,27 +23,27 @@
-
+diff -urN x86/org/eclipse/swt/internal/C.java x86_64/org/eclipse/swt/internal/C.java
+--- x86/org/eclipse/swt/internal/C.java 2009-05-29 17:30:14.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/C.java 2009-09-17 08:48:24.000000000 -0400
+@@ -24,118 +24,118 @@
public static final int PTR_SIZEOF = PTR_sizeof ();
+ /** @param ptr cast=(void *) */
-public static final native void free (int /*long*/ ptr);
--public static final native int /*long*/ getenv (byte[] wcsToMbcs);
--public static final native int /*long*/ malloc (int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, byte[] src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, char[] src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, double[] src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, float[] src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, int[] src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, long[] src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, short[] src, int /*long*/ size);
--public static final native void memmove (byte[] dest, char[] src, int /*long*/ size);
--public static final native void memmove (byte[] dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (char[] dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (double[] dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (float[] dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (int[] dest, byte[] src, int /*long*/ size);
--public static final native void memmove (short[] dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (int[] dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove (long[] dest, int /*long*/ src, int /*long*/ size);
--public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);
+public static final native void free (long /*int*/ ptr);
-+public static final native long /*int*/ getenv (byte[] wcsToMbcs);
+ /** @param env cast=(const char *) */
+-public static final native int /*long*/ getenv (byte[] env);
+-public static final native int /*long*/ malloc (int /*long*/ size);
++public static final native long /*int*/ getenv (byte[] env);
+public static final native long /*int*/ malloc (long /*int*/ 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 (int /*long*/ dest, byte[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, byte[] src, long /*int*/ 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 (int /*long*/ dest, char[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, char[] src, long /*int*/ 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 (int /*long*/ dest, double[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, double[] src, long /*int*/ 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 (int /*long*/ dest, float[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, float[] src, long /*int*/ 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 (int /*long*/ dest, int[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, int[] src, long /*int*/ 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 (int /*long*/ dest, long[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, long[] src, long /*int*/ 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 (int /*long*/ dest, short[] src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, short[] src, long /*int*/ 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, int /*long*/ size);
+public static final native void memmove (byte[] dest, char[] src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (byte[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (long /*int*/ dest, long /*int*/ src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (char[] dest, long /*int*/ src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (double[] dest, long /*int*/ src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (float[] dest, long /*int*/ src, long /*int*/ 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, int /*long*/ size);
+public static final native void memmove (int[] dest, byte[] src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (short[] dest, long /*int*/ src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (int[] dest, long /*int*/ src, long /*int*/ 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, int /*long*/ src, int /*long*/ size);
+public static final native void memmove (long[] dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param buffer cast=(void *),flags=critical
+ * @param num cast=(size_t)
+ */
+-public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);
+public static final native long /*int*/ memset (long /*int*/ buffer, int c, long /*int*/ num);
public static final native int PTR_sizeof ();
+ /** @param s cast=(char *) */
-public static final native int strlen (int /*long*/ s);
+public static final native int strlen (long /*int*/ s);
}
-diff -ur x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/internal/Converter.java
---- x86/org/eclipse/swt/internal/Converter.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/Converter.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/internal/Converter.java
+--- x86/org/eclipse/swt/internal/Converter.java 2009-05-29 17:30:22.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/Converter.java 2009-09-17 08:48:24.000000000 -0400
@@ -37,8 +37,8 @@
}
@@ -13932,13 +10561,13 @@ diff -ur x86/org/eclipse/swt/internal/Converter.java x86_64/org/eclipse/swt/inte
if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray;
int written = (int)/*64*/items_written [0];
byte [] bytes = new byte [written + (terminate ? 1 : 0)];
-diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/internal/gnome/GNOME.java
---- x86/org/eclipse/swt/internal/gnome/GNOME.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gnome/GNOME.java 2009-02-11 17:43:48.000000000 -0500
-@@ -34,8 +34,8 @@
- public static final native int GnomeVFSMimeApplication_sizeof();
-
+diff -urN x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/internal/gnome/GNOME.java
+--- x86/org/eclipse/swt/internal/gnome/GNOME.java 2009-05-29 17:30:16.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gnome/GNOME.java 2009-09-17 08:48:24.000000000 -0400
+@@ -36,8 +36,8 @@
/** Natives */
+
+ /** @param mem cast=(gpointer) */
-public static final native void _g_free(int /*long*/ mem);
-public static final void g_free(int /*long*/ mem) {
+public static final native void _g_free(long /*int*/ mem);
@@ -13946,10 +10575,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_g_free(mem);
-@@ -43,8 +43,8 @@
- lock.unlock();
- }
- }
+@@ -49,8 +49,8 @@
+ * @param list cast=(GList *)
+ * @param data cast=(gpointer)
+ */
-public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);
-public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {
+public static final native long /*int*/ _g_list_append(long /*int*/ list, long /*int*/ data);
@@ -13957,10 +10586,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _g_list_append(list, data);
-@@ -52,8 +52,8 @@
- lock.unlock();
+@@ -59,8 +59,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native void _g_list_free(int /*long*/ list);
-public static final void g_list_free(int /*long*/ list) {
+public static final native void _g_list_free(long /*int*/ list);
@@ -13968,7 +10597,7 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_g_list_free(list);
-@@ -61,8 +61,8 @@
+@@ -68,8 +68,8 @@
lock.unlock();
}
}
@@ -13979,10 +10608,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _g_list_next(list);
-@@ -70,8 +70,8 @@
- lock.unlock();
+@@ -78,8 +78,8 @@
}
}
+ /** @param object cast=(gpointer) */
-public static final native void _g_object_unref(int /*long*/ object);
-public static final void g_object_unref(int /*long*/ object) {
+public static final native void _g_object_unref(long /*int*/ object);
@@ -13990,10 +10619,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_g_object_unref(object);
-@@ -79,8 +79,8 @@
- lock.unlock();
- }
- }
+@@ -97,8 +97,8 @@
+ * @param flags cast=(GnomeIconLookupFlags)
+ * @param result cast=(GnomeIconLookupResultFlags *)
+ */
-public static final native int /*long*/ _gnome_icon_lookup(int /*long*/ icon_theme, int /*long*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, int /*long*/ file_info, byte[] mime_type, int flags, int[] result);
-public static final int /*long*/ gnome_icon_lookup(int /*long*/ icon_theme, int /*long*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, int /*long*/ file_info, byte[] mime_type, int flags, int[] result) {
+public static final native long /*int*/ _gnome_icon_lookup(long /*int*/ icon_theme, long /*int*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, long /*int*/ file_info, byte[] mime_type, int flags, int[] result);
@@ -14001,10 +10630,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_icon_lookup(icon_theme, thumbnail_factory, file_uri, custom_icon, file_info, mime_type, flags, result);
-@@ -88,8 +88,8 @@
- lock.unlock();
- }
- }
+@@ -111,8 +111,8 @@
+ * @param icon_name cast=(const char *)
+ * @param icon_data cast=(const GnomeIconData **)
+ */
-public static final native int /*long*/ _gnome_icon_theme_lookup_icon(int /*long*/ theme, int /*long*/ icon_name, int size, int /*long*/[] icon_data, int[] base_size);
-public static final int /*long*/ gnome_icon_theme_lookup_icon(int /*long*/ theme, int /*long*/ icon_name, int size, int /*long*/[] icon_data, int[] base_size) {
+public static final native long /*int*/ _gnome_icon_theme_lookup_icon(long /*int*/ theme, long /*int*/ icon_name, int size, long /*int*/[] icon_data, int[] base_size);
@@ -14012,7 +10641,7 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_icon_theme_lookup_icon(theme, icon_name, size, icon_data, base_size);
-@@ -97,8 +97,8 @@
+@@ -120,8 +120,8 @@
lock.unlock();
}
}
@@ -14023,7 +10652,7 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_icon_theme_new();
-@@ -106,8 +106,8 @@
+@@ -129,8 +129,8 @@
lock.unlock();
}
}
@@ -14034,10 +10663,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_get_registered_mime_types();
-@@ -124,8 +124,8 @@
- lock.unlock();
+@@ -148,8 +148,8 @@
}
}
+ /** @param uri cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_make_uri_from_input(byte[] uri);
-public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {
+public static final native long /*int*/ _gnome_vfs_make_uri_from_input(byte[] uri);
@@ -14045,10 +10674,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_make_uri_from_input(uri);
-@@ -133,8 +133,8 @@
- lock.unlock();
- }
- }
+@@ -161,8 +161,8 @@
+ * @method flags=dynamic
+ * @param uri cast=(const char *)
+ */
-public static final native int /*long*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);
-public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) {
+public static final native long /*int*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);
@@ -14056,10 +10685,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_make_uri_from_input_with_dirs(uri, dirs);
-@@ -142,8 +142,8 @@
- lock.unlock();
+@@ -171,8 +171,8 @@
}
}
+ /** @param application cast=(GnomeVFSMimeApplication *) */
-public static final native void _gnome_vfs_mime_application_free(int /*long*/ application);
-public static final void gnome_vfs_mime_application_free(int /*long*/ application) {
+public static final native void _gnome_vfs_mime_application_free(long /*int*/ application);
@@ -14067,10 +10696,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_gnome_vfs_mime_application_free(application);
-@@ -151,8 +151,8 @@
- lock.unlock();
- }
- }
+@@ -185,8 +185,8 @@
+ * @param application cast=(GnomeVFSMimeApplication *)
+ * @param uris cast=(GList *)
+ */
-public static final native int _gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris);
-public static final int gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris) {
+public static final native int _gnome_vfs_mime_application_launch(long /*int*/ application, long /*int*/ uris);
@@ -14078,10 +10707,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_mime_application_launch(application, uris);
-@@ -160,8 +160,8 @@
- lock.unlock();
+@@ -195,8 +195,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native void _gnome_vfs_mime_extensions_list_free(int /*long*/ list);
-public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list) {
+public static final native void _gnome_vfs_mime_extensions_list_free(long /*int*/ list);
@@ -14089,10 +10718,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_gnome_vfs_mime_extensions_list_free(list);
-@@ -169,8 +169,8 @@
- lock.unlock();
+@@ -205,8 +205,8 @@
}
}
+ /** @param mimeType cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);
-public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {
+public static final native long /*int*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);
@@ -14100,10 +10729,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_mime_get_default_application(mimeType);
-@@ -178,8 +178,8 @@
- lock.unlock();
+@@ -215,8 +215,8 @@
}
}
+ /** @param mime_type cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type);
-public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type) {
+public static final native long /*int*/ _gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type);
@@ -14111,10 +10740,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_mime_get_extensions_list(mime_type);
-@@ -187,8 +187,8 @@
- lock.unlock();
+@@ -225,8 +225,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native void _gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list);
-public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list) {
+public static final native void _gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list);
@@ -14122,10 +10751,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
_gnome_vfs_mime_registered_mime_type_list_free(list);
-@@ -196,8 +196,8 @@
- lock.unlock();
+@@ -235,8 +235,8 @@
}
}
+ /** @param file cast=(const char *) */
-public static final native int /*long*/ _gnome_vfs_mime_type_from_name(byte[] file);
-public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {
+public static final native long /*int*/ _gnome_vfs_mime_type_from_name(byte[] file);
@@ -14133,10 +10762,10 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_mime_type_from_name(file);
-@@ -205,8 +205,8 @@
- lock.unlock();
- }
- }
+@@ -248,8 +248,8 @@
+ * @method flags=dynamic
+ * @param url cast=(const char *)
+ */
-public static final native int _gnome_vfs_url_show(int /*long*/ url);
-public static final int gnome_vfs_url_show(int /*long*/ url) {
+public static final native int _gnome_vfs_url_show(long /*int*/ url);
@@ -14144,265 +10773,298 @@ diff -ur x86/org/eclipse/swt/internal/gnome/GNOME.java x86_64/org/eclipse/swt/in
lock.lock();
try {
return _gnome_vfs_url_show(url);
-@@ -214,5 +214,5 @@
- lock.unlock();
- }
- }
+@@ -262,5 +262,5 @@
+ * @param src cast=(const void *)
+ * @param count cast=(size_t)
+ */
-public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count);
+public static final native void memmove (GnomeVFSMimeApplication dest, long /*int*/ src, long /*int*/ count);
}
-diff -ur x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
---- x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,12 +16,12 @@
-
+diff -urN x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+--- x86/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-05-29 17:30:16.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,17 +17,17 @@
public class GnomeVFSMimeApplication {
+ /** @field cast=(char *) */
- public int /*long*/ id;
-- public int /*long*/ name;
-- public int /*long*/ command;
+ public long /*int*/ id;
+ /** @field cast=(char *) */
+- public int /*long*/ name;
+ public long /*int*/ name;
+ /** @field cast=(char *) */
+- public int /*long*/ command;
+ public long /*int*/ command;
+ /** @field cast=(gboolean) */
public boolean can_open_multiple_files;
+ /** @field cast=(GnomeVFSMimeApplicationArgumentType) */
public int expects_uris;
+ /** @field cast=(GList *) */
- public int /*long*/ supported_uri_schemes;
+ public long /*int*/ supported_uri_schemes;
+ /** @field cast=(gboolean) */
public boolean requires_terminal;
public static final int sizeof = GNOME.GnomeVFSMimeApplication_sizeof();
- }
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java
---- x86/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-02-11 17:43:48.000000000 -0500
-@@ -18,9 +18,9 @@
- public class GdkDragContext {
- public int protocol;
- public boolean is_source;
-- public int /*long*/ source_window;
-- public int /*long*/ dest_window;
-- public int /*long*/ targets;
-+ public long /*int*/ source_window;
-+ public long /*int*/ dest_window;
-+ public long /*int*/ targets;
- public int actions;
- public int suggested_action;
- public int action;
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkDragContext.java x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java
+--- x86/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkDragContext.java 2009-09-17 08:48:24.000000000 -0400
+@@ -21,11 +21,11 @@
+ /** @field cast=(gboolean) */
+ public boolean is_source;
+ /** @field cast=(GdkWindow *) */
+- public int /*long*/ source_window;
++ public long /*int*/ source_window;
+ /** @field cast=(GdkWindow *) */
+- public int /*long*/ dest_window;
++ public long /*int*/ dest_window;
+ /** @field cast=(GList *) */
+- public int /*long*/ targets;
++ public long /*int*/ targets;
+ /** @field cast=(GdkDragAction) */
+ public int actions;
+ /** @field cast=(GdkDragAction) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventAny.java x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventAny.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventAny extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
public static final int sizeof = OS.GdkEventAny_sizeof();
- }
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,15 +16,15 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventButton.java x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventButton.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventButton extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public int time;
- public double x;
+ /** @field cast=(guint32) */
+@@ -27,13 +27,13 @@
+ /** @field cast=(gdouble) */
public double y;
+ /** @field cast=(gdouble *) */
- public int /*long*/ axes;
+ public long /*int*/ axes;
+ /** @field cast=(guint) */
public int state;
+ /** @field cast=(guint) */
public int button;
+ /** @field cast=(GdkDevice *) */
- public int /*long*/ device;
+ public long /*int*/ device;
+ /** @field cast=(gdouble) */
public double x_root;
- public double y_root;
- public static final int sizeof = OS.GdkEventButton_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,9 +16,9 @@
-
+ /** @field cast=(gdouble) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventCrossing.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,11 +17,11 @@
public class GdkEventCrossing extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ subwindow;
+ public long /*int*/ subwindow;
public int time;
public double x;
public double y;
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,13 +16,13 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventExpose.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventExpose extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public int area_x;
- public int area_y;
- public int area_width;
+ /** @field accessor=area.x */
+@@ -29,7 +29,7 @@
+ /** @field accessor=area.height */
public int area_height;
+ /** @field cast=(GdkRegion *) */
- public int /*long*/ region;
+ public long /*int*/ region;
+ /** @field cast=(gint) */
public int count;
public static final int sizeof = OS.GdkEventExpose_sizeof();
- }
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventFocus.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventFocus extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public short in;
- public static final int sizeof = OS.GdkEventFocus_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,13 +16,13 @@
-
+ /** @field cast=(gint16) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventKey.java x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventKey.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventKey extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public int time;
- public int state;
- public int keyval;
+ /** @field cast=(guint32) */
+@@ -29,7 +29,7 @@
+ /** @field cast=(gint) */
public int length;
+ /** @field cast=(gchar *) */
- public int /*long*/ string;
+ public long /*int*/ string;
+ /** @field cast=(guint16) */
public short hardware_keycode;
- public byte group;
- public static final int sizeof = OS.GdkEventKey_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,15 +16,15 @@
-
+ /** @field cast=(guint8) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventMotion.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventMotion extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public int time;
- public double x;
+ /** @field cast=(guint32) */
+@@ -27,13 +27,13 @@
+ /** @field cast=(gdouble) */
public double y;
+ /** @field cast=(gdouble *) */
- public int /*long*/ axes;
+ public long /*int*/ axes;
+ /** @field cast=(guint) */
public int state;
+ /** @field cast=(gint16) */
public short is_hint;
+ /** @field cast=(GdkDevice *) */
- public int /*long*/ device;
+ public long /*int*/ device;
+ /** @field cast=(gdouble) */
public double x_root;
- public double y_root;
- public static final int sizeof = OS.GdkEventMotion_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,14 +16,14 @@
-
+ /** @field cast=(gdouble) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventScroll.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventScroll extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public int time;
- public double x;
- public double y;
- public int state;
+ /** @field cast=(guint32) */
+@@ -31,7 +31,7 @@
+ /** @field cast=(GdkScrollDirection) */
public int direction;
+ /** @field cast=(GdkDevice *) */
- public int /*long*/ device;
+ public long /*int*/ device;
+ /** @field cast=(gdouble) */
public double x_root;
- public double y_root;
- public static final int sizeof = OS.GdkEventScroll_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+ /** @field cast=(gdouble) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventVisibility.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventVisibility extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
- public int state;
- public static final int sizeof = OS.GdkEventVisibility_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
---- x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+ /** @field cast=(GdkVisibilityState) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+--- x86/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkEventWindowState.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GdkEventWindowState extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
- public int /*long*/ window;
+ public long /*int*/ window;
public byte send_event;
public int changed_mask;
public int new_window_state;
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java
---- x86/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-02-11 17:43:48.000000000 -0500
-@@ -24,12 +24,12 @@
- public short background_red;
- public short background_green;
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkGCValues.java x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java
+--- x86/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkGCValues.java 2009-09-17 08:48:24.000000000 -0400
+@@ -33,17 +33,17 @@
+ /** @field accessor=background.blue,cast=(guint16) */
public short background_blue;
+ /** @field cast=(GdkFont *) */
- public int /*long*/ font;
-- public int /*long*/ function;
+ public long /*int*/ font;
+ /** @field cast=(GdkFunction) */
+- public int /*long*/ function;
+ public long /*int*/ function;
+ /** @field cast=(GdkFill) */
public int fill;
+ /** @field cast=(GdkPixmap *) */
- public int /*long*/ tile;
-- public int /*long*/ stipple;
-- public int /*long*/ clip_mask;
+ public long /*int*/ tile;
+ /** @field cast=(GdkPixmap *) */
+- public int /*long*/ stipple;
+ public long /*int*/ stipple;
+ /** @field cast=(GdkPixmap *) */
+- public int /*long*/ clip_mask;
+ public long /*int*/ clip_mask;
+ /** @field cast=(GdkSubwindowMode) */
public int subwindow_mode;
- public int ts_x_origin;
- public int ts_y_origin;
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/internal/gtk/GdkImage.java
---- x86/org/eclipse/swt/internal/gtk/GdkImage.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkImage.java 2009-02-11 17:43:48.000000000 -0500
-@@ -17,7 +17,7 @@
-
- public class GdkImage {
+ /** @field cast=(gint) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkImage.java x86_64/org/eclipse/swt/internal/gtk/GdkImage.java
+--- x86/org/eclipse/swt/internal/gtk/GdkImage.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkImage.java 2009-09-17 08:48:24.000000000 -0400
+@@ -19,7 +19,7 @@
+ /** @field cast=(GdkImageType) */
public int type;
+ /** @field cast=(GdkVisual *) */
- public int /*long*/ visual;
+ public long /*int*/ visual;
+ /** @field cast=(GdkByteOrder) */
public int byte_order;
- public int width;
- public int height;
-@@ -25,7 +25,7 @@
- public short bpp;
- public short bpl;
+ /** @field cast=(gint) */
+@@ -35,9 +35,9 @@
+ /** @field cast=(guint16) */
public short bits_per_pixel;
+ /** @field cast=(gpointer) */
- public int /*long*/ mem;
-- public int /*long*/ colormap;
-- public int /*long*/ windowing_data;
+ public long /*int*/ mem;
+ /** @field cast=(GdkColormap *) */
+- public int /*long*/ colormap;
+ public long /*int*/ colormap;
+ /** @field cast=(gpointer) */
+- public int /*long*/ windowing_data;
+ public long /*int*/ windowing_data;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
---- x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,18 +16,18 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+--- x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GdkWindowAttr.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,23 +17,23 @@
public class GdkWindowAttr {
+ /** @field cast=(gchar *) */
- public int /*long*/ title;
+ public long /*int*/ title;
public int event_mask;
@@ -14410,432 +11072,587 @@ diff -ur x86/org/eclipse/swt/internal/gtk/GdkWindowAttr.java x86_64/org/eclipse/
public int width;
public int height;
public int wclass;
+ /** @field cast=(GdkVisual *) */
- public int /*long*/ visual;
-- public int /*long*/ colormap;
+ public long /*int*/ visual;
+ /** @field cast=(GdkColormap *) */
+- public int /*long*/ colormap;
+ public long /*int*/ colormap;
public int window_type;
+ /** @field cast=(GdkCursor *) */
- public int /*long*/ cursor;
-- public int /*long*/ wmclass_name;
-- public int /*long*/ wmclass_class;
+ public long /*int*/ cursor;
+ /** @field cast=(gchar *) */
+- public int /*long*/ wmclass_name;
+ public long /*int*/ wmclass_name;
+ /** @field cast=(gchar *) */
+- public int /*long*/ wmclass_class;
+ public long /*int*/ wmclass_class;
public boolean override_redirect;
public static final int sizeof = OS.GdkWindowAttr_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
---- x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,8 +16,8 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+--- x86/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GInterfaceInfo.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,10 +17,10 @@
public class GInterfaceInfo {
+ /** @field cast=(GInterfaceInitFunc) */
- public int /*long*/ interface_init;
-- public int /*long*/ interface_finalize;
-- public int /*long*/ interface_data;
+ public long /*int*/ interface_init;
+ /** @field cast=(GInterfaceFinalizeFunc) */
+- public int /*long*/ interface_finalize;
+ public long /*int*/ interface_finalize;
+ /** @field cast=(gpointer) */
+- public int /*long*/ interface_data;
+ public long /*int*/ interface_data;
public static final int sizeof = OS.GInterfaceInfo_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GObjectClass.java x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java
---- x86/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,11 +16,11 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GObjectClass.java x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java
+--- x86/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GObjectClass.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,17 +17,17 @@
public class GObjectClass {
+ /** @field cast=(GObject *(*)()) */
- public int /*long*/ constructor;
-- public int /*long*/ set_property;
-- public int /*long*/ get_property;
-- public int /*long*/ dispose;
-- public int /*long*/ finalize;
-- public int /*long*/ dispatch_properties_changed;
-- public int /*long*/ notify;
+ public long /*int*/ constructor;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ set_property;
+ public long /*int*/ set_property;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ get_property;
+ public long /*int*/ get_property;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ dispose;
+ public long /*int*/ dispose;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ finalize;
+ public long /*int*/ finalize;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ dispatch_properties_changed;
+ public long /*int*/ dispatch_properties_changed;
+ /** @field cast=(void (*)()) */
+- public int /*long*/ notify;
+ public long /*int*/ notify;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
---- x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,6 +16,6 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+--- x86/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GtkCellRendererClass {
+ /** @field cast=(void(*)()) */
- public int /*long*/ render;
-- public int /*long*/ get_size;
+ public long /*int*/ render;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ get_size;
+ public long /*int*/ get_size;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
---- x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,8 +16,8 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+--- x86/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,11 +17,11 @@
public class GtkColorSelectionDialog {
+ /** @field cast=(GtkWidget *) */
- public int /*long*/ colorsel;
-- public int /*long*/ ok_button;
-- public int /*long*/ cancel_button;
-- public int /*long*/ help_button;
+ public long /*int*/ colorsel;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ ok_button;
+ public long /*int*/ ok_button;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ cancel_button;
+ public long /*int*/ cancel_button;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ help_button;
+ public long /*int*/ help_button;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java
---- x86/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,6 +16,6 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkCombo.java x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java
+--- x86/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkCombo.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GtkCombo {
+ /** @field cast=(GtkWidget *) */
- public int /*long*/ entry;
-- public int /*long*/ list;
+ public long /*int*/ entry;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ list;
+ public long /*int*/ list;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java
---- x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,24 +16,24 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java
+--- x86/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkFileSelection.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,43 +17,43 @@
public class GtkFileSelection {
+ /** @field cast=(GtkWidget *) */
- public int /*long*/ dir_list;
-- public int /*long*/ file_list;
-- public int /*long*/ selection_entry;
-- public int /*long*/ selection_text;
-- public int /*long*/ main_vbox;
-- public int /*long*/ ok_button;
-- public int /*long*/ cancel_button;
-- public int /*long*/ help_button;
-- public int /*long*/ history_pulldown;
-- public int /*long*/ history_menu;
-- public int /*long*/ history_list;
-- public int /*long*/ fileop_dialog;
-- public int /*long*/ fileop_entry;
-- public int /*long*/ fileop_file;
-- public int /*long*/ cmpl_state; // gpointer
-- public int /*long*/ fileop_c_dir;
-- public int /*long*/ fileop_del_file;
-- public int /*long*/ fileop_ren_file;
-- public int /*long*/ button_area;
-- public int /*long*/ action_area;
+ public long /*int*/ dir_list;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ file_list;
+ public long /*int*/ file_list;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ selection_entry;
+ public long /*int*/ selection_entry;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ selection_text;
+ public long /*int*/ selection_text;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ main_vbox;
+ public long /*int*/ main_vbox;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ ok_button;
+ public long /*int*/ ok_button;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ cancel_button;
+ public long /*int*/ cancel_button;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ help_button;
+ public long /*int*/ help_button;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ history_pulldown;
+ public long /*int*/ history_pulldown;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ history_menu;
+ public long /*int*/ history_menu;
+ /** @field cast=(GList *) */
+- public int /*long*/ history_list;
+ public long /*int*/ history_list;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ fileop_dialog;
+ public long /*int*/ fileop_dialog;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ fileop_entry;
+ public long /*int*/ fileop_entry;
+ /** @field cast=(gchar *) */
+- public int /*long*/ fileop_file;
+ public long /*int*/ fileop_file;
+ /** @field cast=(gpointer) */
+- public int /*long*/ cmpl_state; // gpointer
+ public long /*int*/ cmpl_state; // gpointer
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ fileop_c_dir;
+ public long /*int*/ fileop_c_dir;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ fileop_del_file;
+ public long /*int*/ fileop_del_file;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ fileop_ren_file;
+ public long /*int*/ fileop_ren_file;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ button_area;
+ public long /*int*/ button_area;
+ /** @field cast=(GtkWidget *) */
+- public int /*long*/ action_area;
+ public long /*int*/ action_area;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkFixed.java x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java
---- x86/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,5 +16,5 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkFixed.java x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java
+--- x86/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-05-29 17:30:10.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkFixed.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,5 +17,5 @@
public class GtkFixed {
+ /** @field cast=(GList *) */
- public int /*long*/ children;
+ public long /*int*/ children;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java
---- x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,11 +16,11 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+--- x86/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkSelectionData.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,15 +17,15 @@
public class GtkSelectionData {
+ /** @field cast=(GdkAtom) */
- public int /*long*/ selection;
-- public int /*long*/ target;
-- public int /*long*/ type;
+ public long /*int*/ selection;
+ /** @field cast=(GdkAtom) */
+- public int /*long*/ target;
+ public long /*int*/ target;
+ /** @field cast=(GdkAtom) */
+- public int /*long*/ type;
+ public long /*int*/ type;
+ /** @field cast=(gint) */
public int format;
+ /** @field cast=(guchar *) */
- public int /*long*/ data;
+ public long /*int*/ data;
+ /** @field cast=(gint) */
public int length;
public static final int sizeof = OS.GtkSelectionData_sizeof();
- }
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
---- x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+--- x86/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetEntry.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GtkTargetEntry {
+ /** @field cast=(gchar *) */
- public int /*long*/ target;
+ public long /*int*/ target;
+ /** @field cast=(guint) */
public int flags;
- public int info;
- public static final int sizeof = OS.GtkTargetEntry_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java
---- x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+ /** @field cast=(guint) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+--- x86/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-05-29 17:30:10.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkTargetPair.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class GtkTargetPair {
+ /** @field cast=(GdkAtom) */
- public int /*long*/ target;
+ public long /*int*/ target;
+ /** @field cast=(guint) */
public int flags;
- public int info;
- public static final int sizeof = OS.GtkTargetPair_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
---- x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-02-11 17:43:48.000000000 -0500
-@@ -18,66 +18,66 @@
- public class GtkWidgetClass extends GObjectClass {
+ /** @field cast=(guint) */
+diff -urN x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+--- x86/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GtkWidgetClass.java 2009-09-17 08:48:24.000000000 -0400
+@@ -19,127 +19,127 @@
public int activate_signal;
public int set_scroll_adjustments_signal;
+ /** @field cast=(void(*)()) */
- public int /*long*/ dispatch_child_properties_changed;
-- public int /*long*/ show;
-- public int /*long*/ show_all;
-- public int /*long*/ hide;
-- public int /*long*/ hide_all;
-- public int /*long*/ map;
-- public int /*long*/ unmap;
-- public int /*long*/ realize;
-- public int /*long*/ unrealize;
-- public int /*long*/ size_request;
-- public int /*long*/ size_allocate;
-- public int /*long*/ state_changed;
-- public int /*long*/ parent_set;
-- public int /*long*/ hierarchy_changed;
-- public int /*long*/ style_set;
-- public int /*long*/ direction_changed;
-- public int /*long*/ grab_notify;
-- public int /*long*/ child_notify;
-- public int /*long*/ mnemonic_activate;
-- public int /*long*/ grab_focus;
-- public int /*long*/ focus;
-- public int /*long*/ event;
-- public int /*long*/ button_press_event;
-- public int /*long*/ button_release_event;
-- public int /*long*/ scroll_event;
-- public int /*long*/ motion_notify_event;
-- public int /*long*/ delete_event;
-- public int /*long*/ destroy_event;
-- public int /*long*/ expose_event;
-- public int /*long*/ key_press_event;
-- public int /*long*/ key_release_event;
-- public int /*long*/ enter_notify_event;
-- public int /*long*/ leave_notify_event;
-- public int /*long*/ configure_event;
-- public int /*long*/ focus_in_event;
-- public int /*long*/ focus_out_event;
-- public int /*long*/ map_event;
-- public int /*long*/ unmap_event;
-- public int /*long*/ property_notify_event;
-- public int /*long*/ selection_clear_event;
-- public int /*long*/ selection_request_event;
-- public int /*long*/ selection_notify_event;
-- public int /*long*/ proximity_in_event;
-- public int /*long*/ proximity_out_event;
-- public int /*long*/ visibility_notify_event;
-- public int /*long*/ client_event;
-- public int /*long*/ no_expose_event;
-- public int /*long*/ window_state_event;
-- public int /*long*/ selection_get;
-- public int /*long*/ selection_received;
-- public int /*long*/ drag_begin;
-- public int /*long*/ drag_end;
-- public int /*long*/ drag_data_get;
-- public int /*long*/ drag_data_delete;
-- public int /*long*/ drag_leave;
-- public int /*long*/ drag_motion;
-- public int /*long*/ drag_drop;
-- public int /*long*/ drag_data_received;
-- public int /*long*/ popup_menu;
-- public int /*long*/ show_help;
-- public int /*long*/ get_accessible;
-- public int /*long*/ screen_changed;
+ public long /*int*/ dispatch_child_properties_changed;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ show;
+ public long /*int*/ show;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ show_all;
+ public long /*int*/ show_all;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ hide;
+ public long /*int*/ hide;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ hide_all;
+ public long /*int*/ hide_all;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ map;
+ public long /*int*/ map;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ unmap;
+ public long /*int*/ unmap;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ realize;
+ public long /*int*/ realize;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ unrealize;
+ public long /*int*/ unrealize;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ size_request;
+ public long /*int*/ size_request;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ size_allocate;
+ public long /*int*/ size_allocate;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ state_changed;
+ public long /*int*/ state_changed;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ parent_set;
+ public long /*int*/ parent_set;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ hierarchy_changed;
+ public long /*int*/ hierarchy_changed;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ style_set;
+ public long /*int*/ style_set;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ direction_changed;
+ public long /*int*/ direction_changed;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ grab_notify;
+ public long /*int*/ grab_notify;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ child_notify;
+ public long /*int*/ child_notify;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ mnemonic_activate;
+ public long /*int*/ mnemonic_activate;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ grab_focus;
+ public long /*int*/ grab_focus;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ focus;
+ public long /*int*/ focus;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ event;
+ public long /*int*/ event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ button_press_event;
+ public long /*int*/ button_press_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ button_release_event;
+ public long /*int*/ button_release_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ scroll_event;
+ public long /*int*/ scroll_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ motion_notify_event;
+ public long /*int*/ motion_notify_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ delete_event;
+ public long /*int*/ delete_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ destroy_event;
+ public long /*int*/ destroy_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ expose_event;
+ public long /*int*/ expose_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ key_press_event;
+ public long /*int*/ key_press_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ key_release_event;
+ public long /*int*/ key_release_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ enter_notify_event;
+ public long /*int*/ enter_notify_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ leave_notify_event;
+ public long /*int*/ leave_notify_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ configure_event;
+ public long /*int*/ configure_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ focus_in_event;
+ public long /*int*/ focus_in_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ focus_out_event;
+ public long /*int*/ focus_out_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ map_event;
+ public long /*int*/ map_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ unmap_event;
+ public long /*int*/ unmap_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ property_notify_event;
+ public long /*int*/ property_notify_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ selection_clear_event;
+ public long /*int*/ selection_clear_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ selection_request_event;
+ public long /*int*/ selection_request_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ selection_notify_event;
+ public long /*int*/ selection_notify_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ proximity_in_event;
+ public long /*int*/ proximity_in_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ proximity_out_event;
+ public long /*int*/ proximity_out_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ visibility_notify_event;
+ public long /*int*/ visibility_notify_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ client_event;
+ public long /*int*/ client_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ no_expose_event;
+ public long /*int*/ no_expose_event;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ window_state_event;
+ public long /*int*/ window_state_event;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ selection_get;
+ public long /*int*/ selection_get;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ selection_received;
+ public long /*int*/ selection_received;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ drag_begin;
+ public long /*int*/ drag_begin;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ drag_end;
+ public long /*int*/ drag_end;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ drag_data_get;
+ public long /*int*/ drag_data_get;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ drag_data_delete;
+ public long /*int*/ drag_data_delete;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ drag_leave;
+ public long /*int*/ drag_leave;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ drag_motion;
+ public long /*int*/ drag_motion;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ drag_drop;
+ public long /*int*/ drag_drop;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ drag_data_received;
+ public long /*int*/ drag_data_received;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ popup_menu;
+ public long /*int*/ popup_menu;
+ /** @field cast=(gboolean(*)()) */
+- public int /*long*/ show_help;
+ public long /*int*/ show_help;
+ /** @field cast=(AtkObject*(*)()) */
+- public int /*long*/ get_accessible;
+ public long /*int*/ get_accessible;
+ /** @field cast=(void(*)()) */
+- public int /*long*/ screen_changed;
+ public long /*int*/ screen_changed;
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GTypeInfo.java x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java
---- x86/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-02-11 17:43:48.000000000 -0500
-@@ -17,14 +17,14 @@
-
- public class GTypeInfo {
+diff -urN x86/org/eclipse/swt/internal/gtk/GTypeInfo.java x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java
+--- x86/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GTypeInfo.java 2009-09-17 08:48:24.000000000 -0400
+@@ -19,22 +19,22 @@
+ /** @field cast=(guint16) */
public short class_size;
+ /** @field cast=(GBaseInitFunc) */
- public int /*long*/ base_init;
-- public int /*long*/ base_finalize;
-- public int /*long*/ class_init;
-- public int /*long*/ class_finalize;
-- public int /*long*/ class_data;
+ public long /*int*/ base_init;
+ /** @field cast=(GBaseFinalizeFunc) */
+- public int /*long*/ base_finalize;
+ public long /*int*/ base_finalize;
+ /** @field cast=(GClassInitFunc) */
+- public int /*long*/ class_init;
+ public long /*int*/ class_init;
+ /** @field cast=(GClassFinalizeFunc) */
+- public int /*long*/ class_finalize;
+ public long /*int*/ class_finalize;
+ /** @field cast=(gconstpointer) */
+- public int /*long*/ class_data;
+ public long /*int*/ class_data;
+ /** @field cast=(guint16) */
public short instance_size;
+ /** @field cast=(guint16) */
public short n_preallocs;
+ /** @field cast=(GInstanceInitFunc) */
- public int /*long*/ instance_init;
-- public int /*long*/ value_table;
+ public long /*int*/ instance_init;
+ /** @field cast=(GTypeValueTable *) */
+- public int /*long*/ value_table;
+ public long /*int*/ value_table;
public static final int sizeof = OS.GTypeInfo_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/GTypeQuery.java x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java
---- x86/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-02-11 17:43:48.000000000 -0500
-@@ -17,7 +17,7 @@
-
- public class GTypeQuery {
+diff -urN x86/org/eclipse/swt/internal/gtk/GTypeQuery.java x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java
+--- x86/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/GTypeQuery.java 2009-09-17 08:48:24.000000000 -0400
+@@ -19,7 +19,7 @@
+ /** @field cast=(GType) */
public int type;
+ /** @field cast=(const gchar *) */
- public int /*long*/ type_name;
+ public long /*int*/ type_name;
+ /** @field cast=(guint) */
public int class_size;
- public int instance_size;
- public static final int sizeof = OS.GTypeQuery_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/internal/gtk/OS.java
---- x86/org/eclipse/swt/internal/gtk/OS.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/OS.java 2009-02-11 17:43:48.000000000 -0500
-@@ -575,34 +575,34 @@
+ /** @field cast=(guint) */
+diff -urN x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/internal/gtk/OS.java
+--- x86/org/eclipse/swt/internal/gtk/OS.java 2009-08-20 15:16:38.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/OS.java 2009-09-17 08:48:24.000000000 -0400
+@@ -591,77 +591,77 @@
public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
public static final native int XWindowChanges_sizeof();
-public static final native int /*long*/ localeconv_decimal_point();
--public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
+public static final native long /*int*/ localeconv_decimal_point();
+ /**
+ * @param path cast=(const char *)
+ * @param realPath cast=(char *)
+ */
+-public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
+public static final native long /*int*/ realpath(byte[] path, byte[] realPath);
/** Object private fields accessors */
+
+
+ /** @param object_class cast=(GObjectClass *) */
+-public static final native int /*long*/ G_OBJECT_CLASS_CONSTRUCTOR(int /*long*/ object_class);
++public static final native long /*int*/ G_OBJECT_CLASS_CONSTRUCTOR(long /*int*/ object_class);
+ /**
+ * @param object_class cast=(GObjectClass *)
+ * @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *))
+ */
+-public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(int /*long*/ object_class, int /*long*/ constructor);
++public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(long /*int*/ object_class, long /*int*/ constructor);
+ /** @param widget cast=(GtkWidget *) */
-public static final native int GTK_WIDGET_HEIGHT(int /*long*/ widget);
--public static final native int GTK_WIDGET_WIDTH(int /*long*/ widget);
--public static final native int /*long*/ GTK_WIDGET_WINDOW(int /*long*/ widget);
--public static final native int GTK_WIDGET_X(int /*long*/ widget);
--public static final native int GTK_WIDGET_Y(int /*long*/ widget);
--public static final native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
--public static final native int /*long*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
--public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);
--public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
--public static final native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);
--public static final native int /*long*/ GTK_ENTRY_IM_CONTEXT(int /*long*/ widget);
--public static final native int /*long*/ GTK_TEXTVIEW_IM_CONTEXT(int /*long*/ widget);
--public static final native int /*long*/ GTK_TOOLTIPS_TIP_WINDOW(int /*long*/ widget);
--public static final native void GTK_TOOLTIPS_SET_ACTIVE(int /*long*/ widget, int /*long*/ data);
--public static final native void GTK_WIDGET_SET_HEIGHT(int /*long*/ widget, int height);
--public static final native void GTK_WIDGET_SET_WIDTH(int /*long*/ widget, int width);
--public static final native void GTK_WIDGET_SET_X(int /*long*/ widget, int x);
--public static final native void GTK_WIDGET_SET_Y(int /*long*/ widget, int y);
--public static final native int GTK_WIDGET_REQUISITION_WIDTH(int /*long*/ widget);
--public static final native int GTK_WIDGET_REQUISITION_HEIGHT(int /*long*/ widget);
--public static final native int GDK_EVENT_TYPE(int /*long*/ event);
--public static final native int /*long*/ GDK_EVENT_WINDOW(int /*long*/ event);
--public static final native int X_EVENT_TYPE(int /*long*/ xevent);
--public static final native int /*long*/ X_EVENT_WINDOW(int /*long*/ xevent);
+public static final native int GTK_WIDGET_HEIGHT(long /*int*/ widget);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native int GTK_WIDGET_WIDTH(int /*long*/ widget);
+public static final native int GTK_WIDGET_WIDTH(long /*int*/ widget);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native int /*long*/ GTK_WIDGET_WINDOW(int /*long*/ widget);
+public static final native long /*int*/ GTK_WIDGET_WINDOW(long /*int*/ widget);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native int GTK_WIDGET_X(int /*long*/ widget);
+public static final native int GTK_WIDGET_X(long /*int*/ widget);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native int GTK_WIDGET_Y(int /*long*/ widget);
+public static final native int GTK_WIDGET_Y(long /*int*/ widget);
+ /** @param widget cast=(GtkScrolledWindow *) */
+-public static final native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
+public static final native long /*int*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(long /*int*/ widget);
+ /** @param widget cast=(GtkScrolledWindow *) */
+-public static final native int /*long*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
+public static final native long /*int*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(long /*int*/ widget);
+ /** @param widget cast=(GtkScrolledWindow *) */
+-public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);
+public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(long /*int*/ widget);
+ /**
+ * @param acce_label cast=(GtkAccelLabel *)
+ * @param string cast=(gchar *)
+ */
+-public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
+public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(long /*int*/ acce_label, long /*int*/ string);
+ /** @param acce_label cast=(GtkAccelLabel *) */
+-public static final native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);
+public static final native long /*int*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(long /*int*/ acce_label);
+ /** @param widget cast=(GtkEntry *) */
+-public static final native int /*long*/ GTK_ENTRY_IM_CONTEXT(int /*long*/ widget);
+public static final native long /*int*/ GTK_ENTRY_IM_CONTEXT(long /*int*/ widget);
+ /** @param widget cast=(GtkTextView *) */
+-public static final native int /*long*/ GTK_TEXTVIEW_IM_CONTEXT(int /*long*/ widget);
+public static final native long /*int*/ GTK_TEXTVIEW_IM_CONTEXT(long /*int*/ widget);
+ /** @param widget cast=(GtkTooltips *) */
+-public static final native int /*long*/ GTK_TOOLTIPS_TIP_WINDOW(int /*long*/ widget);
+public static final native long /*int*/ GTK_TOOLTIPS_TIP_WINDOW(long /*int*/ widget);
+ /**
+ * @param widget cast=(GtkTooltips *)
+ * @param data cast=(GtkTooltipsData *)
+ */
+-public static final native void GTK_TOOLTIPS_SET_ACTIVE(int /*long*/ widget, int /*long*/ data);
+public static final native void GTK_TOOLTIPS_SET_ACTIVE(long /*int*/ widget, long /*int*/ data);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native void GTK_WIDGET_SET_HEIGHT(int /*long*/ widget, int height);
+public static final native void GTK_WIDGET_SET_HEIGHT(long /*int*/ widget, int height);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native void GTK_WIDGET_SET_WIDTH(int /*long*/ widget, int width);
+public static final native void GTK_WIDGET_SET_WIDTH(long /*int*/ widget, int width);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native void GTK_WIDGET_SET_X(int /*long*/ widget, int x);
+public static final native void GTK_WIDGET_SET_X(long /*int*/ widget, int x);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native void GTK_WIDGET_SET_Y(int /*long*/ widget, int y);
+public static final native void GTK_WIDGET_SET_Y(long /*int*/ widget, int y);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native int GTK_WIDGET_REQUISITION_WIDTH(int /*long*/ widget);
+public static final native int GTK_WIDGET_REQUISITION_WIDTH(long /*int*/ widget);
+ /** @param widget cast=(GtkWidget *) */
+-public static final native int GTK_WIDGET_REQUISITION_HEIGHT(int /*long*/ widget);
+public static final native int GTK_WIDGET_REQUISITION_HEIGHT(long /*int*/ widget);
+ /** @param event cast=(GdkEvent *) */
+-public static final native int GDK_EVENT_TYPE(int /*long*/ event);
+public static final native int GDK_EVENT_TYPE(long /*int*/ event);
+ /** @param event cast=(GdkEventAny *) */
+-public static final native int /*long*/ GDK_EVENT_WINDOW(int /*long*/ event);
+public static final native long /*int*/ GDK_EVENT_WINDOW(long /*int*/ event);
+ /** @param xevent cast=(XEvent *) */
+-public static final native int X_EVENT_TYPE(int /*long*/ xevent);
+public static final native int X_EVENT_TYPE(long /*int*/ xevent);
+ /** @param xevent cast=(XAnyEvent *) */
+-public static final native int /*long*/ X_EVENT_WINDOW(int /*long*/ xevent);
+public static final native long /*int*/ X_EVENT_WINDOW(long /*int*/ xevent);
/** X11 Native methods and constants */
public static final int Above = 0;
-@@ -620,7 +620,7 @@
+@@ -679,7 +679,7 @@
public static final int GraphicsExpose = 13;
public static final int NoExpose = 14;
public static final int ExposureMask = 1 << 15;
@@ -14844,7 +11661,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
public static final int NotifyNormal = 0;
public static final int NotifyGrab = 1;
public static final int NotifyHint = 1;
-@@ -636,8 +636,8 @@
+@@ -695,8 +695,8 @@
public static final int VisibilityFullyObscured = 2;
public static final int VisibilityNotify = 15;
public static final int SYSTEM_TRAY_REQUEST_DOCK = 0;
@@ -14855,7 +11672,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _Call(proc, arg1, arg2);
-@@ -645,8 +645,8 @@
+@@ -704,8 +704,8 @@
lock.unlock();
}
}
@@ -14866,10 +11683,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-@@ -655,8 +655,8 @@
- }
- }
+@@ -716,8 +716,8 @@
+ /** @method flags=no_gen */
public static final native boolean GDK_WINDOWING_X11();
+ /** @param pixmap cast=(GdkPixmap *) */
-public static final native int /*long*/ _GDK_PIXMAP_XID(int /*long*/ pixmap);
-public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
+public static final native long /*int*/ _GDK_PIXMAP_XID(long /*int*/ pixmap);
@@ -14877,10 +11694,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GDK_PIXMAP_XID(pixmap);
-@@ -664,8 +664,8 @@
- lock.unlock();
- }
- }
+@@ -730,8 +730,8 @@
+ * @param event_mask cast=(long)
+ * @param event_return cast=(XEvent *)
+ */
-public static final native boolean _XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return);
-public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return) {
+public static final native boolean _XCheckMaskEvent(long /*int*/ display, long /*int*/ event_mask, long /*int*/ event_return);
@@ -14888,10 +11705,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XCheckMaskEvent(display, event_mask, event_return);
-@@ -673,8 +673,8 @@
- lock.unlock();
- }
- }
+@@ -745,8 +745,8 @@
+ * @param event_mask cast=(long)
+ * @param event_return cast=(XEvent *)
+ */
-public static final native boolean _XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return);
-public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return) {
+public static final native boolean _XCheckWindowEvent(long /*int*/ display, long /*int*/ window, long /*int*/ event_mask, long /*int*/ event_return);
@@ -14899,10 +11716,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XCheckWindowEvent(display, window, event_mask, event_return);
-@@ -682,8 +682,8 @@
- lock.unlock();
- }
- }
+@@ -760,8 +760,8 @@
+ * @param predicate cast=(Bool (*)())
+ * @param arg cast=(XPointer)
+ */
-public static final native boolean _XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg);
-public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg) {
+public static final native boolean _XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg);
@@ -14910,10 +11727,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XCheckIfEvent(display, event_return, predicate, arg);
-@@ -691,8 +691,8 @@
- lock.unlock();
+@@ -770,8 +770,8 @@
}
}
+ /** @param display cast=(Display *) */
-public static final native int _XDefaultScreen(int /*long*/ display);
-public static final int XDefaultScreen(int /*long*/ display) {
+public static final native int _XDefaultScreen(long /*int*/ display);
@@ -14921,10 +11738,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XDefaultScreen(display);
-@@ -700,8 +700,8 @@
- lock.unlock();
+@@ -780,8 +780,8 @@
}
}
+ /** @param display cast=(Display *) */
-public static final native int /*long*/ _XDefaultRootWindow(int /*long*/ display);
-public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
+public static final native long /*int*/ _XDefaultRootWindow(long /*int*/ display);
@@ -14932,10 +11749,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XDefaultRootWindow(display);
-@@ -709,8 +709,8 @@
- lock.unlock();
+@@ -790,8 +790,8 @@
}
}
+ /** @param display cast=(Display *) */
-public static final native void _XFlush(int /*long*/ display);
-public static final void XFlush(int /*long*/ display) {
+public static final native void _XFlush(long /*int*/ display);
@@ -14943,10 +11760,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XFlush(display);
-@@ -718,8 +718,8 @@
- lock.unlock();
+@@ -800,8 +800,8 @@
}
}
+ /** @param address cast=(void *) */
-public static final native void _XFree(int /*long*/ address);
-public static final void XFree(int /*long*/ address) {
+public static final native void _XFree(long /*int*/ address);
@@ -14954,10 +11771,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XFree(address);
-@@ -727,8 +727,8 @@
- lock.unlock();
- }
- }
+@@ -813,8 +813,8 @@
+ * @param display cast=(Display *)
+ * @param selection cast=(Atom)
+ */
-public static final native int /*long*/ _XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
-public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection) {
+public static final native long /*int*/ _XGetSelectionOwner(long /*int*/ display, long /*int*/ selection);
@@ -14965,10 +11782,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XGetSelectionOwner(display, selection);
-@@ -736,8 +736,8 @@
- lock.unlock();
- }
- }
+@@ -827,8 +827,8 @@
+ * @param name cast=(char *)
+ * @param ifExists cast=(Bool)
+ */
-public static final native int /*long*/ _XInternAtom(int /*long*/ display, byte[] name, boolean ifExists);
-public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name, boolean ifExists) {
+public static final native long /*int*/ _XInternAtom(long /*int*/ display, byte[] name, boolean ifExists);
@@ -14976,10 +11793,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XInternAtom(display, name, ifExists);
-@@ -745,8 +745,8 @@
- lock.unlock();
- }
- }
+@@ -847,8 +847,8 @@
+ * @param win_y_return cast=(int *)
+ * @param mask_return cast=(unsigned int *)
+ */
-public static final native int _XQueryPointer(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
-public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) {
+public static final native int _XQueryPointer(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
@@ -14987,10 +11804,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return);
-@@ -754,8 +754,8 @@
- lock.unlock();
- }
- }
+@@ -864,8 +864,8 @@
+ * @param children_return cast=(Window **)
+ * @param nchildren_return cast=(unsigned int *)
+ */
-public static final native int _XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return);
-public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return) {
+public static final native int _XQueryTree(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] parent_return, long /*int*/[] children_return, int[] nchildren_return);
@@ -14998,10 +11815,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return);
-@@ -763,8 +763,8 @@
- lock.unlock();
- }
- }
+@@ -877,8 +877,8 @@
+ * @param display cast=(Display *)
+ * @param keysym cast=(KeySym)
+ */
-public static final native int _XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym);
-public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym) {
+public static final native int _XKeysymToKeycode(long /*int*/ display, long /*int*/ keysym);
@@ -15009,10 +11826,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XKeysymToKeycode(display, keysym);
-@@ -772,8 +772,8 @@
- lock.unlock();
- }
- }
+@@ -891,8 +891,8 @@
+ * @param window cast=(Window)
+ * @param num_prop_return cast=(int *)
+ */
-public static final native int /*long*/ _XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return);
-public static final int /*long*/ XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return) {
+public static final native long /*int*/ _XListProperties(long /*int*/ display, long /*int*/ window, int[] num_prop_return);
@@ -15020,10 +11837,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XListProperties(display, window, num_prop_return);
-@@ -781,8 +781,8 @@
- lock.unlock();
- }
- }
+@@ -905,8 +905,8 @@
+ * @param window cast=(Window)
+ * @param values flags=no_out
+ */
-public static final native int _XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values);
-public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values) {
+public static final native int _XReconfigureWMWindow(long /*int*/ display, long /*int*/ window, int screen, int valueMask, XWindowChanges values);
@@ -15031,10 +11848,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XReconfigureWMWindow(display, window, screen, valueMask, values);
-@@ -790,8 +790,8 @@
- lock.unlock();
- }
- }
+@@ -919,8 +919,8 @@
+ * @param w cast=(Window)
+ * @param event_send cast=(XEvent *)
+ */
-public static final native int _XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send);
-public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send) {
+public static final native int _XSendEvent(long /*int*/ display, long /*int*/ w, boolean propogate, long /*int*/ event_mask, long /*int*/ event_send);
@@ -15042,10 +11859,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XSendEvent(display, w, propogate, event_mask, event_send);
-@@ -799,8 +799,8 @@
- lock.unlock();
+@@ -929,8 +929,8 @@
}
}
+ /** @param handler cast=(XIOErrorHandler) */
-public static final native int /*long*/ _XSetIOErrorHandler(int /*long*/ handler);
-public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
+public static final native long /*int*/ _XSetIOErrorHandler(long /*int*/ handler);
@@ -15053,10 +11870,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XSetIOErrorHandler(handler);
-@@ -808,8 +808,8 @@
- lock.unlock();
+@@ -939,8 +939,8 @@
}
}
+ /** @param handler cast=(XErrorHandler) */
-public static final native int /*long*/ _XSetErrorHandler(int /*long*/ handler);
-public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
+public static final native long /*int*/ _XSetErrorHandler(long /*int*/ handler);
@@ -15064,10 +11881,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XSetErrorHandler(handler);
-@@ -817,8 +817,8 @@
- lock.unlock();
- }
- }
+@@ -952,8 +952,8 @@
+ * @param display cast=(Display *)
+ * @param window cast=(Window)
+ */
-public static final native int _XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time);
-public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time) {
+public static final native int _XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time);
@@ -15075,10 +11892,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XSetInputFocus(display, window, revert, time);
-@@ -826,8 +826,8 @@
- lock.unlock();
- }
- }
+@@ -966,8 +966,8 @@
+ * @param w cast=(Window)
+ * @param prop_window cast=(Window)
+ */
-public static final native int _XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window);
-public static final int XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window) {
+public static final native int _XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window);
@@ -15086,10 +11903,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XSetTransientForHint(display, w, prop_window);
-@@ -835,8 +835,8 @@
- lock.unlock();
+@@ -976,8 +976,8 @@
}
}
+ /** @param display cast=(Display *) */
-public static final native int /*long*/ _XSynchronize(int /*long*/ display, boolean onoff);
-public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onoff) {
+public static final native long /*int*/ _XSynchronize(long /*int*/ display, boolean onoff);
@@ -15097,10 +11914,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XSynchronize(display, onoff);
-@@ -844,8 +844,8 @@
- lock.unlock();
- }
- }
+@@ -990,8 +990,8 @@
+ * @param is_press cast=(Bool)
+ * @param delay cast=(unsigned long)
+ */
-public static final native void _XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay);
-public static final void XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay) {
+public static final native void _XTestFakeButtonEvent(long /*int*/ display, int button, boolean is_press, long /*int*/ delay);
@@ -15108,10 +11925,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XTestFakeButtonEvent(display, button, is_press, delay);
-@@ -853,8 +853,8 @@
- lock.unlock();
- }
- }
+@@ -1004,8 +1004,8 @@
+ * @param is_press cast=(Bool)
+ * @param delay cast=(unsigned long)
+ */
-public static final native void _XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay);
-public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay) {
+public static final native void _XTestFakeKeyEvent(long /*int*/ display, int keycode, boolean is_press, long /*int*/ delay);
@@ -15119,10 +11936,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XTestFakeKeyEvent(display, keycode, is_press, delay);
-@@ -862,8 +862,8 @@
- lock.unlock();
- }
- }
+@@ -1017,8 +1017,8 @@
+ * @param display cast=(Display *)
+ * @param delay cast=(unsigned long)
+ */
-public static final native void _XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay);
-public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay) {
+public static final native void _XTestFakeMotionEvent(long /*int*/ display, int screen_number, int x, int y, long /*int*/ delay);
@@ -15130,10 +11947,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XTestFakeMotionEvent(display, screen_number, x, y, delay);
-@@ -871,8 +871,8 @@
- lock.unlock();
- }
- }
+@@ -1031,8 +1031,8 @@
+ * @param sourceWindow cast=(Window)
+ * @param destWindow cast=(Window)
+ */
-public static final native int _XWarpPointer(int /*long*/ display, int /*long*/ sourceWindow, int /*long*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY);
-public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWindow, int /*long*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY) {
+public static final native int _XWarpPointer(long /*int*/ display, long /*int*/ sourceWindow, long /*int*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY);
@@ -15141,10 +11958,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY);
-@@ -880,8 +880,8 @@
- lock.unlock();
+@@ -1041,8 +1041,8 @@
}
}
+ /** @param atom cast=(GdkAtom) */
-public static final native int /*long*/ _gdk_x11_atom_to_xatom(int /*long*/ atom);
-public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
+public static final native long /*int*/ _gdk_x11_atom_to_xatom(long /*int*/ atom);
@@ -15152,10 +11969,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_atom_to_xatom(atom);
-@@ -889,8 +889,8 @@
- lock.unlock();
+@@ -1051,8 +1051,8 @@
}
}
+ /** @param colormap cast=(GdkColormap *) */
-public static final native int /*long*/ _gdk_x11_colormap_get_xcolormap(int /*long*/ colormap);
-public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ colormap) {
+public static final native long /*int*/ _gdk_x11_colormap_get_xcolormap(long /*int*/ colormap);
@@ -15163,10 +11980,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_colormap_get_xcolormap(colormap);
-@@ -898,8 +898,8 @@
- lock.unlock();
+@@ -1061,8 +1061,8 @@
}
}
+ /** @param drawable cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_x11_drawable_get_xdisplay(int /*long*/ drawable);
-public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_x11_drawable_get_xdisplay(long /*int*/ drawable);
@@ -15174,10 +11991,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_drawable_get_xdisplay(drawable);
-@@ -907,8 +907,8 @@
- lock.unlock();
+@@ -1071,8 +1071,8 @@
}
}
+ /** @param drawable cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_x11_drawable_get_xid(int /*long*/ drawable);
-public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_x11_drawable_get_xid(long /*int*/ drawable);
@@ -15185,10 +12002,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_drawable_get_xid(drawable);
-@@ -916,8 +916,8 @@
- lock.unlock();
- }
- }
+@@ -1085,8 +1085,8 @@
+ * @param screen cast=(GdkScreen *)
+ * @param xvisualid cast=(VisualID)
+ */
-public static final native int /*long*/ _gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid);
-public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid) {
+public static final native long /*int*/ _gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid);
@@ -15196,10 +12013,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_screen_lookup_visual(screen, xvisualid);
-@@ -925,8 +925,8 @@
- lock.unlock();
- }
- }
+@@ -1098,8 +1098,8 @@
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ */
-public static final native int /*long*/ _gdk_x11_screen_get_window_manager_name(int /*long*/ screen);
-public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*long*/ screen) {
+public static final native long /*int*/ _gdk_x11_screen_get_window_manager_name(long /*int*/ screen);
@@ -15207,10 +12024,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_screen_get_window_manager_name(screen);
-@@ -934,8 +934,8 @@
- lock.unlock();
+@@ -1108,8 +1108,8 @@
}
}
+ /** @param visual cast=(GdkVisual *) */
-public static final native int /*long*/ _gdk_x11_visual_get_xvisual(int /*long*/ visual);
-public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual) {
+public static final native long /*int*/ _gdk_x11_visual_get_xvisual(long /*int*/ visual);
@@ -15218,7 +12035,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_x11_visual_get_xvisual(visual);
-@@ -943,8 +943,8 @@
+@@ -1117,8 +1117,8 @@
lock.unlock();
}
}
@@ -15229,7 +12046,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixmap_foreign_new(anid);
-@@ -952,8 +952,8 @@
+@@ -1126,8 +1126,8 @@
lock.unlock();
}
}
@@ -15240,10 +12057,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_lookup(xid);
-@@ -961,8 +961,8 @@
- lock.unlock();
- }
- }
+@@ -1140,8 +1140,8 @@
+ * @param function cast=(GdkFilterFunc)
+ * @param data cast=(gpointer)
+ */
-public static final native void _gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);
-public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {
+public static final native void _gdk_window_add_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data);
@@ -15251,10 +12068,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_add_filter(window, function, data);
-@@ -970,8 +970,8 @@
- lock.unlock();
- }
- }
+@@ -1154,8 +1154,8 @@
+ * @param function cast=(GdkFilterFunc)
+ * @param data cast=(gpointer)
+ */
-public static final native void _gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);
-public static final void gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {
+public static final native void _gdk_window_remove_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data);
@@ -15262,37 +12079,82 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_remove_filter(window, function, data);
-@@ -979,16 +979,16 @@
- lock.unlock();
- }
- }
+@@ -1168,61 +1168,61 @@
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, XButtonEvent src, int /*long*/ size);
--public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size);
--public static final native void memmove(int /*long*/ dest, XCrossingEvent src, int /*long*/ size);
--public static final native void memmove(int /*long*/ dest, XExposeEvent src, int /*long*/ size);
--public static final native void memmove(int /*long*/ dest, XFocusChangeEvent src, int /*long*/ size);
--public static final native void memmove(XButtonEvent dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(XCrossingEvent dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(XExposeEvent dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XButtonEvent src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XClientMessageEvent src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(int /*long*/ dest, XCrossingEvent src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XCrossingEvent src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(int /*long*/ dest, XExposeEvent src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XExposeEvent src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(int /*long*/ dest, XFocusChangeEvent src, int /*long*/ size);
+public static final native void memmove(long /*int*/ dest, XFocusChangeEvent src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(XButtonEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XButtonEvent dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(XCrossingEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XCrossingEvent dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(XExposeEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XExposeEvent dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XFocusChangeEvent dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(XVisibilityEvent dest, long /*int*/ src, long /*int*/ size);
/** X render natives and constants */
public static final int PictStandardARGB32 = 0;
-@@ -1000,8 +1000,8 @@
- public static final int PictOpOver = 3;
+@@ -1235,8 +1235,8 @@
public static final native int XRenderPictureAttributes_sizeof();
+ /** @method flags=dynamic */
-public static final native boolean _XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep);
-public static final boolean XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep) {
+public static final native boolean _XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep);
@@ -15300,10 +12162,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XRenderQueryExtension(display, event_basep, error_basep);
-@@ -1009,8 +1009,8 @@
- lock.unlock();
+@@ -1245,8 +1245,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp);
-public static final int XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp) {
+public static final native int _XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp);
@@ -15311,10 +12173,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XRenderQueryVersion(display, major_versionp, minor_versionp);
-@@ -1018,8 +1018,8 @@
- lock.unlock();
- }
- }
+@@ -1258,8 +1258,8 @@
+ * @method flags=dynamic
+ * @param attributes flags=no_out
+ */
-public static final native int /*long*/ _XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes);
-public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes) {
+public static final native long /*int*/ _XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes);
@@ -15322,10 +12184,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XRenderCreatePicture(display, drawable, format, valuemask, attributes);
-@@ -1027,8 +1027,8 @@
- lock.unlock();
+@@ -1268,8 +1268,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
-public static final void XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {
+public static final native void _XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
@@ -15333,10 +12195,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count);
-@@ -1036,8 +1036,8 @@
- lock.unlock();
+@@ -1278,8 +1278,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform);
-public static final void XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform) {
+public static final native void _XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform);
@@ -15344,10 +12206,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XRenderSetPictureTransform(display, picture, transform);
-@@ -1045,8 +1045,8 @@
- lock.unlock();
+@@ -1288,8 +1288,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _XRenderFreePicture(int /*long*/ display, int /*long*/ picture);
-public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ picture) {
+public static final native void _XRenderFreePicture(long /*int*/ display, long /*int*/ picture);
@@ -15355,10 +12217,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XRenderFreePicture(display, picture);
-@@ -1054,8 +1054,8 @@
- lock.unlock();
+@@ -1298,8 +1298,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
-public static final void XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height) {
+public static final native void _XRenderComposite(long /*int*/ display, int op, long /*int*/ src, long /*int*/ mask, long /*int*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
@@ -15366,10 +12228,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-@@ -1063,8 +1063,8 @@
- lock.unlock();
+@@ -1308,8 +1308,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _XRenderFindStandardFormat(int /*long*/ display, int format);
-public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display, int format) {
+public static final native long /*int*/ _XRenderFindStandardFormat(long /*int*/ display, int format);
@@ -15377,10 +12239,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XRenderFindStandardFormat(display, format);
-@@ -1072,8 +1072,8 @@
- lock.unlock();
+@@ -1318,8 +1318,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual);
-public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual) {
+public static final native long /*int*/ _XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual);
@@ -15388,20 +12250,22 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _XRenderFindVisualFormat(display, visual);
-@@ -1083,9 +1083,9 @@
+@@ -1329,10 +1329,10 @@
}
/** Natives */
-public static final native int Call (int /*long*/ func, int /*long*/ arg0, int arg1, int arg2);
+-public static final native long Call (int /*long*/ func, int /*long*/ arg0, int arg1, long arg2);
-public static final native int /*long*/ _GDK_DISPLAY();
-public static final int /*long*/ GDK_DISPLAY() {
+public static final native int Call (long /*int*/ func, long /*int*/ arg0, int arg1, int arg2);
++public static final native long Call (long /*int*/ func, long /*int*/ arg0, int arg1, long arg2);
+public static final native long /*int*/ _GDK_DISPLAY();
+public static final long /*int*/ GDK_DISPLAY() {
lock.lock();
try {
return _GDK_DISPLAY();
-@@ -1093,8 +1093,8 @@
+@@ -1340,8 +1340,8 @@
lock.unlock();
}
}
@@ -15412,10 +12276,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GDK_ROOT_PARENT();
-@@ -1102,8 +1102,8 @@
- lock.unlock();
+@@ -1350,8 +1350,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GDK_TYPE_COLOR();
-public static final int /*long*/ GDK_TYPE_COLOR() {
+public static final native long /*int*/ _GDK_TYPE_COLOR();
@@ -15423,10 +12287,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GDK_TYPE_COLOR();
-@@ -1111,8 +1111,8 @@
- lock.unlock();
+@@ -1360,8 +1360,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GDK_TYPE_PIXBUF();
-public static final int /*long*/ GDK_TYPE_PIXBUF() {
+public static final native long /*int*/ _GDK_TYPE_PIXBUF();
@@ -15434,7 +12298,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GDK_TYPE_PIXBUF();
-@@ -1120,8 +1120,8 @@
+@@ -1369,8 +1369,8 @@
lock.unlock();
}
}
@@ -15445,7 +12309,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_BUTTON(obj);
-@@ -1129,8 +1129,8 @@
+@@ -1378,8 +1378,8 @@
lock.unlock();
}
}
@@ -15456,7 +12320,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_WINDOW(obj);
-@@ -1138,8 +1138,8 @@
+@@ -1387,8 +1387,8 @@
lock.unlock();
}
}
@@ -15467,7 +12331,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_PIXBUF(obj);
-@@ -1147,8 +1147,8 @@
+@@ -1396,8 +1396,8 @@
lock.unlock();
}
}
@@ -15478,7 +12342,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TEXT(obj);
-@@ -1156,8 +1156,8 @@
+@@ -1405,8 +1405,8 @@
lock.unlock();
}
}
@@ -15489,7 +12353,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_CELL_RENDERER_TOGGLE(obj);
-@@ -1165,8 +1165,8 @@
+@@ -1414,8 +1414,8 @@
lock.unlock();
}
}
@@ -15500,7 +12364,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_CONTAINER(obj);
-@@ -1174,8 +1174,8 @@
+@@ -1423,8 +1423,8 @@
lock.unlock();
}
}
@@ -15511,7 +12375,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_IMAGE_MENU_ITEM(obj);
-@@ -1183,8 +1183,8 @@
+@@ -1432,8 +1432,8 @@
lock.unlock();
}
}
@@ -15522,7 +12386,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_MENU_ITEM(obj);
-@@ -1192,8 +1192,8 @@
+@@ -1441,8 +1441,8 @@
lock.unlock();
}
}
@@ -15533,10 +12397,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_IS_PLUG(obj);
-@@ -1201,8 +1201,8 @@
+@@ -1450,8 +1450,8 @@
lock.unlock();
}
}
+-public static final native boolean _GTK_IS_SOCKET(int /*long*/ obj);
+-public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
++public static final native boolean _GTK_IS_SOCKET(long /*int*/ obj);
++public static final boolean GTK_IS_SOCKET(long /*int*/ obj) {
+ lock.lock();
+ try {
+ return _GTK_IS_SOCKET(obj);
+@@ -1460,8 +1460,8 @@
+ }
+ }
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_STOCK_CANCEL();
-public static final int /*long*/ GTK_STOCK_CANCEL() {
+public static final native long /*int*/ _GTK_STOCK_CANCEL();
@@ -15544,10 +12419,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_STOCK_CANCEL();
-@@ -1210,8 +1210,8 @@
- lock.unlock();
+@@ -1470,8 +1470,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_STOCK_OK();
-public static final int /*long*/ GTK_STOCK_OK() {
+public static final native long /*int*/ _GTK_STOCK_OK();
@@ -15555,10 +12430,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_STOCK_OK();
-@@ -1219,8 +1219,8 @@
- lock.unlock();
+@@ -1480,8 +1480,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TEXT();
-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TEXT();
@@ -15566,10 +12441,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TEXT();
-@@ -1228,8 +1228,8 @@
- lock.unlock();
+@@ -1490,8 +1490,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
@@ -15577,10 +12452,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_PIXBUF();
-@@ -1237,8 +1237,8 @@
- lock.unlock();
+@@ -1500,8 +1500,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
-public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
+public static final native long /*int*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
@@ -15588,10 +12463,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_TYPE_CELL_RENDERER_TOGGLE();
-@@ -1246,8 +1246,8 @@
- lock.unlock();
+@@ -1510,8 +1510,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_FIXED();
-public static final int /*long*/ GTK_TYPE_FIXED() {
+public static final native long /*int*/ _GTK_TYPE_FIXED();
@@ -15599,10 +12474,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_TYPE_FIXED();
-@@ -1255,8 +1255,8 @@
- lock.unlock();
+@@ -1520,8 +1520,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_MENU();
-public static final int /*long*/ GTK_TYPE_MENU() {
+public static final native long /*int*/ _GTK_TYPE_MENU();
@@ -15610,10 +12485,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_TYPE_MENU();
-@@ -1264,8 +1264,8 @@
- lock.unlock();
+@@ -1530,8 +1530,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _GTK_TYPE_WIDGET();
-public static final int /*long*/ GTK_TYPE_WIDGET() {
+public static final native long /*int*/ _GTK_TYPE_WIDGET();
@@ -15621,7 +12496,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_TYPE_WIDGET();
-@@ -1273,8 +1273,8 @@
+@@ -1539,8 +1539,8 @@
lock.unlock();
}
}
@@ -15632,7 +12507,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_FLAGS(wid);
-@@ -1282,8 +1282,8 @@
+@@ -1548,8 +1548,8 @@
lock.unlock();
}
}
@@ -15643,7 +12518,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_STATE(wid);
-@@ -1291,8 +1291,8 @@
+@@ -1557,8 +1557,8 @@
lock.unlock();
}
}
@@ -15654,7 +12529,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_HAS_DEFAULT(wid);
-@@ -1300,8 +1300,8 @@
+@@ -1566,8 +1566,8 @@
lock.unlock();
}
}
@@ -15665,7 +12540,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_HAS_FOCUS(wid);
-@@ -1309,8 +1309,8 @@
+@@ -1575,8 +1575,8 @@
lock.unlock();
}
}
@@ -15676,7 +12551,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_IS_SENSITIVE(wid);
-@@ -1318,8 +1318,8 @@
+@@ -1584,8 +1584,8 @@
lock.unlock();
}
}
@@ -15687,7 +12562,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_MAPPED(wid);
-@@ -1327,8 +1327,8 @@
+@@ -1593,8 +1593,8 @@
lock.unlock();
}
}
@@ -15698,7 +12573,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_SENSITIVE(wid);
-@@ -1336,8 +1336,8 @@
+@@ -1602,8 +1602,8 @@
lock.unlock();
}
}
@@ -15709,7 +12584,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_GTK_WIDGET_SET_FLAGS(wid, flag);
-@@ -1345,8 +1345,8 @@
+@@ -1611,8 +1611,8 @@
lock.unlock();
}
}
@@ -15720,7 +12595,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_GTK_WIDGET_UNSET_FLAGS(wid, flag);
-@@ -1354,8 +1354,8 @@
+@@ -1620,8 +1620,8 @@
lock.unlock();
}
}
@@ -15731,7 +12606,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _GTK_WIDGET_VISIBLE(wid);
-@@ -1363,8 +1363,8 @@
+@@ -1629,8 +1629,8 @@
lock.unlock();
}
}
@@ -15742,7 +12617,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_OBJECT_CLASS(klass);
-@@ -1372,8 +1372,8 @@
+@@ -1638,8 +1638,8 @@
lock.unlock();
}
}
@@ -15753,7 +12628,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_OBJECT_GET_CLASS(object);
-@@ -1381,8 +1381,8 @@
+@@ -1647,8 +1647,8 @@
lock.unlock();
}
}
@@ -15764,10 +12639,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_OBJECT_TYPE_NAME(object);
-@@ -1390,8 +1390,8 @@
- lock.unlock();
+@@ -1657,8 +1657,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _G_TYPE_BOOLEAN();
-public static final int /*long*/ G_TYPE_BOOLEAN() {
+public static final native long /*int*/ _G_TYPE_BOOLEAN();
@@ -15775,10 +12650,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_TYPE_BOOLEAN();
-@@ -1399,8 +1399,8 @@
- lock.unlock();
+@@ -1667,8 +1667,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _G_TYPE_INT();
-public static final int /*long*/ G_TYPE_INT() {
+public static final native long /*int*/ _G_TYPE_INT();
@@ -15786,7 +12661,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_TYPE_INT();
-@@ -1408,8 +1408,8 @@
+@@ -1676,8 +1676,8 @@
lock.unlock();
}
}
@@ -15797,10 +12672,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_OBJECT_TYPE(instance);
-@@ -1417,8 +1417,8 @@
- lock.unlock();
+@@ -1686,8 +1686,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _G_TYPE_STRING();
-public static final int /*long*/ G_TYPE_STRING() {
+public static final native long /*int*/ _G_TYPE_STRING();
@@ -15808,10 +12683,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _G_TYPE_STRING();
-@@ -1435,8 +1435,8 @@
- lock.unlock();
+@@ -1705,8 +1705,8 @@
}
}
+ /** @method flags=const */
-public static final native int /*long*/ _PANGO_TYPE_FONT_DESCRIPTION();
-public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
+public static final native long /*int*/ _PANGO_TYPE_FONT_DESCRIPTION();
@@ -15819,10 +12694,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _PANGO_TYPE_FONT_DESCRIPTION();
-@@ -1444,8 +1444,8 @@
- lock.unlock();
+@@ -1715,8 +1715,8 @@
}
}
+ /** @method flags=const */
+-public static final native int /*long*/ _PANGO_TYPE_LAYOUT();
+-public static final int /*long*/ PANGO_TYPE_LAYOUT() {
++public static final native long /*int*/ _PANGO_TYPE_LAYOUT();
++public static final long /*int*/ PANGO_TYPE_LAYOUT() {
+ lock.lock();
+ try {
+ return _PANGO_TYPE_LAYOUT();
+@@ -1725,8 +1725,8 @@
+ }
+ }
+ /** @param handle cast=(void *) */
-public static final native int _dlclose(int /*long*/ handle);
-public static final int dlclose(int /*long*/ handle) {
+public static final native int _dlclose(long /*int*/ handle);
@@ -15830,10 +12716,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _dlclose(handle);
-@@ -1453,8 +1453,8 @@
- lock.unlock();
+@@ -1735,8 +1735,8 @@
}
}
+ /** @param filename cast=(const char *) */
-public static final native int /*long*/ _dlopen(byte[] filename, int flag);
-public static final int /*long*/ dlopen(byte[] filename, int flag) {
+public static final native long /*int*/ _dlopen(byte[] filename, int flag);
@@ -15841,10 +12727,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _dlopen(filename, flag);
-@@ -1462,8 +1462,8 @@
- lock.unlock();
- }
- }
+@@ -1748,8 +1748,8 @@
+ * @param handle cast=(void *)
+ * @param symbol cast=(const char *)
+ */
-public static final native int /*long*/ _dlsym(int /*long*/ handle, byte[] symbol);
-public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
+public static final native long /*int*/ _dlsym(long /*int*/ handle, byte[] symbol);
@@ -15852,10 +12738,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _dlsym(handle, symbol);
-@@ -1471,8 +1471,8 @@
- lock.unlock();
- }
- }
+@@ -1764,8 +1764,8 @@
+ * @param hook_data cast=(gpointer)
+ * @param data_destroy cast=(GDestroyNotify)
+ */
-public static final native int /*long*/ _g_signal_add_emission_hook(int signal_id, int detail, int /*long*/ hook_func, int /*long*/ hook_data, int /*long*/ data_destroy);
-public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int detail, int /*long*/ hook_func, int /*long*/ hook_data, int /*long*/ data_destroy) {
+public static final native long /*int*/ _g_signal_add_emission_hook(int signal_id, int detail, long /*int*/ hook_func, long /*int*/ hook_data, long /*int*/ data_destroy);
@@ -15863,10 +12749,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy);
-@@ -1480,8 +1480,8 @@
- lock.unlock();
- }
- }
+@@ -1777,8 +1777,8 @@
+ * @param signal_id cast=(guint)
+ * @param hook_id cast=(gulong)
+ */
-public static final native void _g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id);
-public static final void g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id) {
+public static final native void _g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id);
@@ -15874,10 +12760,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_remove_emission_hook (signal_id, hook_id);
-@@ -1489,8 +1489,8 @@
- lock.unlock();
- }
- }
+@@ -1791,8 +1791,8 @@
+ * @param user_data cast=(gpointer)
+ * @param destroy_data cast=(GClosureNotify)
+ */
-public static final native int /*long*/ _g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data);
-public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data) {
+public static final native long /*int*/ _g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data);
@@ -15885,10 +12771,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_cclosure_new(callback_func, user_data, destroy_data);
-@@ -1498,8 +1498,8 @@
- lock.unlock();
+@@ -1801,8 +1801,8 @@
}
}
+ /** @param closure cast=(GClosure *) */
-public static final native int /*long*/ _g_closure_ref(int /*long*/ closure);
-public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
+public static final native long /*int*/ _g_closure_ref(long /*int*/ closure);
@@ -15896,10 +12782,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_closure_ref(closure);
-@@ -1507,8 +1507,8 @@
- lock.unlock();
+@@ -1811,8 +1811,8 @@
}
}
+ /** @param closure cast=(GClosure *) */
-public static final native void _g_closure_unref(int /*long*/ closure);
-public static final void g_closure_unref(int /*long*/ closure) {
+public static final native void _g_closure_unref(long /*int*/ closure);
@@ -15907,10 +12793,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_closure_unref(closure);
-@@ -1516,8 +1516,8 @@
- lock.unlock();
+@@ -1821,8 +1821,8 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_acquire(int /*long*/ context);
-public static final boolean g_main_context_acquire(int /*long*/ context) {
+public static final native boolean _g_main_context_acquire(long /*int*/ context);
@@ -15918,10 +12804,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_acquire(context);
-@@ -1525,8 +1525,8 @@
- lock.unlock();
- }
- }
+@@ -1834,8 +1834,8 @@
+ * @param context cast=(GMainContext *)
+ * @param fds cast=(GPollFD *)
+ */
-public static final native int _g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds);
-public static final int g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds) {
+public static final native int _g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds);
@@ -15929,7 +12815,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_check(context, max_priority, fds, n_fds);
-@@ -1534,8 +1534,8 @@
+@@ -1843,8 +1843,8 @@
lock.unlock();
}
}
@@ -15940,10 +12826,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_default();
-@@ -1543,8 +1543,8 @@
- lock.unlock();
+@@ -1853,8 +1853,8 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_iteration(int /*long*/ context, boolean may_block);
-public static final boolean g_main_context_iteration(int /*long*/ context, boolean may_block) {
+public static final native boolean _g_main_context_iteration(long /*int*/ context, boolean may_block);
@@ -15951,10 +12837,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_iteration(context, may_block);
-@@ -1552,8 +1552,8 @@
- lock.unlock();
+@@ -1863,8 +1863,8 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_pending(int /*long*/ context);
-public static final boolean g_main_context_pending(int /*long*/ context) {
+public static final native boolean _g_main_context_pending(long /*int*/ context);
@@ -15962,10 +12848,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_pending(context);
-@@ -1561,8 +1561,8 @@
- lock.unlock();
+@@ -1873,8 +1873,8 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native int /*long*/ _g_main_context_get_poll_func(int /*long*/ context);
-public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ context) {
+public static final native long /*int*/ _g_main_context_get_poll_func(long /*int*/ context);
@@ -15973,10 +12859,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_get_poll_func(context);
-@@ -1570,8 +1570,8 @@
- lock.unlock();
+@@ -1883,8 +1883,8 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native boolean _g_main_context_prepare(int /*long*/ context, int[] priority);
-public static final boolean g_main_context_prepare(int /*long*/ context, int[] priority) {
+public static final native boolean _g_main_context_prepare(long /*int*/ context, int[] priority);
@@ -15984,10 +12870,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_prepare(context, priority);
-@@ -1579,8 +1579,8 @@
- lock.unlock();
- }
- }
+@@ -1896,8 +1896,8 @@
+ * @param context cast=(GMainContext *)
+ * @param fds cast=(GPollFD *)
+ */
-public static final native int _g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds);
-public static final int g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds) {
+public static final native int _g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds);
@@ -15995,10 +12881,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_main_context_query(context, max_priority, timeout_, fds, n_fds);
-@@ -1588,8 +1588,8 @@
- lock.unlock();
+@@ -1906,8 +1906,8 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native void _g_main_context_release(int /*long*/ context);
-public static final void g_main_context_release(int /*long*/ context) {
+public static final native void _g_main_context_release(long /*int*/ context);
@@ -16006,23 +12892,30 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_main_context_release(context);
-@@ -1597,9 +1597,9 @@
- lock.unlock();
+@@ -1916,7 +1916,7 @@
}
}
+ /** @param context cast=(GMainContext *) */
-public static final native void g_main_context_wakeup(int /*long*/ context);
++public static final native void g_main_context_wakeup(long /*int*/ context);
+ /**
+ * @param opsysstring cast=(const gchar *)
+ * @param len cast=(gssize)
+@@ -1924,8 +1924,8 @@
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _g_filename_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
-public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
-+public static final native void g_main_context_wakeup(long /*int*/ context);
+public static final native long /*int*/ _g_filename_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
+public static final long /*int*/ g_filename_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {
lock.lock();
try {
return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -1607,8 +1607,8 @@
- lock.unlock();
- }
- }
+@@ -1938,8 +1938,8 @@
+ * @param hostname cast=(const char *)
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error);
-public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error);
@@ -16030,10 +12923,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_filename_to_uri(filename, hostname, error);
-@@ -1616,8 +1616,8 @@
- lock.unlock();
- }
- }
+@@ -1954,8 +1954,8 @@
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _g_filename_from_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
-public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_from_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
@@ -16041,10 +12934,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -1625,8 +1625,8 @@
- lock.unlock();
- }
- }
+@@ -1968,8 +1968,8 @@
+ * @param hostname cast=(char **)
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error);
-public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error) {
+public static final native long /*int*/ _g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error);
@@ -16052,10 +12945,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_filename_from_uri(uri, hostname, error);
-@@ -1634,8 +1634,8 @@
- lock.unlock();
+@@ -1978,8 +1978,8 @@
}
}
+ /** @param mem cast=(gpointer) */
-public static final native void _g_free(int /*long*/ mem);
-public static final void g_free(int /*long*/ mem) {
+public static final native void _g_free(long /*int*/ mem);
@@ -16063,10 +12956,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_free(mem);
-@@ -1643,8 +1643,8 @@
- lock.unlock();
- }
- }
+@@ -1991,8 +1991,8 @@
+ * @param function cast=(GSourceFunc)
+ * @param data cast=(gpointer)
+ */
-public static final native int _g_idle_add(int /*long*/ function, int /*long*/ data);
-public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
+public static final native int _g_idle_add(long /*int*/ function, long /*int*/ data);
@@ -16074,10 +12967,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_idle_add(function, data);
-@@ -1652,8 +1652,8 @@
- lock.unlock();
- }
- }
+@@ -2004,8 +2004,8 @@
+ * @param list cast=(GList *)
+ * @param data cast=(gpointer)
+ */
-public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);
-public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {
+public static final native long /*int*/ _g_list_append(long /*int*/ list, long /*int*/ data);
@@ -16085,10 +12978,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_append(list, data);
-@@ -1661,8 +1661,8 @@
- lock.unlock();
+@@ -2014,8 +2014,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native int /*long*/ _g_list_data(int /*long*/ list);
-public static final int /*long*/ g_list_data(int /*long*/ list) {
+public static final native long /*int*/ _g_list_data(long /*int*/ list);
@@ -16096,10 +12989,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_data(list);
-@@ -1670,8 +1670,8 @@
- lock.unlock();
+@@ -2024,8 +2024,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native void _g_list_free(int /*long*/ list);
-public static final void g_list_free(int /*long*/ list) {
+public static final native void _g_list_free(long /*int*/ list);
@@ -16107,10 +13000,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_list_free(list);
-@@ -1679,8 +1679,8 @@
- lock.unlock();
+@@ -2034,8 +2034,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native void _g_list_free_1(int /*long*/ list);
-public static final void g_list_free_1(int /*long*/ list) {
+public static final native void _g_list_free_1(long /*int*/ list);
@@ -16118,10 +13011,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_list_free_1(list);
-@@ -1688,8 +1688,8 @@
- lock.unlock();
+@@ -2044,8 +2044,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native int _g_list_length(int /*long*/ list);
-public static final int g_list_length(int /*long*/ list) {
+public static final native int _g_list_length(long /*int*/ list);
@@ -16129,10 +13022,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_length(list);
-@@ -1697,8 +1697,8 @@
- lock.unlock();
- }
- }
+@@ -2057,8 +2057,8 @@
+ * @param list cast=(GList *)
+ * @param llist cast=(GList *)
+ */
-public static final native void _g_list_set_next(int /*long*/ list, int /*long*/ llist);
-public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist) {
+public static final native void _g_list_set_next(long /*int*/ list, long /*int*/ llist);
@@ -16140,7 +13033,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_list_set_next(list, llist);
-@@ -1706,8 +1706,8 @@
+@@ -2066,8 +2066,8 @@
lock.unlock();
}
}
@@ -16151,10 +13044,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_next(list);
-@@ -1715,8 +1715,8 @@
- lock.unlock();
- }
- }
+@@ -2079,8 +2079,8 @@
+ * @param list cast=(GList *)
+ * @param n cast=(guint)
+ */
-public static final native int /*long*/ _g_list_nth(int /*long*/ list, int n);
-public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
+public static final native long /*int*/ _g_list_nth(long /*int*/ list, int n);
@@ -16162,10 +13055,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_nth(list, n);
-@@ -1724,8 +1724,8 @@
- lock.unlock();
- }
- }
+@@ -2092,8 +2092,8 @@
+ * @param list cast=(GList *)
+ * @param n cast=(guint)
+ */
-public static final native int /*long*/ _g_list_nth_data(int /*long*/ list, int n);
-public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
+public static final native long /*int*/ _g_list_nth_data(long /*int*/ list, int n);
@@ -16173,10 +13066,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_nth_data(list, n);
-@@ -1733,8 +1733,8 @@
- lock.unlock();
- }
- }
+@@ -2105,8 +2105,8 @@
+ * @param list cast=(GList *)
+ * @param data cast=(gpointer)
+ */
-public static final native int /*long*/ _g_list_prepend(int /*long*/ list, int /*long*/ data);
-public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/ data) {
+public static final native long /*int*/ _g_list_prepend(long /*int*/ list, long /*int*/ data);
@@ -16184,10 +13077,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_prepend(list, data);
-@@ -1742,8 +1742,8 @@
- lock.unlock();
- }
- }
+@@ -2118,8 +2118,8 @@
+ * @param list cast=(GList *)
+ * @param llist cast=(GList *)
+ */
-public static final native void _g_list_set_previous(int /*long*/ list, int /*long*/ llist);
-public static final void g_list_set_previous(int /*long*/ list, int /*long*/ llist) {
+public static final native void _g_list_set_previous(long /*int*/ list, long /*int*/ llist);
@@ -16195,7 +13088,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_list_set_previous(list, llist);
-@@ -1751,8 +1751,8 @@
+@@ -2127,8 +2127,8 @@
lock.unlock();
}
}
@@ -16206,10 +13099,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_previous(list);
-@@ -1760,8 +1760,8 @@
- lock.unlock();
- }
- }
+@@ -2140,8 +2140,8 @@
+ * @param list cast=(GList *)
+ * @param link cast=(GList *)
+ */
-public static final native int /*long*/ _g_list_remove_link(int /*long*/ list, int /*long*/ link);
-public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*long*/ link) {
+public static final native long /*int*/ _g_list_remove_link(long /*int*/ list, long /*int*/ link);
@@ -16217,10 +13110,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_remove_link(list, link);
-@@ -1769,8 +1769,8 @@
- lock.unlock();
+@@ -2150,8 +2150,8 @@
}
}
+ /** @param list cast=(GList *) */
-public static final native int /*long*/ _g_list_reverse(int /*long*/ list);
-public static final int /*long*/ g_list_reverse(int /*long*/ list) {
+public static final native long /*int*/ _g_list_reverse(long /*int*/ list);
@@ -16228,10 +13121,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_list_reverse(list);
-@@ -1778,8 +1778,8 @@
- lock.unlock();
- }
- }
+@@ -2166,8 +2166,8 @@
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
-public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_locale_from_utf8(long /*int*/ utf8string, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
@@ -16239,10 +13132,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error);
-@@ -1787,8 +1787,8 @@
- lock.unlock();
- }
- }
+@@ -2182,8 +2182,8 @@
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
-public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_locale_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
@@ -16250,10 +13143,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
-@@ -1796,8 +1796,8 @@
- lock.unlock();
- }
- }
+@@ -2197,8 +2197,8 @@
+ * @param message cast=(gchar *)
+ * @param unused_data cast=(gpointer)
+ */
-public static final native void _g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data);
-public static final void g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data) {
+public static final native void _g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data);
@@ -16261,10 +13154,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_log_default_handler(log_domain, log_levels, message, unused_data);
-@@ -1814,8 +1814,8 @@
- lock.unlock();
- }
- }
+@@ -2225,8 +2225,8 @@
+ * @param log_func cast=(GLogFunc)
+ * @param user_data cast=(gpointer)
+ */
-public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data);
-public static final int g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data) {
+public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data);
@@ -16272,10 +13165,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_log_set_handler(log_domain, log_levels, log_func, user_data);
-@@ -1823,8 +1823,8 @@
- lock.unlock();
+@@ -2235,8 +2235,8 @@
}
}
+ /** @param size cast=(gulong) */
-public static final native int /*long*/ _g_malloc(int /*long*/ size);
-public static final int /*long*/ g_malloc(int /*long*/ size) {
+public static final native long /*int*/ _g_malloc(long /*int*/ size);
@@ -16283,10 +13176,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_malloc(size);
-@@ -1832,8 +1832,8 @@
- lock.unlock();
- }
- }
+@@ -2249,8 +2249,8 @@
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator);
-public static final void g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator) {
+public static final native void _g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator);
@@ -16294,10 +13187,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_get(object, first_property_name, value, terminator);
-@@ -1841,8 +1841,8 @@
- lock.unlock();
- }
- }
+@@ -2262,8 +2262,8 @@
+ * @param object cast=(GObject *)
+ * @param quark cast=(GQuark)
+ */
-public static final native int /*long*/ _g_object_get_qdata(int /*long*/ object, int quark);
-public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int quark) {
+public static final native long /*int*/ _g_object_get_qdata(long /*int*/ object, int quark);
@@ -16305,10 +13198,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_object_get_qdata(object, quark);
-@@ -1850,8 +1850,8 @@
- lock.unlock();
- }
- }
+@@ -2275,8 +2275,8 @@
+ * @param type cast=(GType)
+ * @param first_property_name cast=(const gchar *)
+ */
-public static final native int /*long*/ _g_object_new (int /*long*/ type, int /*long*/ first_property_name);
-public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ first_property_name) {
+public static final native long /*int*/ _g_object_new (long /*int*/ type, long /*int*/ first_property_name);
@@ -16316,10 +13209,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_object_new(type, first_property_name);
-@@ -1859,8 +1859,8 @@
- lock.unlock();
+@@ -2288,8 +2288,8 @@
+ * @param object cast=(GObject *)
+ * @param property_name cast=(const gchar *)
+ */
+-public static final native void _g_object_notify (int /*long*/ object, byte[] property_name);
+-public static final void g_object_notify (int /*long*/ object, byte[] property_name) {
++public static final native void _g_object_notify (long /*int*/ object, byte[] property_name);
++public static final void g_object_notify (long /*int*/ object, byte[] property_name) {
+ lock.lock();
+ try {
+ _g_object_notify(object, property_name);
+@@ -2298,8 +2298,8 @@
}
}
+ /** @param object cast=(gpointer) */
-public static final native int /*long*/ _g_object_ref(int /*long*/ object);
-public static final int /*long*/ g_object_ref(int /*long*/ object) {
+public static final native long /*int*/ _g_object_ref(long /*int*/ object);
@@ -16327,10 +13231,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_object_ref(object);
-@@ -1868,8 +1868,8 @@
- lock.unlock();
- }
- }
+@@ -2312,8 +2312,8 @@
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator);
@@ -16338,10 +13242,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -1877,8 +1877,8 @@
- lock.unlock();
- }
- }
+@@ -2326,8 +2326,8 @@
+ * @param first_property_name cast=(const gchar *)
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, GdkColor data, long /*int*/ terminator);
@@ -16349,10 +13253,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -1886,8 +1886,8 @@
- lock.unlock();
- }
- }
+@@ -2340,8 +2340,8 @@
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator);
@@ -16360,10 +13264,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -1895,8 +1895,8 @@
- lock.unlock();
- }
- }
+@@ -2354,8 +2354,8 @@
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator);
@@ -16371,10 +13275,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -1904,8 +1904,8 @@
- lock.unlock();
- }
- }
+@@ -2368,8 +2368,8 @@
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator);
-public static final void g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator) {
+public static final native void _g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator);
@@ -16382,10 +13286,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_set(object, first_property_name, data, terminator);
-@@ -1913,8 +1913,8 @@
- lock.unlock();
- }
- }
+@@ -2382,8 +2382,8 @@
+ * @param quark cast=(GQuark)
+ * @param data cast=(gpointer)
+ */
-public static final native void _g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data);
-public static final void g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data) {
+public static final native void _g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data);
@@ -16393,10 +13297,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_set_qdata(object, quark, data);
-@@ -1922,8 +1922,8 @@
- lock.unlock();
+@@ -2392,8 +2392,8 @@
}
}
+ /** @param object cast=(gpointer) */
-public static final native void _g_object_unref(int /*long*/ object);
-public static final void g_object_unref(int /*long*/ object) {
+public static final native void _g_object_unref(long /*int*/ object);
@@ -16404,10 +13308,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_object_unref(object);
-@@ -1949,8 +1949,8 @@
- lock.unlock();
- }
- }
+@@ -2427,8 +2427,8 @@
+ * @param proc cast=(GCallback)
+ * @param data cast=(gpointer)
+ */
-public static final native int _g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);
-public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {
+public static final native int _g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data);
@@ -16415,10 +13319,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_connect(instance, detailed_signal, proc, data);
-@@ -1958,8 +1958,8 @@
- lock.unlock();
- }
- }
+@@ -2442,8 +2442,8 @@
+ * @param closure cast=(GClosure *)
+ * @param after cast=(gboolean)
+ */
-public static final native int _g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after);
-public static final int g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after) {
+public static final native int _g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after);
@@ -16426,10 +13330,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_connect_closure(instance, detailed_signal, closure, after);
-@@ -1967,8 +1967,8 @@
- lock.unlock();
- }
- }
+@@ -2458,8 +2458,8 @@
+ * @param closure cast=(GClosure *)
+ * @param after cast=(gboolean)
+ */
-public static final native int _g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after);
-public static final int g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after) {
+public static final native int _g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after);
@@ -16437,10 +13341,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after);
-@@ -1976,8 +1976,8 @@
- lock.unlock();
- }
- }
+@@ -2473,8 +2473,8 @@
+ * @param proc cast=(GCallback)
+ * @param data cast=(gpointer)
+ */
-public static final native int _g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);
-public static final int g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {
+public static final native int _g_signal_connect_after(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data);
@@ -16448,10 +13352,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_connect_after(instance, detailed_signal, proc, data);
-@@ -1985,8 +1985,8 @@
- lock.unlock();
- }
- }
+@@ -2486,8 +2486,8 @@
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal);
@@ -16459,10 +13363,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal);
-@@ -1994,8 +1994,8 @@
- lock.unlock();
- }
- }
+@@ -2499,8 +2499,8 @@
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data);
@@ -16470,10 +13374,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2003,8 +2003,8 @@
- lock.unlock();
- }
- }
+@@ -2512,8 +2512,8 @@
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2);
@@ -16481,10 +13385,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data1, data2);
-@@ -2012,8 +2012,8 @@
- lock.unlock();
- }
- }
+@@ -2525,8 +2525,8 @@
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
-public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data);
-public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data) {
+public static final native void _g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data);
@@ -16492,10 +13396,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_emit_by_name(instance, detailed_signal, data);
-@@ -2021,8 +2021,8 @@
- lock.unlock();
- }
- }
+@@ -2538,8 +2538,8 @@
+ * @param instance cast=(gpointer)
+ * @param handler_id cast=(gulong)
+ */
-public static final native void _g_signal_handler_disconnect(int /*long*/ instance, int handler_id);
-public static final void g_signal_handler_disconnect(int /*long*/ instance, int handler_id) {
+public static final native void _g_signal_handler_disconnect(long /*int*/ instance, int handler_id);
@@ -16503,10 +13407,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_handler_disconnect(instance, handler_id);
-@@ -2030,8 +2030,8 @@
- lock.unlock();
- }
- }
+@@ -2556,8 +2556,8 @@
+ * @param func cast=(gpointer)
+ * @param data cast=(gpointer)
+ */
-public static final native int _g_signal_handlers_block_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
-public static final int g_signal_handlers_block_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
+public static final native int _g_signal_handlers_block_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);
@@ -16514,10 +13418,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2039,8 +2039,8 @@
- lock.unlock();
- }
- }
+@@ -2574,8 +2574,8 @@
+ * @param func cast=(gpointer)
+ * @param data cast=(gpointer)
+ */
-public static final native int _g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
-public static final int g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
+public static final native int _g_signal_handlers_disconnect_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);
@@ -16525,10 +13429,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2048,8 +2048,8 @@
- lock.unlock();
- }
- }
+@@ -2592,8 +2592,8 @@
+ * @param func cast=(gpointer)
+ * @param data cast=(gpointer)
+ */
-public static final native int _g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
-public static final int g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
+public static final native int _g_signal_handlers_unblock_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data);
@@ -16536,10 +13440,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data);
-@@ -2057,8 +2057,8 @@
- lock.unlock();
+@@ -2602,8 +2602,8 @@
}
}
+ /** @param name cast=(const gchar *),flags=no_out */
-public static final native int _g_signal_lookup (byte[] name, int /*long*/ itype);
-public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
+public static final native int _g_signal_lookup (byte[] name, long /*int*/ itype);
@@ -16547,10 +13451,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_signal_lookup(name, itype);
-@@ -2066,8 +2066,8 @@
- lock.unlock();
- }
- }
+@@ -2615,8 +2615,8 @@
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
-public static final native void _g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal);
-public static final void g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal) {
+public static final native void _g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal);
@@ -16558,10 +13462,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_signal_stop_emission_by_name(instance, detailed_signal);
-@@ -2075,8 +2075,8 @@
- lock.unlock();
+@@ -2625,8 +2625,8 @@
}
}
+ /** @param tag cast=(guint) */
-public static final native boolean /*long*/ _g_source_remove (int /*long*/ tag);
-public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
+public static final native boolean /*long*/ _g_source_remove (long /*int*/ tag);
@@ -16569,10 +13473,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_source_remove(tag);
-@@ -2084,8 +2084,8 @@
- lock.unlock();
+@@ -2635,8 +2635,8 @@
}
}
+ /** @param list cast=(GSList *) */
-public static final native int /*long*/ _g_slist_data (int /*long*/ list);
-public static final int /*long*/ g_slist_data (int /*long*/ list) {
+public static final native long /*int*/ _g_slist_data (long /*int*/ list);
@@ -16580,10 +13484,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_slist_data(list);
-@@ -2093,8 +2093,8 @@
- lock.unlock();
+@@ -2645,8 +2645,8 @@
}
}
+ /** @param list cast=(GSList *) */
-public static final native void _g_slist_free (int /*long*/ list);
-public static final void g_slist_free (int /*long*/ list) {
+public static final native void _g_slist_free (long /*int*/ list);
@@ -16591,10 +13495,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_slist_free(list);
-@@ -2102,8 +2102,8 @@
- lock.unlock();
+@@ -2655,8 +2655,8 @@
}
}
+ /** @param list cast=(GSList *) */
-public static final native int /*long*/ _g_slist_next (int /*long*/ list);
-public static final int /*long*/ g_slist_next (int /*long*/ list) {
+public static final native long /*int*/ _g_slist_next (long /*int*/ list);
@@ -16602,10 +13506,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_slist_next(list);
-@@ -2111,8 +2111,8 @@
- lock.unlock();
+@@ -2665,8 +2665,8 @@
}
}
+ /** @param list cast=(GSList *) */
-public static final native int _g_slist_length (int /*long*/ list);
-public static final int g_slist_length (int /*long*/ list) {
+public static final native int _g_slist_length (long /*int*/ list);
@@ -16613,10 +13517,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_slist_length(list);
-@@ -2120,8 +2120,8 @@
- lock.unlock();
+@@ -2675,8 +2675,8 @@
}
}
+ /** @param string_array cast=(gchar **) */
-public static final native void _g_strfreev(int /*long*/ string_array);
-public static final void g_strfreev(int /*long*/ string_array) {
+public static final native void _g_strfreev(long /*int*/ string_array);
@@ -16624,10 +13528,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_strfreev(string_array);
-@@ -2129,8 +2129,8 @@
- lock.unlock();
- }
- }
+@@ -2688,8 +2688,8 @@
+ * @param str cast=(const gchar *)
+ * @param endptr cast=(gchar **)
+ */
-public static final native double _g_strtod(int /*long*/ str, int /*long*/[] endptr);
-public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
+public static final native double _g_strtod(long /*int*/ str, long /*int*/[] endptr);
@@ -16635,10 +13539,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_strtod(str, endptr);
-@@ -2138,8 +2138,8 @@
- lock.unlock();
- }
- }
+@@ -2702,8 +2702,8 @@
+ * @param interface_type cast=(GType)
+ * @param info cast=(const GInterfaceInfo *)
+ */
-public static final native void _g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info);
-public static final void g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info) {
+public static final native void _g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info);
@@ -16646,10 +13550,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_type_add_interface_static(instance_type, interface_type, info);
-@@ -2147,8 +2147,8 @@
- lock.unlock();
+@@ -2712,8 +2712,8 @@
}
}
+ /** @param g_class cast=(GType) */
-public static final native int /*long*/ _g_type_class_peek (int /*long*/ g_class);
-public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
+public static final native long /*int*/ _g_type_class_peek (long /*int*/ g_class);
@@ -16657,10 +13561,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_class_peek(g_class);
-@@ -2156,8 +2156,8 @@
- lock.unlock();
+@@ -2722,8 +2722,8 @@
}
}
+ /** @param g_class cast=(gpointer) */
-public static final native int /*long*/ _g_type_class_peek_parent (int /*long*/ g_class);
-public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class) {
+public static final native long /*int*/ _g_type_class_peek_parent (long /*int*/ g_class);
@@ -16668,10 +13572,32 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_class_peek_parent(g_class);
-@@ -2165,8 +2165,8 @@
- lock.unlock();
+@@ -2732,8 +2732,8 @@
}
}
+ /** @param g_class cast=(GType) */
+-public static final native int /*long*/ _g_type_class_ref (int /*long*/ g_class);
+-public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
++public static final native long /*int*/ _g_type_class_ref (long /*int*/ g_class);
++public static final long /*int*/ g_type_class_ref (long /*int*/ g_class) {
+ lock.lock();
+ try {
+ return _g_type_class_ref(g_class);
+@@ -2742,8 +2742,8 @@
+ }
+ }
+ /** @param g_class cast=(gpointer) */
+-public static final native void _g_type_class_unref (int /*long*/ g_class);
+-public static final void g_type_class_unref (int /*long*/ g_class) {
++public static final native void _g_type_class_unref (long /*int*/ g_class);
++public static final void g_type_class_unref (long /*int*/ g_class) {
+ lock.lock();
+ try {
+ _g_type_class_unref(g_class);
+@@ -2752,8 +2752,8 @@
+ }
+ }
+ /** @param name cast=(const gchar *) */
-public static final native int /*long*/ _g_type_from_name (byte[] name);
-public static final int /*long*/ g_type_from_name (byte[] name) {
+public static final native long /*int*/ _g_type_from_name (byte[] name);
@@ -16679,10 +13605,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_from_name(name);
-@@ -2174,8 +2174,8 @@
- lock.unlock();
+@@ -2762,8 +2762,8 @@
}
}
+ /** @param iface cast=(gpointer) */
-public static final native int /*long*/ _g_type_interface_peek_parent (int /*long*/ iface);
-public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ iface) {
+public static final native long /*int*/ _g_type_interface_peek_parent (long /*int*/ iface);
@@ -16690,10 +13616,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_interface_peek_parent(iface);
-@@ -2183,8 +2183,8 @@
- lock.unlock();
- }
- }
+@@ -2775,8 +2775,8 @@
+ * @param type cast=(GType)
+ * @param is_a_type cast=(GType)
+ */
-public static final native boolean _g_type_is_a (int /*long*/ type, int /*long*/ is_a_type);
-public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_type) {
+public static final native boolean _g_type_is_a (long /*int*/ type, long /*int*/ is_a_type);
@@ -16701,10 +13627,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_is_a(type, is_a_type);
-@@ -2192,8 +2192,8 @@
- lock.unlock();
+@@ -2785,8 +2785,8 @@
}
}
+ /** @param handle cast=(GType) */
-public static final native int /*long*/ _g_type_name (int /*long*/ handle);
-public static final int /*long*/ g_type_name (int /*long*/ handle) {
+public static final native long /*int*/ _g_type_name (long /*int*/ handle);
@@ -16712,10 +13638,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_name(handle);
-@@ -2201,8 +2201,8 @@
- lock.unlock();
+@@ -2795,8 +2795,8 @@
}
}
+ /** @param type cast=(GType) */
-public static final native int /*long*/ _g_type_parent (int /*long*/ type);
-public static final int /*long*/ g_type_parent (int /*long*/ type) {
+public static final native long /*int*/ _g_type_parent (long /*int*/ type);
@@ -16723,10 +13649,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_parent(type);
-@@ -2210,8 +2210,8 @@
- lock.unlock();
- }
- }
+@@ -2808,8 +2808,8 @@
+ * @param type cast=(GType)
+ * @param query cast=(GTypeQuery *)
+ */
-public static final native void _g_type_query (int /*long*/ type, int /*long*/ query);
-public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
+public static final native void _g_type_query (long /*int*/ type, long /*int*/ query);
@@ -16734,10 +13660,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_type_query(type, query);
-@@ -2219,8 +2219,8 @@
- lock.unlock();
- }
- }
+@@ -2823,8 +2823,8 @@
+ * @param info cast=(const GTypeInfo *)
+ * @param flags cast=(GTypeFlags)
+ */
-public static final native int /*long*/ _g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags);
-public static final int /*long*/ g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags) {
+public static final native long /*int*/ _g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags);
@@ -16745,10 +13671,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_type_register_static(parent_type, type_name, info, flags);
-@@ -2228,8 +2228,8 @@
- lock.unlock();
+@@ -2833,8 +2833,8 @@
}
}
+ /** @param vtable cast=(GThreadFunctions *) */
-public static final native void _g_thread_init(int /*long*/ vtable);
-public static final void g_thread_init(int /*long*/ vtable) {
+public static final native void _g_thread_init(long /*int*/ vtable);
@@ -16756,10 +13682,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_g_thread_init(vtable);
-@@ -2246,8 +2246,8 @@
- lock.unlock();
- }
- }
+@@ -2858,8 +2858,8 @@
+ * @param items_written cast=(glong *),flags=critical
+ * @param error cast=(GError **),flags=critical
+ */
-public static final native int /*long*/ _g_utf16_to_utf8(char[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
-public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_utf16_to_utf8(char[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
@@ -16767,10 +13693,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_utf16_to_utf8(str, len, items_read, items_written, error);
-@@ -2255,8 +2255,8 @@
- lock.unlock();
+@@ -2868,8 +2868,8 @@
}
}
+ /** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset);
-public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset) {
+public static final native long /*int*/ _g_utf8_offset_to_pointer(long /*int*/ str, long /*int*/ offset);
@@ -16778,10 +13704,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_utf8_offset_to_pointer(str, offset);
-@@ -2264,8 +2264,8 @@
- lock.unlock();
- }
- }
+@@ -2881,8 +2881,8 @@
+ * @param str cast=(const gchar *)
+ * @param pos cast=(const gchar *)
+ */
-public static final native int /*long*/ _g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos);
-public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos) {
+public static final native long /*int*/ _g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos);
@@ -16789,10 +13715,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_utf8_pointer_to_offset(str, pos);
-@@ -2273,8 +2273,8 @@
- lock.unlock();
+@@ -2891,8 +2891,8 @@
}
}
+ /** @param str cast=(const gchar *) */
-public static final native int /*long*/ _g_utf8_strlen(int /*long*/ str, int /*long*/ max);
-public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ max) {
+public static final native long /*int*/ _g_utf8_strlen(long /*int*/ str, long /*int*/ max);
@@ -16800,10 +13726,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_utf8_strlen(str, max);
-@@ -2282,8 +2282,8 @@
- lock.unlock();
- }
- }
+@@ -2907,8 +2907,8 @@
+ * @param items_written cast=(glong *),flags=critical
+ * @param error cast=(GError **),flags=critical
+ */
-public static final native int /*long*/ _g_utf8_to_utf16(byte[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
-public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_utf8_to_utf16(byte[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
@@ -16811,10 +13737,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -2291,8 +2291,8 @@
- lock.unlock();
- }
- }
+@@ -2923,8 +2923,8 @@
+ * @param items_written cast=(glong *),flags=critical
+ * @param error cast=(GError **),flags=critical
+ */
-public static final native int /*long*/ _g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
-public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
+public static final native long /*int*/ _g_utf8_to_utf16(long /*int*/ str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
@@ -16822,10 +13748,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_utf8_to_utf16(str, len, items_read, items_written, error);
-@@ -2300,8 +2300,8 @@
- lock.unlock();
+@@ -2933,8 +2933,8 @@
}
}
+ /** @param value cast=(const GValue *) */
-public static final native int /*long*/ _g_value_peek_pointer (int /*long*/ value);
-public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
+public static final native long /*int*/ _g_value_peek_pointer (long /*int*/ value);
@@ -16833,10 +13759,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _g_value_peek_pointer(value);
-@@ -2309,8 +2309,8 @@
- lock.unlock();
+@@ -2943,8 +2943,8 @@
}
}
+ /** @param atom_name cast=(const gchar *),flags=no_out critical */
-public static final native int /*long*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);
-public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {
+public static final native long /*int*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);
@@ -16844,10 +13770,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_atom_intern(atom_name, only_if_exists);
-@@ -2318,8 +2318,8 @@
- lock.unlock();
+@@ -2953,8 +2953,8 @@
}
}
+ /** @param atom cast=(GdkAtom) */
-public static final native int /*long*/ _gdk_atom_name(int /*long*/ atom);
-public static final int /*long*/ gdk_atom_name(int /*long*/ atom) {
+public static final native long /*int*/ _gdk_atom_name(long /*int*/ atom);
@@ -16855,10 +13781,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_atom_name(atom);
-@@ -2336,8 +2336,8 @@
- lock.unlock();
- }
- }
+@@ -2977,8 +2977,8 @@
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
-public static final native int /*long*/ _gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height);
-public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height) {
+public static final native long /*int*/ _gdk_bitmap_create_from_data(long /*int*/ window, byte[] data, int width, int height);
@@ -16866,10 +13792,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_bitmap_create_from_data(window, data, width, height);
-@@ -2345,8 +2345,8 @@
- lock.unlock();
+@@ -2987,8 +2987,8 @@
}
}
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _gdk_cairo_create(int /*long*/ drawable);
+-public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
++public static final native long /*int*/ _gdk_cairo_create(long /*int*/ drawable);
++public static final long /*int*/ gdk_cairo_create(long /*int*/ drawable) {
+ lock.lock();
+ try {
+ return _gdk_cairo_create(drawable);
+@@ -2997,8 +2997,8 @@
+ }
+ }
+ /** @method flags=dynamic */
-public static final native void _gdk_cairo_region(int /*long*/ cairo, int /*long*/ region);
-public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ region) {
+public static final native void _gdk_cairo_region(long /*int*/ cairo, long /*int*/ region);
@@ -16877,10 +13814,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_cairo_region(cairo, region);
-@@ -2354,8 +2354,8 @@
- lock.unlock();
+@@ -3007,8 +3007,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color);
-public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color) {
+public static final native void _gdk_cairo_set_source_color(long /*int*/ cairo, GdkColor color);
@@ -16888,10 +13825,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_cairo_set_source_color(cairo, color);
-@@ -2363,8 +2363,8 @@
- lock.unlock();
- }
- }
+@@ -3020,8 +3020,8 @@
+ * @param colormap cast=(GdkColormap *)
+ * @param color cast=(GdkColor *),flags=no_in
+ */
-public static final native boolean _gdk_color_white(int /*long*/ colormap, GdkColor color);
-public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor color) {
+public static final native boolean _gdk_color_white(long /*int*/ colormap, GdkColor color);
@@ -16899,10 +13836,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_color_white(colormap, color);
-@@ -2372,8 +2372,8 @@
- lock.unlock();
- }
- }
+@@ -3035,8 +3035,8 @@
+ * @param writeable cast=(gboolean)
+ * @param best_match cast=(gboolean)
+ */
-public static final native boolean _gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match);
-public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match) {
+public static final native boolean _gdk_colormap_alloc_color(long /*int*/ colormap, GdkColor color, boolean writeable, boolean best_match);
@@ -16910,10 +13847,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_colormap_alloc_color(colormap, color, writeable, best_match);
-@@ -2381,8 +2381,8 @@
- lock.unlock();
- }
- }
+@@ -3049,8 +3049,8 @@
+ * @param colors cast=(GdkColor *),flags=no_out
+ * @param ncolors cast=(gint)
+ */
-public static final native void _gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors);
-public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors) {
+public static final native void _gdk_colormap_free_colors(long /*int*/ colormap, GdkColor colors, int ncolors);
@@ -16921,7 +13858,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_colormap_free_colors(colormap, colors, ncolors);
-@@ -2390,8 +2390,8 @@
+@@ -3058,8 +3058,8 @@
lock.unlock();
}
}
@@ -16932,10 +13869,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_colormap_get_system();
-@@ -2399,8 +2399,8 @@
- lock.unlock();
- }
- }
+@@ -3072,8 +3072,8 @@
+ * @param pixel cast=(gulong)
+ * @param result cast=(GdkColor *)
+ */
-public static final native void _gdk_colormap_query_color(int /*long*/ colormap, int /*long*/ pixel, GdkColor result);
-public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*long*/ pixel, GdkColor result) {
+public static final native void _gdk_colormap_query_color(long /*int*/ colormap, long /*int*/ pixel, GdkColor result);
@@ -16943,10 +13880,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_colormap_query_color(colormap, pixel, result);
-@@ -2408,8 +2408,8 @@
- lock.unlock();
+@@ -3082,8 +3082,8 @@
}
}
+ /** @param cursor cast=(GdkCursor *) */
-public static final native void _gdk_cursor_destroy(int /*long*/ cursor);
-public static final void gdk_cursor_destroy(int /*long*/ cursor) {
+public static final native void _gdk_cursor_destroy(long /*int*/ cursor);
@@ -16954,10 +13891,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_cursor_destroy(cursor);
-@@ -2417,8 +2417,8 @@
- lock.unlock();
+@@ -3092,8 +3092,8 @@
}
}
+ /** @param cursor_type cast=(GdkCursorType) */
-public static final native int /*long*/ _gdk_cursor_new(int /*long*/ cursor_type);
-public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
+public static final native long /*int*/ _gdk_cursor_new(long /*int*/ cursor_type);
@@ -16965,10 +13902,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_cursor_new(cursor_type);
-@@ -2426,8 +2426,8 @@
- lock.unlock();
- }
- }
+@@ -3109,8 +3109,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native int /*long*/ _gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y);
-public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y) {
+public static final native long /*int*/ _gdk_cursor_new_from_pixmap(long /*int*/ source, long /*int*/ mask, GdkColor fg, GdkColor bg, int x, int y);
@@ -16976,10 +13913,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y);
-@@ -2435,8 +2435,8 @@
- lock.unlock();
+@@ -3119,8 +3119,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y);
-public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y) {
+public static final native long /*int*/ _gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y);
@@ -16987,10 +13924,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y);
-@@ -2444,8 +2444,8 @@
- lock.unlock();
+@@ -3129,8 +3129,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gdk_display_get_default();
-public static final int /*long*/ gdk_display_get_default() {
+public static final native long /*int*/ _gdk_display_get_default();
@@ -16998,10 +13935,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_display_get_default();
-@@ -2453,8 +2453,8 @@
- lock.unlock();
+@@ -3139,8 +3139,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native boolean _gdk_display_supports_cursor_color(int /*long*/ display);
-public static final boolean gdk_display_supports_cursor_color(int /*long*/ display) {
+public static final native boolean _gdk_display_supports_cursor_color(long /*int*/ display);
@@ -17009,10 +13946,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_display_supports_cursor_color(display);
-@@ -2462,8 +2462,8 @@
- lock.unlock();
- }
- }
+@@ -3153,8 +3153,8 @@
+ * @param action cast=(GdkDragAction)
+ * @param time cast=(guint32)
+ */
-public static final native void _gdk_drag_status(int /*long*/ context, int action, int time);
-public static final void gdk_drag_status(int /*long*/ context, int action, int time) {
+public static final native void _gdk_drag_status(long /*int*/ context, int action, int time);
@@ -17020,10 +13957,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_drag_status(context, action, time);
-@@ -2471,8 +2471,8 @@
- lock.unlock();
- }
- }
+@@ -3173,8 +3173,8 @@
+ * @param angle1 cast=(gint)
+ * @param angle2 cast=(gint)
+ */
-public static final native void _gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2);
-public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2) {
+public static final native void _gdk_draw_arc(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2);
@@ -17031,10 +13968,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2);
-@@ -2480,8 +2480,8 @@
- lock.unlock();
- }
- }
+@@ -3193,8 +3193,8 @@
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
-public static final native void _gdk_draw_drawable(int /*long*/ drawable, int /*long*/ gc, int /*long*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ gc, int /*long*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
+public static final native void _gdk_draw_drawable(long /*int*/ drawable, long /*int*/ gc, long /*int*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
@@ -17042,10 +13979,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height);
-@@ -2489,8 +2489,8 @@
- lock.unlock();
- }
- }
+@@ -3207,8 +3207,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param image cast=(GdkImage *)
+ */
-public static final native void _gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
-public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
+public static final native void _gdk_draw_image(long /*int*/ drawable, long /*int*/ gc, long /*int*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
@@ -17053,10 +13990,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height);
-@@ -2498,8 +2498,8 @@
- lock.unlock();
- }
- }
+@@ -3223,8 +3223,8 @@
+ * @param y cast=(gint)
+ * @param layout cast=(PangoLayout *)
+ */
-public static final native void _gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout);
-public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout) {
+public static final native void _gdk_draw_layout(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout);
@@ -17064,10 +14001,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_layout(drawable, gc, x, y, layout);
-@@ -2507,8 +2507,8 @@
- lock.unlock();
- }
- }
+@@ -3241,8 +3241,8 @@
+ * @param foreground flags=no_out
+ * @param background flags=no_out
+ */
-public static final native void _gdk_draw_layout_with_colors(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout, GdkColor foreground, GdkColor background);
-public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout, GdkColor foreground, GdkColor background) {
+public static final native void _gdk_draw_layout_with_colors(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout, GdkColor foreground, GdkColor background);
@@ -17075,10 +14012,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background);
-@@ -2516,8 +2516,8 @@
- lock.unlock();
- }
- }
+@@ -3258,8 +3258,8 @@
+ * @param x2 cast=(gint)
+ * @param y2 cast=(gint)
+ */
-public static final native void _gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2);
-public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2) {
+public static final native void _gdk_draw_line(long /*int*/ drawable, long /*int*/ gc, int x1, int y1, int x2, int y2);
@@ -17086,10 +14023,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_line(drawable, gc, x1, y1, x2, y2);
-@@ -2525,8 +2525,8 @@
- lock.unlock();
- }
- }
+@@ -3273,8 +3273,8 @@
+ * @param points cast=(GdkPoint *),flags=no_out critical
+ * @param npoints cast=(gint)
+ */
-public static final native void _gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints);
-public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints) {
+public static final native void _gdk_draw_lines(long /*int*/ drawable, long /*int*/ gc, int[] points, int npoints);
@@ -17097,10 +14034,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_lines(drawable, gc, points, npoints);
-@@ -2534,8 +2534,8 @@
- lock.unlock();
- }
- }
+@@ -3297,8 +3297,8 @@
+ * @param x_dither cast=(gint)
+ * @param y_dither cast=(gint)
+ */
-public static final native void _gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc, int /*long*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither);
-public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc, int /*long*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither) {
+public static final native void _gdk_draw_pixbuf(long /*int*/ drawable, long /*int*/ gc, long /*int*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither);
@@ -17108,10 +14045,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither);
-@@ -2543,8 +2543,8 @@
- lock.unlock();
- }
- }
+@@ -3310,8 +3310,8 @@
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ */
-public static final native void _gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y);
-public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y) {
+public static final native void _gdk_draw_point(long /*int*/ drawable, long /*int*/ gc, int x, int y);
@@ -17119,10 +14056,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_point(drawable, gc, x, y);
-@@ -2552,8 +2552,8 @@
- lock.unlock();
- }
- }
+@@ -3326,8 +3326,8 @@
+ * @param points cast=(GdkPoint *),flags=no_out critical
+ * @param npoints cast=(gint)
+ */
-public static final native void _gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints);
-public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints) {
+public static final native void _gdk_draw_polygon(long /*int*/ drawable, long /*int*/ gc, int filled, int[] points, int npoints);
@@ -17130,10 +14067,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_polygon(drawable, gc, filled, points, npoints);
-@@ -2561,8 +2561,8 @@
- lock.unlock();
- }
- }
+@@ -3344,8 +3344,8 @@
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
-public static final native void _gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height);
-public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height) {
+public static final native void _gdk_draw_rectangle(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height);
@@ -17141,10 +14078,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_draw_rectangle(drawable, gc, filled, x, y, width, height);
-@@ -2570,8 +2570,8 @@
- lock.unlock();
+@@ -3354,8 +3354,8 @@
}
}
+ /** @param drawable cast=(GdkDrawable *) */
-public static final native int _gdk_drawable_get_depth(int /*long*/ drawable);
-public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
+public static final native int _gdk_drawable_get_depth(long /*int*/ drawable);
@@ -17152,10 +14089,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_drawable_get_depth(drawable);
-@@ -2580,8 +2580,8 @@
- }
- }
-
+@@ -3371,8 +3371,8 @@
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
-public static final native int /*long*/ _gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height);
-public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height) {
+public static final native long /*int*/ _gdk_drawable_get_image(long /*int*/ drawable, int x, int y, int width, int height);
@@ -17163,10 +14100,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_drawable_get_image(drawable, x, y, width, height);
-@@ -2589,8 +2589,8 @@
- lock.unlock();
- }
- }
+@@ -3385,8 +3385,8 @@
+ * @param width cast=(gint *),flags=no_in critical
+ * @param height cast=(gint *),flags=no_in critical
+ */
-public static final native void _gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height);
-public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height) {
+public static final native void _gdk_drawable_get_size(long /*int*/ drawable, int[] width, int[] height);
@@ -17174,10 +14111,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_drawable_get_size(drawable, width, height);
-@@ -2598,8 +2598,8 @@
- lock.unlock();
+@@ -3395,8 +3395,8 @@
}
}
+ /** @param drawable cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_drawable_get_visible_region(int /*long*/ drawable);
-public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ drawable) {
+public static final native long /*int*/ _gdk_drawable_get_visible_region(long /*int*/ drawable);
@@ -17185,10 +14122,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_drawable_get_visible_region(drawable);
-@@ -2607,8 +2607,8 @@
- lock.unlock();
+@@ -3405,8 +3405,8 @@
}
}
+ /** @param event cast=(GdkEvent *) */
-public static final native int /*long*/ _gdk_event_copy(int /*long*/ event);
-public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
+public static final native long /*int*/ _gdk_event_copy(long /*int*/ event);
@@ -17196,10 +14133,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_copy(event);
-@@ -2616,8 +2616,8 @@
- lock.unlock();
+@@ -3415,8 +3415,8 @@
}
}
+ /** @param event cast=(GdkEvent *) */
-public static final native void _gdk_event_free(int /*long*/ event);
-public static final void gdk_event_free(int /*long*/ event) {
+public static final native void _gdk_event_free(long /*int*/ event);
@@ -17207,7 +14144,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_event_free(event);
-@@ -2625,8 +2625,8 @@
+@@ -3424,8 +3424,8 @@
lock.unlock();
}
}
@@ -17218,10 +14155,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_get();
-@@ -2634,8 +2634,8 @@
- lock.unlock();
- }
- }
+@@ -3438,8 +3438,8 @@
+ * @param px cast=(gdouble *)
+ * @param py cast=(gdouble *)
+ */
-public static final native boolean _gdk_event_get_root_coords(int /*long*/ event, double[] px, double[] py);
-public static final boolean gdk_event_get_root_coords(int /*long*/ event, double[] px, double[] py) {
+public static final native boolean _gdk_event_get_root_coords(long /*int*/ event, double[] px, double[] py);
@@ -17229,10 +14166,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_get_root_coords(event, px, py);
-@@ -2643,8 +2643,8 @@
- lock.unlock();
- }
- }
+@@ -3452,8 +3452,8 @@
+ * @param px cast=(gdouble *)
+ * @param py cast=(gdouble *)
+ */
-public static final native boolean _gdk_event_get_coords(int /*long*/ event, double[] px, double[] py);
-public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px, double[] py) {
+public static final native boolean _gdk_event_get_coords(long /*int*/ event, double[] px, double[] py);
@@ -17240,10 +14177,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_get_coords(event, px, py);
-@@ -2652,8 +2652,8 @@
- lock.unlock();
+@@ -3462,8 +3462,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native int /*long*/ _gdk_event_get_graphics_expose(int /*long*/ window);
-public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ window) {
+public static final native long /*int*/ _gdk_event_get_graphics_expose(long /*int*/ window);
@@ -17251,10 +14188,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_get_graphics_expose(window);
-@@ -2661,8 +2661,8 @@
- lock.unlock();
- }
- }
+@@ -3475,8 +3475,8 @@
+ * @param event cast=(GdkEvent *)
+ * @param pmod cast=(GdkModifierType *)
+ */
-public static final native boolean _gdk_event_get_state(int /*long*/ event, int[] pmod);
-public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod) {
+public static final native boolean _gdk_event_get_state(long /*int*/ event, int[] pmod);
@@ -17262,10 +14199,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_get_state(event, pmod);
-@@ -2670,8 +2670,8 @@
- lock.unlock();
+@@ -3485,8 +3485,8 @@
}
}
+ /** @param event cast=(GdkEvent *) */
-public static final native int _gdk_event_get_time(int /*long*/ event);
-public static final int gdk_event_get_time(int /*long*/ event) {
+public static final native int _gdk_event_get_time(long /*int*/ event);
@@ -17273,10 +14210,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_get_time(event);
-@@ -2679,8 +2679,8 @@
- lock.unlock();
- }
- }
+@@ -3499,8 +3499,8 @@
+ * @param data cast=(gpointer)
+ * @param notify cast=(GDestroyNotify)
+ */
-public static final native void _gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify);
-public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify) {
+public static final native void _gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify);
@@ -17284,7 +14221,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_event_handler_set(func, data, notify);
-@@ -2688,8 +2688,8 @@
+@@ -3508,8 +3508,8 @@
lock.unlock();
}
}
@@ -17295,7 +14232,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_new(type);
-@@ -2697,8 +2697,8 @@
+@@ -3517,8 +3517,8 @@
lock.unlock();
}
}
@@ -17306,10 +14243,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_event_peek();
-@@ -2706,8 +2706,8 @@
- lock.unlock();
+@@ -3527,8 +3527,8 @@
}
}
+ /** @param event cast=(GdkEvent *) */
-public static final native void _gdk_event_put(int /*long*/ event);
-public static final void gdk_event_put(int /*long*/ event) {
+public static final native void _gdk_event_put(long /*int*/ event);
@@ -17317,10 +14254,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_event_put(event);
-@@ -2742,8 +2742,8 @@
- lock.unlock();
+@@ -3564,8 +3564,8 @@
}
}
+ /** @param list cast=(gchar **) */
-public static final native void _gdk_free_text_list(int /*long*/ list);
-public static final void gdk_free_text_list(int /*long*/ list) {
+public static final native void _gdk_free_text_list(long /*int*/ list);
@@ -17328,10 +14265,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_free_text_list(list);
-@@ -2751,8 +2751,8 @@
- lock.unlock();
- }
- }
+@@ -3577,8 +3577,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param values cast=(GdkGCValues *),flags=no_in
+ */
-public static final native void _gdk_gc_get_values(int /*long*/ gc, GdkGCValues values);
-public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values) {
+public static final native void _gdk_gc_get_values(long /*int*/ gc, GdkGCValues values);
@@ -17339,10 +14276,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_get_values(gc, values);
-@@ -2760,8 +2760,8 @@
- lock.unlock();
+@@ -3587,8 +3587,8 @@
}
}
+ /** @param window cast=(GdkDrawable *) */
-public static final native int /*long*/ _gdk_gc_new(int /*long*/ window);
-public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
+public static final native long /*int*/ _gdk_gc_new(long /*int*/ window);
@@ -17350,10 +14287,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_gc_new(window);
-@@ -2769,8 +2769,8 @@
- lock.unlock();
- }
- }
+@@ -3600,8 +3600,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gdk_gc_set_background(int /*long*/ gc, GdkColor color);
-public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color) {
+public static final native void _gdk_gc_set_background(long /*int*/ gc, GdkColor color);
@@ -17361,10 +14298,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_background(gc, color);
-@@ -2778,8 +2778,8 @@
- lock.unlock();
- }
- }
+@@ -3613,8 +3613,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param mask cast=(GdkBitmap *)
+ */
-public static final native void _gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask);
-public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask) {
+public static final native void _gdk_gc_set_clip_mask(long /*int*/ gc, long /*int*/ mask);
@@ -17372,10 +14309,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_clip_mask(gc, mask);
-@@ -2787,8 +2787,8 @@
- lock.unlock();
- }
- }
+@@ -3627,8 +3627,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native void _gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y);
-public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
+public static final native void _gdk_gc_set_clip_origin(long /*int*/ gc, int x, int y);
@@ -17383,10 +14320,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_clip_origin(gc, x, y);
-@@ -2796,8 +2796,8 @@
- lock.unlock();
- }
- }
+@@ -3640,8 +3640,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_out
+ */
-public static final native void _gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle);
-public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle) {
+public static final native void _gdk_gc_set_clip_rectangle(long /*int*/ gc, GdkRectangle rectangle);
@@ -17394,10 +14331,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_clip_rectangle(gc, rectangle);
-@@ -2805,8 +2805,8 @@
- lock.unlock();
- }
- }
+@@ -3653,8 +3653,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param region cast=(GdkRegion *)
+ */
-public static final native void _gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region);
-public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region) {
+public static final native void _gdk_gc_set_clip_region(long /*int*/ gc, long /*int*/ region);
@@ -17405,10 +14342,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_clip_region(gc, region);
-@@ -2814,8 +2814,8 @@
- lock.unlock();
- }
- }
+@@ -3668,8 +3668,8 @@
+ * @param dash_list cast=(gint8 *),flags=no_out critical
+ * @param n cast=(gint)
+ */
-public static final native void _gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n);
-public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n) {
+public static final native void _gdk_gc_set_dashes(long /*int*/ gc, int dash_offset, byte[] dash_list, int n);
@@ -17416,10 +14353,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_dashes(gc, dash_offset, dash_list, n);
-@@ -2823,8 +2823,8 @@
- lock.unlock();
- }
- }
+@@ -3681,8 +3681,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param exposures cast=(gboolean)
+ */
-public static final native void _gdk_gc_set_exposures(int /*long*/ gc, boolean exposures);
-public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures) {
+public static final native void _gdk_gc_set_exposures(long /*int*/ gc, boolean exposures);
@@ -17427,10 +14364,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_exposures(gc, exposures);
-@@ -2832,8 +2832,8 @@
- lock.unlock();
- }
- }
+@@ -3694,8 +3694,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param fill cast=(GdkFill)
+ */
-public static final native void _gdk_gc_set_fill(int /*long*/ gc, int fill);
-public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
+public static final native void _gdk_gc_set_fill(long /*int*/ gc, int fill);
@@ -17438,10 +14375,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_fill(gc, fill);
-@@ -2841,8 +2841,8 @@
- lock.unlock();
- }
- }
+@@ -3707,8 +3707,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gdk_gc_set_foreground(int /*long*/ gc, GdkColor color);
-public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color) {
+public static final native void _gdk_gc_set_foreground(long /*int*/ gc, GdkColor color);
@@ -17449,10 +14386,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_foreground(gc, color);
-@@ -2850,8 +2850,8 @@
- lock.unlock();
- }
- }
+@@ -3720,8 +3720,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param function cast=(GdkFunction)
+ */
-public static final native void _gdk_gc_set_function(int /*long*/ gc, int /*long*/ function);
-public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ function) {
+public static final native void _gdk_gc_set_function(long /*int*/ gc, long /*int*/ function);
@@ -17460,10 +14397,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_function(gc, function);
-@@ -2859,8 +2859,8 @@
- lock.unlock();
- }
- }
+@@ -3736,8 +3736,8 @@
+ * @param cap_style cast=(GdkCapStyle)
+ * @param join_style cast=(GdkJoinStyle)
+ */
-public static final native void _gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style);
-public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style) {
+public static final native void _gdk_gc_set_line_attributes(long /*int*/ gc, int line_width, int line_style, int cap_style, int join_style);
@@ -17471,10 +14408,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style);
-@@ -2868,8 +2868,8 @@
- lock.unlock();
- }
- }
+@@ -3749,8 +3749,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param stipple cast=(GdkPixmap *)
+ */
-public static final native void _gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple);
-public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple) {
+public static final native void _gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stipple);
@@ -17482,10 +14419,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_stipple(gc, stipple);
-@@ -2877,8 +2877,8 @@
- lock.unlock();
- }
- }
+@@ -3762,8 +3762,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param mode cast=(GdkSubwindowMode)
+ */
-public static final native void _gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode);
-public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode) {
+public static final native void _gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode);
@@ -17493,10 +14430,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_subwindow(gc, mode);
-@@ -2886,8 +2886,8 @@
- lock.unlock();
- }
- }
+@@ -3775,8 +3775,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param tile cast=(GdkPixmap *)
+ */
-public static final native void _gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile);
-public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
+public static final native void _gdk_gc_set_tile(long /*int*/ gc, long /*int*/ tile);
@@ -17504,10 +14441,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_tile(gc, tile);
-@@ -2895,8 +2895,8 @@
- lock.unlock();
+@@ -3785,8 +3785,8 @@
}
}
+ /** @param gc cast=(GdkGC *) */
-public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);
-public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
+public static final native void _gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y);
@@ -17515,10 +14452,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_ts_origin(gc, x, y);
-@@ -2904,8 +2904,8 @@
- lock.unlock();
- }
- }
+@@ -3799,8 +3799,8 @@
+ * @param values cast=(GdkGCValues *),flags=no_out
+ * @param values_mask cast=(GdkGCValuesMask)
+ */
-public static final native void _gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask);
-public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask) {
+public static final native void _gdk_gc_set_values(long /*int*/ gc, GdkGCValues values, int values_mask);
@@ -17526,7 +14463,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_gc_set_values(gc, values, values_mask);
-@@ -2922,8 +2922,8 @@
+@@ -3817,8 +3817,8 @@
lock.unlock();
}
}
@@ -17537,10 +14474,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_keymap_get_default();
-@@ -2931,8 +2931,8 @@
- lock.unlock();
- }
- }
+@@ -3834,8 +3834,8 @@
+ * @param level cast=(gint*)
+ * @param consumed_modifiers cast=(GdkModifierType *)
+ */
-public static final native boolean _gdk_keymap_translate_keyboard_state (int /*long*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers);
-public static final boolean gdk_keymap_translate_keyboard_state (int /*long*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) {
+public static final native boolean _gdk_keymap_translate_keyboard_state (long /*int*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers);
@@ -17548,7 +14485,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers);
-@@ -2958,8 +2958,8 @@
+@@ -3861,8 +3861,8 @@
lock.unlock();
}
}
@@ -17559,10 +14496,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pango_context_get();
-@@ -2967,8 +2967,8 @@
- lock.unlock();
- }
- }
+@@ -3874,8 +3874,8 @@
+ * @param context cast=(PangoContext *)
+ * @param colormap cast=(GdkColormap *)
+ */
-public static final native void _gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap);
-public static final void gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap) {
+public static final native void _gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap);
@@ -17570,10 +14507,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_pango_context_set_colormap(context, colormap);
-@@ -2976,8 +2976,8 @@
- lock.unlock();
+@@ -3884,8 +3884,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _gdk_pango_layout_get_clip_region(int /*long*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges);
-public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) {
+public static final native long /*int*/ _gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges);
@@ -17581,10 +14518,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges);
-@@ -2985,8 +2985,8 @@
- lock.unlock();
- }
- }
+@@ -3897,8 +3897,8 @@
+ * @param src_pixbuf cast=(GdkPixbuf *)
+ * @param dest_pixbuf cast=(GdkPixbuf *)
+ */
-public static final native void _gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x, int src_y, int width, int height, int /*long*/ dest_pixbuf, int dest_x, int dest_y);
-public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x, int src_y, int width, int height, int /*long*/ dest_pixbuf, int dest_x, int dest_y) {
+public static final native void _gdk_pixbuf_copy_area(long /*int*/ src_pixbuf, int src_x, int src_y, int width, int height, long /*int*/ dest_pixbuf, int dest_x, int dest_y);
@@ -17592,10 +14529,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y);
-@@ -2994,8 +2994,8 @@
- lock.unlock();
- }
- }
+@@ -3911,8 +3911,8 @@
+ * @param src cast=(GdkDrawable *)
+ * @param cmap cast=(GdkColormap *)
+ */
-public static final native int /*long*/ _gdk_pixbuf_get_from_drawable(int /*long*/ dest, int /*long*/ src, int /*long*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
-public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest, int /*long*/ src, int /*long*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
+public static final native long /*int*/ _gdk_pixbuf_get_from_drawable(long /*int*/ dest, long /*int*/ src, long /*int*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
@@ -17603,10 +14540,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height);
-@@ -3003,8 +3003,8 @@
- lock.unlock();
+@@ -3921,8 +3921,8 @@
}
}
+ /** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native boolean _gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf);
-public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
+public static final native boolean _gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf);
@@ -17614,10 +14551,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_get_has_alpha(pixbuf);
-@@ -3012,8 +3012,8 @@
- lock.unlock();
+@@ -3931,8 +3931,8 @@
}
}
+ /** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int _gdk_pixbuf_get_height(int /*long*/ pixbuf);
-public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
+public static final native int _gdk_pixbuf_get_height(long /*int*/ pixbuf);
@@ -17625,10 +14562,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_get_height(pixbuf);
-@@ -3021,8 +3021,8 @@
- lock.unlock();
+@@ -3941,8 +3941,8 @@
}
}
+ /** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int /*long*/ _gdk_pixbuf_get_pixels(int /*long*/ pixbuf);
-public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
+public static final native long /*int*/ _gdk_pixbuf_get_pixels(long /*int*/ pixbuf);
@@ -17636,10 +14573,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_get_pixels(pixbuf);
-@@ -3030,8 +3030,8 @@
- lock.unlock();
+@@ -3951,8 +3951,8 @@
}
}
+ /** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int _gdk_pixbuf_get_rowstride(int /*long*/ pixbuf);
-public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
+public static final native int _gdk_pixbuf_get_rowstride(long /*int*/ pixbuf);
@@ -17647,10 +14584,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_get_rowstride(pixbuf);
-@@ -3039,8 +3039,8 @@
- lock.unlock();
+@@ -3961,8 +3961,8 @@
}
}
+ /** @param pixbuf cast=(const GdkPixbuf *) */
-public static final native int _gdk_pixbuf_get_width(int /*long*/ pixbuf);
-public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
+public static final native int _gdk_pixbuf_get_width(long /*int*/ pixbuf);
@@ -17658,7 +14595,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_get_width(pixbuf);
-@@ -3048,8 +3048,8 @@
+@@ -3970,8 +3970,8 @@
lock.unlock();
}
}
@@ -17669,10 +14606,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_loader_new();
-@@ -3057,8 +3057,8 @@
- lock.unlock();
- }
- }
+@@ -3983,8 +3983,8 @@
+ * @param loader cast=(GdkPixbufLoader *)
+ * @param error cast=(GError **)
+ */
-public static final native boolean _gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error);
-public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error) {
+public static final native boolean _gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error);
@@ -17680,10 +14617,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_loader_close(loader, error);
-@@ -3066,8 +3066,8 @@
- lock.unlock();
+@@ -3993,8 +3993,8 @@
}
}
+ /** @param loader cast=(GdkPixbufLoader *) */
-public static final native int /*long*/ _gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader);
-public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader) {
+public static final native long /*int*/ _gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader);
@@ -17691,10 +14628,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_loader_get_pixbuf(loader);
-@@ -3075,8 +3075,8 @@
- lock.unlock();
- }
- }
+@@ -4008,8 +4008,8 @@
+ * @param count cast=(gsize)
+ * @param error cast=(GError **)
+ */
-public static final native boolean _gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error);
-public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error) {
+public static final native boolean _gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error);
@@ -17702,10 +14639,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_loader_write(loader, buffer, count, error);
-@@ -3084,8 +3084,8 @@
- lock.unlock();
- }
- }
+@@ -4021,8 +4021,8 @@
+ * @param colorspace cast=(GdkColorspace)
+ * @param has_alpha cast=(gboolean)
+ */
-public static final native int /*long*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);
-public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) {
+public static final native long /*int*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);
@@ -17713,10 +14650,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height);
-@@ -3093,8 +3093,8 @@
- lock.unlock();
- }
- }
+@@ -4034,8 +4034,8 @@
+ * @param filename cast=(const char *)
+ * @param error cast=(GError**)
+ */
-public static final native int /*long*/ _gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error);
-public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error) {
+public static final native long /*int*/ _gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error);
@@ -17724,10 +14661,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_new_from_file(filename, error);
-@@ -3102,8 +3102,8 @@
- lock.unlock();
- }
- }
+@@ -4049,8 +4049,8 @@
+ * @param gc cast=(GdkGC *)
+ * @param dither cast=(GdkRgbDither)
+ */
-public static final native void _gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
-public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither) {
+public static final native void _gdk_pixbuf_render_to_drawable(long /*int*/ pixbuf, long /*int*/ drawable, long /*int*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
@@ -17735,10 +14672,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_pixbuf_render_to_drawable(pixbuf, drawable, gc, src_x, src_y, dest_x, dest_y, width, height, dither, x_dither, y_dither);
-@@ -3111,8 +3111,8 @@
- lock.unlock();
- }
- }
+@@ -4064,8 +4064,8 @@
+ * @param alpha_mode cast=(GdkPixbufAlphaMode)
+ * @param dither cast=(GdkRgbDither)
+ */
-public static final native void _gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);
-public static final void gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither) {
+public static final native void _gdk_pixbuf_render_to_drawable_alpha(long /*int*/ pixbuf, long /*int*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);
@@ -17746,10 +14683,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_pixbuf_render_to_drawable_alpha(pixbuf, drawable, src_x, src_y, dest_x, dest_y, width, height, alpha_mode, alpha_threshold, dither, x_dither, y_dither);
-@@ -3120,8 +3120,8 @@
- lock.unlock();
- }
- }
+@@ -4078,8 +4078,8 @@
+ * @param pixmap_return cast=(GdkDrawable **)
+ * @param mask_return cast=(GdkBitmap **)
+ */
-public static final native void _gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold);
-public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold) {
+public static final native void _gdk_pixbuf_render_pixmap_and_mask(long /*int*/ pixbuf, long /*int*/[] pixmap_return, long /*int*/[] mask_return, int alpha_threshold);
@@ -17757,21 +14694,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold);
-@@ -3129,8 +3129,8 @@
- lock.unlock();
- }
- }
--public static final native boolean _gdk_pixbuf_save_to_buffer(int /*long*/ pixbuf, int /*long*/ [] buffer, int [] buffer_size, byte [] type, int /*long*/ [] error, byte [] terminate);
--public static final boolean gdk_pixbuf_save_to_buffer(int /*long*/ pixbuf, int /*long*/ [] buffer, int [] buffer_size, byte [] type, int /*long*/ [] error, byte [] terminate) {
-+public static final native boolean _gdk_pixbuf_save_to_buffer(long /*int*/ pixbuf, long /*int*/ [] buffer, int [] buffer_size, byte [] type, long /*int*/ [] error, byte [] terminate);
-+public static final boolean gdk_pixbuf_save_to_buffer(long /*int*/ pixbuf, long /*int*/ [] buffer, int [] buffer_size, byte [] type, long /*int*/ [] error, byte [] terminate) {
+@@ -4097,8 +4097,8 @@
+ * @param option_values=(char **)
+ * @param error cast=(GError **)
+ */
+-public static final native boolean _gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error);
+-public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error) {
++public static final native boolean _gdk_pixbuf_save_to_bufferv(long /*int*/ pixbuf, long /*int*/ [] buffer, long /*int*/ [] buffer_size, byte [] type, long /*int*/ [] option_keys, long /*int*/ [] option_values, long /*int*/ [] error);
++public static final boolean gdk_pixbuf_save_to_bufferv(long /*int*/ pixbuf, long /*int*/ [] buffer, long /*int*/ [] buffer_size, byte [] type, long /*int*/ [] option_keys, long /*int*/ [] option_values, long /*int*/ [] error) {
lock.lock();
try {
- return _gdk_pixbuf_save_to_buffer(pixbuf, buffer, buffer_size, type, error, terminate);
-@@ -3138,8 +3138,8 @@
- lock.unlock();
- }
- }
+ return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
+@@ -4114,8 +4114,8 @@
+ * @param scale_x cast=(double)
+ * @param scale_y cast=(double)
+ */
-public static final native void _gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type);
-public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type) {
+public static final native void _gdk_pixbuf_scale(long /*int*/ src, long /*int*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type);
@@ -17779,10 +14716,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_pixbuf_scale(src, dest, dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, interp_type);
-@@ -3147,8 +3147,8 @@
- lock.unlock();
- }
- }
+@@ -4127,8 +4127,8 @@
+ * @param src cast=(const GdkPixbuf *)
+ * @param interp_type cast=(GdkInterpType)
+ */
-public static final native int /*long*/ _gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type);
-public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type) {
+public static final native long /*int*/ _gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type);
@@ -17790,10 +14727,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
-@@ -3156,8 +3156,8 @@
- lock.unlock();
- }
- }
+@@ -4142,8 +4142,8 @@
+ * @param height cast=(gint)
+ * @param depth cast=(gint)
+ */
-public static final native int /*long*/ _gdk_pixmap_new(int /*long*/ window, int width, int height, int depth);
-public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width, int height, int depth) {
+public static final native long /*int*/ _gdk_pixmap_new(long /*int*/ window, int width, int height, int depth);
@@ -17801,10 +14738,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pixmap_new(window, width, height, depth);
-@@ -3165,8 +3165,8 @@
- lock.unlock();
- }
- }
+@@ -4159,8 +4159,8 @@
+ * @param cursor cast=(GdkCursor *)
+ * @param time cast=(guint32)
+ */
-public static final native int _gdk_pointer_grab(int /*long*/ window, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time);
-public static final int gdk_pointer_grab(int /*long*/ window, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time) {
+public static final native int _gdk_pointer_grab(long /*int*/ window, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time);
@@ -17812,10 +14749,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time);
-@@ -3192,8 +3192,8 @@
- lock.unlock();
- }
- }
+@@ -4196,8 +4196,8 @@
+ * @param actual_length cast=(gint *)
+ * @param data cast=(guchar **)
+ */
-public static final native boolean _gdk_property_get(int /*long*/ window, int /*long*/ property, int /*long*/ type, int /*long*/ offset, int /*long*/ length, int pdelete, int /*long*/[] actual_property_type, int[] actual_format, int[] actual_length, int /*long*/[] data);
-public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ property, int /*long*/ type, int /*long*/ offset, int /*long*/ length, int pdelete, int /*long*/[] actual_property_type, int[] actual_format, int[] actual_length, int /*long*/[] data) {
+public static final native boolean _gdk_property_get(long /*int*/ window, long /*int*/ property, long /*int*/ type, long /*int*/ offset, long /*int*/ length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data);
@@ -17823,10 +14760,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
-@@ -3201,8 +3201,8 @@
- lock.unlock();
+@@ -4206,8 +4206,8 @@
}
}
+ /** @param region cast=(GdkRegion *) */
-public static final native void _gdk_region_destroy(int /*long*/ region);
-public static final void gdk_region_destroy(int /*long*/ region) {
+public static final native void _gdk_region_destroy(long /*int*/ region);
@@ -17834,10 +14771,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_destroy(region);
-@@ -3210,8 +3210,8 @@
- lock.unlock();
+@@ -4216,8 +4216,8 @@
}
}
+ /** @param region cast=(GdkRegion *) */
-public static final native boolean _gdk_region_empty(int /*long*/ region);
-public static final boolean gdk_region_empty(int /*long*/ region) {
+public static final native boolean _gdk_region_empty(long /*int*/ region);
@@ -17845,10 +14782,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_region_empty(region);
-@@ -3219,8 +3219,8 @@
- lock.unlock();
- }
- }
+@@ -4229,8 +4229,8 @@
+ * @param region cast=(GdkRegion *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_in
+ */
-public static final native void _gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle);
-public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle) {
+public static final native void _gdk_region_get_clipbox(long /*int*/ region, GdkRectangle rectangle);
@@ -17856,10 +14793,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_get_clipbox(region, rectangle);
-@@ -3228,8 +3228,8 @@
- lock.unlock();
- }
- }
+@@ -4243,8 +4243,8 @@
+ * @param rectangles cast=(GdkRectangle **)
+ * @param n_rectangles cast=(gint *)
+ */
-public static final native void _gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles);
-public static final void gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles) {
+public static final native void _gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles);
@@ -17867,10 +14804,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_get_rectangles(region, rectangles, n_rectangles);
-@@ -3237,8 +3237,8 @@
- lock.unlock();
- }
- }
+@@ -4256,8 +4256,8 @@
+ * @param source1 cast=(GdkRegion *)
+ * @param source2 cast=(GdkRegion *)
+ */
-public static final native void _gdk_region_intersect(int /*long*/ source1, int /*long*/ source2);
-public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/ source2) {
+public static final native void _gdk_region_intersect(long /*int*/ source1, long /*int*/ source2);
@@ -17878,7 +14815,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_intersect(source1, source2);
-@@ -3246,8 +3246,8 @@
+@@ -4265,8 +4265,8 @@
lock.unlock();
}
}
@@ -17889,10 +14826,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_region_new();
-@@ -3255,8 +3255,8 @@
- lock.unlock();
- }
- }
+@@ -4279,8 +4279,8 @@
+ * @param dx cast=(gint)
+ * @param dy cast=(gint)
+ */
-public static final native void _gdk_region_offset(int /*long*/ region, int dx, int dy);
-public static final void gdk_region_offset(int /*long*/ region, int dx, int dy) {
+public static final native void _gdk_region_offset(long /*int*/ region, int dx, int dy);
@@ -17900,10 +14837,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_offset(region, dx, dy);
-@@ -3264,8 +3264,8 @@
- lock.unlock();
- }
- }
+@@ -4293,8 +4293,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native boolean _gdk_region_point_in(int /*long*/ region, int x, int y);
-public static final boolean gdk_region_point_in(int /*long*/ region, int x, int y) {
+public static final native boolean _gdk_region_point_in(long /*int*/ region, int x, int y);
@@ -17911,10 +14848,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_region_point_in(region, x, y);
-@@ -3273,8 +3273,8 @@
- lock.unlock();
- }
- }
+@@ -4306,8 +4306,8 @@
+ * @param points cast=(GdkPoint *)
+ * @param fill_rule cast=(GdkFillRule)
+ */
-public static final native int /*long*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);
-public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) {
+public static final native long /*int*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);
@@ -17922,10 +14859,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_region_polygon(points, npoints, fill_rule);
-@@ -3282,8 +3282,8 @@
- lock.unlock();
+@@ -4316,8 +4316,8 @@
}
}
+ /** @param rectangle flags=no_out */
-public static final native int /*long*/ _gdk_region_rectangle(GdkRectangle rectangle);
-public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
+public static final native long /*int*/ _gdk_region_rectangle(GdkRectangle rectangle);
@@ -17933,10 +14870,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_region_rectangle(rectangle);
-@@ -3291,8 +3291,8 @@
- lock.unlock();
- }
- }
+@@ -4329,8 +4329,8 @@
+ * @param region cast=(GdkRegion *)
+ * @param rect cast=(GdkRectangle *),flags=no_out
+ */
-public static final native int /*long*/ _gdk_region_rect_in(int /*long*/ region, GdkRectangle rect);
-public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRectangle rect) {
+public static final native long /*int*/ _gdk_region_rect_in(long /*int*/ region, GdkRectangle rect);
@@ -17944,10 +14881,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_region_rect_in(region, rect);
-@@ -3300,8 +3300,8 @@
- lock.unlock();
- }
- }
+@@ -4342,8 +4342,8 @@
+ * @param source1 cast=(GdkRegion *)
+ * @param source2 cast=(GdkRegion *)
+ */
-public static final native void _gdk_region_subtract(int /*long*/ source1, int /*long*/ source2);
-public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/ source2) {
+public static final native void _gdk_region_subtract(long /*int*/ source1, long /*int*/ source2);
@@ -17955,10 +14892,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_subtract(source1, source2);
-@@ -3309,8 +3309,8 @@
- lock.unlock();
- }
- }
+@@ -4355,8 +4355,8 @@
+ * @param source1 cast=(GdkRegion *)
+ * @param source2 cast=(GdkRegion *)
+ */
-public static final native void _gdk_region_union(int /*long*/ source1, int /*long*/ source2);
-public static final void gdk_region_union(int /*long*/ source1, int /*long*/ source2) {
+public static final native void _gdk_region_union(long /*int*/ source1, long /*int*/ source2);
@@ -17966,10 +14903,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_union(source1, source2);
-@@ -3318,8 +3318,8 @@
- lock.unlock();
- }
- }
+@@ -4368,8 +4368,8 @@
+ * @param region cast=(GdkRegion *)
+ * @param rect cast=(GdkRectangle *),flags=no_out
+ */
-public static final native void _gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect);
-public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect) {
+public static final native void _gdk_region_union_with_rect(long /*int*/ region, GdkRectangle rect);
@@ -17977,10 +14914,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_region_union_with_rect(region, rect);
-@@ -3336,8 +3336,8 @@
- lock.unlock();
+@@ -4387,8 +4387,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gdk_screen_get_default();
-public static final int /*long*/ gdk_screen_get_default() {
+public static final native long /*int*/ _gdk_screen_get_default();
@@ -17988,10 +14925,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_screen_get_default();
-@@ -3345,8 +3345,8 @@
- lock.unlock();
- }
- }
+@@ -4402,8 +4402,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native int _gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y);
-public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y) {
+public static final native int _gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y);
@@ -17999,10 +14936,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_screen_get_monitor_at_point (screen, x, y);
-@@ -3354,8 +3354,8 @@
- lock.unlock();
- }
- }
+@@ -4416,8 +4416,8 @@
+ * @param screen cast=(GdkScreen *)
+ * @param window cast=(GdkWindow *)
+ */
-public static final native int _gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window);
-public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window) {
+public static final native int _gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window);
@@ -18010,10 +14947,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_screen_get_monitor_at_window(screen, window);
-@@ -3363,8 +3363,8 @@
- lock.unlock();
- }
- }
+@@ -4430,8 +4430,8 @@
+ * @param screen cast=(GdkScreen *)
+ * @param dest flags=no_in
+ */
-public static final native void _gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest);
-public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest) {
+public static final native void _gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest);
@@ -18021,10 +14958,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_screen_get_monitor_geometry(screen, monitor_num, dest);
-@@ -3372,8 +3372,8 @@
- lock.unlock();
- }
- }
+@@ -4443,8 +4443,8 @@
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ */
-public static final native int _gdk_screen_get_n_monitors(int /*long*/ screen);
-public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
+public static final native int _gdk_screen_get_n_monitors(long /*int*/ screen);
@@ -18032,10 +14969,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_screen_get_n_monitors(screen);
-@@ -3381,8 +3381,8 @@
- lock.unlock();
- }
- }
+@@ -4456,8 +4456,8 @@
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ */
-public static final native int _gdk_screen_get_number(int /*long*/ screen);
-public static final int gdk_screen_get_number(int /*long*/ screen) {
+public static final native int _gdk_screen_get_number(long /*int*/ screen);
@@ -18043,10 +14980,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_screen_get_number(screen);
-@@ -3426,8 +3426,8 @@
- lock.unlock();
- }
- }
+@@ -4509,8 +4509,8 @@
+ * @param ctext cast=(guchar **)
+ * @param length cast=(gint *)
+ */
-public static final native boolean _gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length);
-public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length) {
+public static final native boolean _gdk_utf8_to_compound_text(byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length);
@@ -18054,10 +14991,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length);
-@@ -3435,8 +3435,8 @@
- lock.unlock();
+@@ -4519,8 +4519,8 @@
}
}
+ /** @param str cast=(const gchar *) */
-public static final native int /*long*/ _gdk_utf8_to_string_target(byte[] str);
-public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
+public static final native long /*int*/ _gdk_utf8_to_string_target(byte[] str);
@@ -18065,10 +15002,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_utf8_to_string_target(str);
-@@ -3444,8 +3444,8 @@
- lock.unlock();
- }
- }
+@@ -4533,8 +4533,8 @@
+ * @param text cast=(guchar *)
+ * @param list cast=(gchar ***)
+ */
-public static final native int _gdk_text_property_to_utf8_list (int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list);
-public static final int gdk_text_property_to_utf8_list (int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list) {
+public static final native int _gdk_text_property_to_utf8_list (long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list);
@@ -18076,10 +15013,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_text_property_to_utf8_list(encoding, format, text, length, list);
-@@ -3453,8 +3453,8 @@
- lock.unlock();
- }
- }
+@@ -4546,8 +4546,8 @@
+ * @method flags=dynamic
+ * @param display cast=(GdkDisplay*)
+ */
-public static final native void _gtk_tooltip_trigger_tooltip_query (int /*long*/ display);
-public static final void gtk_tooltip_trigger_tooltip_query (int /*long*/ display){
+public static final native void _gtk_tooltip_trigger_tooltip_query (long /*int*/ display);
@@ -18087,7 +15024,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tooltip_trigger_tooltip_query (display);
-@@ -3472,8 +3472,8 @@
+@@ -4565,8 +4565,8 @@
lock.unlock();
}
}
@@ -18098,10 +15035,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_visual_get_system();
-@@ -3481,8 +3481,8 @@
- lock.unlock();
- }
- }
+@@ -4578,8 +4578,8 @@
+ * @param win_x cast=(gint *)
+ * @param win_y cast=(gint *)
+ */
-public static final native int /*long*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);
-public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y) {
+public static final native long /*int*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);
@@ -18109,10 +15046,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_at_pointer(win_x, win_y);
-@@ -3490,8 +3490,8 @@
- lock.unlock();
- }
- }
+@@ -4591,8 +4591,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_out
+ */
-public static final native void _gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle);
-public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle) {
+public static final native void _gdk_window_begin_paint_rect(long /*int*/ window, GdkRectangle rectangle);
@@ -18120,10 +15057,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_begin_paint_rect(window, rectangle);
-@@ -3499,8 +3499,8 @@
- lock.unlock();
+@@ -4601,8 +4601,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_clear_area(int /*long*/ window, int x, int y, int width, int height);
-public static final void gdk_window_clear_area(int /*long*/ window, int x, int y, int width, int height) {
+public static final native void _gdk_window_clear_area(long /*int*/ window, int x, int y, int width, int height);
@@ -18131,10 +15068,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_clear_area(window, x, y, width, height);
-@@ -3508,8 +3508,8 @@
- lock.unlock();
+@@ -4611,8 +4611,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_destroy(int /*long*/ window);
-public static final void gdk_window_destroy(int /*long*/ window) {
+public static final native void _gdk_window_destroy(long /*int*/ window);
@@ -18142,10 +15079,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_destroy(window);
-@@ -3517,8 +3517,8 @@
- lock.unlock();
+@@ -4621,8 +4621,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_end_paint(int /*long*/ window);
-public static final void gdk_window_end_paint(int /*long*/ window) {
+public static final native void _gdk_window_end_paint(long /*int*/ window);
@@ -18153,10 +15090,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_end_paint(window);
-@@ -3526,8 +3526,8 @@
- lock.unlock();
+@@ -4631,8 +4631,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native int /*long*/ _gdk_window_get_children(int /*long*/ window);
-public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
+public static final native long /*int*/ _gdk_window_get_children(long /*int*/ window);
@@ -18164,10 +15101,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_get_children(window);
-@@ -3535,8 +3535,8 @@
- lock.unlock();
+@@ -4641,8 +4641,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native int _gdk_window_get_events(int /*long*/ window);
-public static final int gdk_window_get_events(int /*long*/ window) {
+public static final native int _gdk_window_get_events(long /*int*/ window);
@@ -18175,10 +15112,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_get_events(window);
-@@ -3544,8 +3544,8 @@
- lock.unlock();
+@@ -4651,8 +4651,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_focus(int /*long*/ window, int timestamp);
-public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
+public static final native void _gdk_window_focus(long /*int*/ window, int timestamp);
@@ -18186,10 +15123,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_focus(window, timestamp);
-@@ -3553,8 +3553,8 @@
- lock.unlock();
+@@ -4661,8 +4661,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_freeze_updates(int /*long*/ window);
-public static final void gdk_window_freeze_updates(int /*long*/ window) {
+public static final native void _gdk_window_freeze_updates(long /*int*/ window);
@@ -18197,10 +15134,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_freeze_updates(window);
-@@ -3562,8 +3562,8 @@
- lock.unlock();
- }
- }
+@@ -4674,8 +4674,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param rect cast=(GdkRectangle *),flags=no_in
+ */
-public static final native void _gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect);
-public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect) {
+public static final native void _gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect);
@@ -18208,10 +15145,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_get_frame_extents(window, rect);
-@@ -3571,8 +3571,8 @@
- lock.unlock();
- }
- }
+@@ -4689,8 +4689,8 @@
+ * @param x_offset cast=(gint *)
+ * @param y_offset cast=(gint *)
+ */
-public static final native void _gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset);
-public static final void gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset) {
+public static final native void _gdk_window_get_internal_paint_info(long /*int*/ window, long /*int*/ [] real_drawable, int[] x_offset, int[] y_offset);
@@ -18219,10 +15156,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset);
-@@ -3580,8 +3580,8 @@
- lock.unlock();
- }
- }
+@@ -4703,8 +4703,8 @@
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
-public static final native int _gdk_window_get_origin(int /*long*/ window, int[] x, int[] y);
-public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[] y) {
+public static final native int _gdk_window_get_origin(long /*int*/ window, int[] x, int[] y);
@@ -18230,10 +15167,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_get_origin(window, x, y);
-@@ -3589,8 +3589,8 @@
- lock.unlock();
+@@ -4713,8 +4713,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native int /*long*/ _gdk_window_get_parent(int /*long*/ window);
-public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
+public static final native long /*int*/ _gdk_window_get_parent(long /*int*/ window);
@@ -18241,10 +15178,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_get_parent(window);
-@@ -3598,8 +3598,8 @@
- lock.unlock();
- }
- }
+@@ -4728,8 +4728,8 @@
+ * @param y cast=(gint *)
+ * @param mask cast=(GdkModifierType *)
+ */
-public static final native int /*long*/ _gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask);
-public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask) {
+public static final native long /*int*/ _gdk_window_get_pointer(long /*int*/ window, int[] x, int[] y, int[] mask);
@@ -18252,10 +15189,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_get_pointer(window, x, y, mask);
-@@ -3607,8 +3607,8 @@
- lock.unlock();
- }
- }
+@@ -4742,8 +4742,8 @@
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
-public static final native void _gdk_window_get_position(int /*long*/ window, int[] x, int[] y);
-public static final void gdk_window_get_position(int /*long*/ window, int[] x, int[] y) {
+public static final native void _gdk_window_get_position(long /*int*/ window, int[] x, int[] y);
@@ -18263,10 +15200,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_get_position(window, x, y);
-@@ -3616,8 +3616,8 @@
- lock.unlock();
- }
- }
+@@ -4755,8 +4755,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param data cast=(gpointer *)
+ */
-public static final native void _gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data);
-public static final void gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data) {
+public static final native void _gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data);
@@ -18274,10 +15211,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_get_user_data(window, data);
-@@ -3625,8 +3625,8 @@
- lock.unlock();
+@@ -4765,8 +4765,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_hide(int /*long*/ window);
-public static final void gdk_window_hide(int /*long*/ window) {
+public static final native void _gdk_window_hide(long /*int*/ window);
@@ -18285,10 +15222,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_hide(window);
-@@ -3634,8 +3634,8 @@
- lock.unlock();
- }
- }
+@@ -4779,8 +4779,8 @@
+ * @param rectangle cast=(GdkRectangle *),flags=no_out
+ * @param invalidate_children cast=(gboolean)
+ */
-public static final native void _gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children);
-public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children) {
+public static final native void _gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children);
@@ -18296,10 +15233,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_invalidate_rect(window, rectangle, invalidate_children);
-@@ -3643,8 +3643,8 @@
- lock.unlock();
- }
- }
+@@ -4793,8 +4793,8 @@
+ * @param region cast=(GdkRegion *)
+ * @param invalidate_children cast=(gboolean)
+ */
-public static final native void _gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children);
-public static final void gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children) {
+public static final native void _gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children);
@@ -18307,10 +15244,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_invalidate_region(window, region, invalidate_children);
-@@ -3652,8 +3652,8 @@
- lock.unlock();
+@@ -4803,8 +4803,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native boolean _gdk_window_is_visible(int /*long*/ window);
-public static final boolean gdk_window_is_visible(int /*long*/ window) {
+public static final native boolean _gdk_window_is_visible(long /*int*/ window);
@@ -18318,10 +15255,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_is_visible(window);
-@@ -3661,8 +3661,8 @@
- lock.unlock();
+@@ -4813,8 +4813,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_move(int /*long*/ window, int x, int y);
-public static final void gdk_window_move(int /*long*/ window, int x, int y) {
+public static final native void _gdk_window_move(long /*int*/ window, int x, int y);
@@ -18329,10 +15266,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_move(window, x, y);
-@@ -3670,8 +3670,8 @@
- lock.unlock();
- }
- }
+@@ -4826,8 +4826,8 @@
+ * @param parent cast=(GdkWindow *)
+ * @param attributes flags=no_out
+ */
-public static final native int /*long*/ _gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask);
-public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask) {
+public static final native long /*int*/ _gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask);
@@ -18340,10 +15277,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gdk_window_new(parent, attributes, attributes_mask);
-@@ -3679,8 +3679,8 @@
- lock.unlock();
+@@ -4836,8 +4836,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_lower(int /*long*/ window);
-public static final void gdk_window_lower(int /*long*/ window) {
+public static final native void _gdk_window_lower(long /*int*/ window);
@@ -18351,10 +15288,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_lower(window);
-@@ -3697,8 +3697,8 @@
- lock.unlock();
- }
- }
+@@ -4858,8 +4858,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param update_children cast=(gboolean)
+ */
-public static final native void _gdk_window_process_updates(int /*long*/ window, boolean update_children);
-public static final void gdk_window_process_updates(int /*long*/ window, boolean update_children) {
+public static final native void _gdk_window_process_updates(long /*int*/ window, boolean update_children);
@@ -18362,10 +15299,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_process_updates(window, update_children);
-@@ -3706,8 +3706,8 @@
- lock.unlock();
+@@ -4868,8 +4868,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_raise(int /*long*/ window);
-public static final void gdk_window_raise(int /*long*/ window) {
+public static final native void _gdk_window_raise(long /*int*/ window);
@@ -18373,10 +15310,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_raise(window);
-@@ -3715,8 +3715,8 @@
- lock.unlock();
+@@ -4878,8 +4878,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_resize(int /*long*/ window, int width, int height);
-public static final void gdk_window_resize(int /*long*/ window, int width, int height) {
+public static final native void _gdk_window_resize(long /*int*/ window, int width, int height);
@@ -18384,10 +15321,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_resize(window, width, height);
-@@ -3724,8 +3724,8 @@
- lock.unlock();
+@@ -4888,8 +4888,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
-public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {
+public static final native void _gdk_window_scroll(long /*int*/ window, int dx, int dy);
@@ -18395,10 +15332,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_scroll(window, dx, dy);
-@@ -3733,8 +3733,8 @@
- lock.unlock();
- }
- }
+@@ -4902,8 +4902,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param accept_focus cast=(gboolean)
+ */
-public static final native void _gdk_window_set_accept_focus(int /*long*/ window, boolean accept_focus);
-public static final void gdk_window_set_accept_focus(int /*long*/ window, boolean accept_focus) {
+public static final native void _gdk_window_set_accept_focus(long /*int*/ window, boolean accept_focus);
@@ -18406,10 +15343,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_accept_focus(window, accept_focus);
-@@ -3742,8 +3742,8 @@
- lock.unlock();
- }
- }
+@@ -4916,8 +4916,8 @@
+ * @param pixmap cast=(GdkPixmap *)
+ * @param parent_relative cast=(gboolean)
+ */
-public static final native void _gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative);
-public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative) {
+public static final native void _gdk_window_set_back_pixmap(long /*int*/ window, long /*int*/ pixmap, boolean parent_relative);
@@ -18417,10 +15354,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_back_pixmap(window, pixmap, parent_relative);
-@@ -3751,8 +3751,8 @@
- lock.unlock();
- }
- }
+@@ -4929,8 +4929,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param cursor cast=(GdkCursor *)
+ */
-public static final native void _gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor);
-public static final void gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor) {
+public static final native void _gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor);
@@ -18428,10 +15365,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_cursor(window, cursor);
-@@ -3769,8 +3769,8 @@
- lock.unlock();
- }
- }
+@@ -4952,8 +4952,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param decorations cast=(GdkWMDecoration)
+ */
-public static final native void _gdk_window_set_decorations(int /*long*/ window, int decorations);
-public static final void gdk_window_set_decorations(int /*long*/ window, int decorations) {
+public static final native void _gdk_window_set_decorations(long /*int*/ window, int decorations);
@@ -18439,10 +15376,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_decorations(window, decorations);
-@@ -3778,8 +3778,8 @@
- lock.unlock();
+@@ -4962,8 +4962,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_set_events(int /*long*/ window, int event_mask);
-public static final void gdk_window_set_events(int /*long*/ window, int event_mask) {
+public static final native void _gdk_window_set_events(long /*int*/ window, int event_mask);
@@ -18450,10 +15387,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_events(window, event_mask);
-@@ -3787,8 +3787,8 @@
- lock.unlock();
- }
- }
+@@ -4977,8 +4977,8 @@
+ * @param pixmap cast=(GdkPixmap *)
+ * @param mask cast=(GdkBitmap *)
+ */
-public static final native void _gdk_window_set_icon(int /*long*/ window, int /*long*/ icon_window, int /*long*/ pixmap, int /*long*/ mask);
-public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ icon_window, int /*long*/ pixmap, int /*long*/ mask) {
+public static final native void _gdk_window_set_icon(long /*int*/ window, long /*int*/ icon_window, long /*int*/ pixmap, long /*int*/ mask);
@@ -18461,10 +15398,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_icon(window, icon_window, pixmap, mask);
-@@ -3796,8 +3796,8 @@
- lock.unlock();
- }
- }
+@@ -4990,8 +4990,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param pixbufs cast=(GList *)
+ */
-public static final native void _gdk_window_set_icon_list(int /*long*/ window, int /*long*/ pixbufs);
-public static final void gdk_window_set_icon_list(int /*long*/ window, int /*long*/ pixbufs) {
+public static final native void _gdk_window_set_icon_list(long /*int*/ window, long /*int*/ pixbufs);
@@ -18472,10 +15409,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_icon_list(window, pixbufs);
-@@ -3805,8 +3805,8 @@
- lock.unlock();
- }
- }
+@@ -5004,8 +5004,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gdk_window_set_keep_above(int /*long*/ window, boolean setting);
-public static final void gdk_window_set_keep_above(int /*long*/ window, boolean setting) {
+public static final native void _gdk_window_set_keep_above(long /*int*/ window, boolean setting);
@@ -18483,10 +15420,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_keep_above(window, setting);
-@@ -3814,8 +3814,8 @@
- lock.unlock();
- }
- }
+@@ -5017,8 +5017,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param override_redirect cast=(gboolean)
+ */
-public static final native void _gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect);
-public static final void gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect) {
+public static final native void _gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect);
@@ -18494,10 +15431,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_override_redirect(window, override_redirect);
-@@ -3823,8 +3823,8 @@
- lock.unlock();
- }
- }
+@@ -5030,8 +5030,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param user_data cast=(gpointer)
+ */
-public static final native void _gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data);
-public static final void gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data) {
+public static final native void _gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data);
@@ -18505,10 +15442,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_set_user_data(window, user_data);
-@@ -3832,8 +3832,8 @@
- lock.unlock();
- }
- }
+@@ -5043,8 +5043,8 @@
+ * @param window cast=(GdkWindow *)
+ * @param shape_region cast=(GdkRegion *)
+ */
-public static final native void _gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y);
-public static final void gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y) {
+public static final native void _gdk_window_shape_combine_region (long /*int*/ window, long /*int*/ shape_region, int offset_x, int offset_y);
@@ -18516,10 +15453,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y);
-@@ -3841,8 +3841,8 @@
- lock.unlock();
+@@ -5053,8 +5053,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_show(int /*long*/ window);
-public static final void gdk_window_show(int /*long*/ window) {
+public static final native void _gdk_window_show(long /*int*/ window);
@@ -18527,10 +15464,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_show(window);
-@@ -3850,8 +3850,8 @@
- lock.unlock();
+@@ -5063,8 +5063,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_show_unraised(int /*long*/ window);
-public static final void gdk_window_show_unraised(int /*long*/ window) {
+public static final native void _gdk_window_show_unraised(long /*int*/ window);
@@ -18538,10 +15475,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_show_unraised(window);
-@@ -3859,8 +3859,8 @@
- lock.unlock();
+@@ -5073,8 +5073,8 @@
}
}
+ /** @param window cast=(GdkWindow *) */
-public static final native void _gdk_window_thaw_updates(int /*long*/ window);
-public static final void gdk_window_thaw_updates(int /*long*/ window) {
+public static final native void _gdk_window_thaw_updates(long /*int*/ window);
@@ -18549,7 +15486,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gdk_window_thaw_updates(window);
-@@ -3868,8 +3868,8 @@
+@@ -5082,8 +5082,8 @@
lock.unlock();
}
}
@@ -18560,10 +15497,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_accel_group_new();
-@@ -3877,8 +3877,8 @@
- lock.unlock();
- }
- }
+@@ -5096,8 +5096,8 @@
+ * @param accelKey cast=(guint)
+ * @param accelMods cast=(GdkModifierType)
+ */
-public static final native boolean _gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods);
-public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods) {
+public static final native boolean _gtk_accel_groups_activate(long /*int*/ accelGroup, int accelKey, int accelMods);
@@ -18571,10 +15508,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods);
-@@ -3886,8 +3886,8 @@
- lock.unlock();
- }
- }
+@@ -5109,8 +5109,8 @@
+ * @param accel_label cast=(GtkAccelLabel *)
+ * @param accel_widget cast=(GtkWidget *)
+ */
-public static final native void _gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget);
-public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget) {
+public static final native void _gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget);
@@ -18582,10 +15519,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_accel_label_set_accel_widget(accel_label, accel_widget);
-@@ -3895,8 +3895,8 @@
- lock.unlock();
+@@ -5119,8 +5119,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native void _gtk_adjustment_changed(int /*long*/ adjustment);
-public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
+public static final native void _gtk_adjustment_changed(long /*int*/ adjustment);
@@ -18593,10 +15530,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_adjustment_changed(adjustment);
-@@ -3904,8 +3904,8 @@
- lock.unlock();
- }
- }
+@@ -5135,8 +5135,8 @@
+ * @param step_increment cast=(gdouble)
+ * @param page_increment cast=(gdouble)
+ */
-public static final native int /*long*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
-public static final int /*long*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
+public static final native long /*int*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
@@ -18604,10 +15541,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-@@ -3913,8 +3913,8 @@
- lock.unlock();
- }
- }
+@@ -5148,8 +5148,8 @@
+ * @param adjustment cast=(GtkAdjustment *)
+ * @param value cast=(gdouble)
+ */
-public static final native void _gtk_adjustment_set_value(int /*long*/ adjustment, double value);
-public static final void gtk_adjustment_set_value(int /*long*/ adjustment, double value) {
+public static final native void _gtk_adjustment_set_value(long /*int*/ adjustment, double value);
@@ -18615,10 +15552,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_adjustment_set_value(adjustment, value);
-@@ -3922,8 +3922,8 @@
- lock.unlock();
+@@ -5158,8 +5158,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native void _gtk_adjustment_value_changed(int /*long*/ adjustment);
-public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
+public static final native void _gtk_adjustment_value_changed(long /*int*/ adjustment);
@@ -18626,10 +15563,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_adjustment_value_changed(adjustment);
-@@ -3931,8 +3931,8 @@
- lock.unlock();
- }
- }
+@@ -5171,8 +5171,8 @@
+ * @param arrow_type cast=(GtkArrowType)
+ * @param shadow_type cast=(GtkShadowType)
+ */
-public static final native int /*long*/ _gtk_arrow_new(int arrow_type, int shadow_type);
-public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type) {
+public static final native long /*int*/ _gtk_arrow_new(int arrow_type, int shadow_type);
@@ -18637,10 +15574,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_arrow_new(arrow_type, shadow_type);
-@@ -3940,8 +3940,8 @@
- lock.unlock();
- }
- }
+@@ -5185,8 +5185,8 @@
+ * @param arrow_type cast=(GtkArrowType)
+ * @param shadow_type cast=(GtkShadowType)
+ */
-public static final native void _gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type);
-public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type) {
+public static final native void _gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type);
@@ -18648,10 +15585,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_arrow_set(arrow, arrow_type, shadow_type);
-@@ -3949,8 +3949,8 @@
- lock.unlock();
+@@ -5195,8 +5195,8 @@
}
}
+ /** @param bin cast=(GtkBin *) */
-public static final native int /*long*/ _gtk_bin_get_child(int /*long*/ bin);
-public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
+public static final native long /*int*/ _gtk_bin_get_child(long /*int*/ bin);
@@ -18659,10 +15596,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_bin_get_child(bin);
-@@ -3958,8 +3958,8 @@
- lock.unlock();
+@@ -5205,8 +5205,8 @@
}
}
+ /** @param border cast=(GtkBorder *) */
+-public static final native void _gtk_border_free(int /*long*/ border);
+-public static final void gtk_border_free(int /*long*/ border) {
++public static final native void _gtk_border_free(long /*int*/ border);
++public static final void gtk_border_free(long /*int*/ border) {
+ lock.lock();
+ try {
+ _gtk_border_free(border);
+@@ -5215,8 +5215,8 @@
+ }
+ }
+ /** @param box cast=(GtkBox *) */
-public static final native void _gtk_box_set_spacing(int /*long*/ box, int spacing);
-public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
+public static final native void _gtk_box_set_spacing(long /*int*/ box, int spacing);
@@ -18670,10 +15618,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_box_set_spacing(box, spacing);
-@@ -3967,8 +3967,8 @@
- lock.unlock();
- }
- }
+@@ -5228,8 +5228,8 @@
+ * @param box cast=(GtkBox *)
+ * @param child cast=(GtkWidget *)
+ */
-public static final native void _gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type);
-public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type) {
+public static final native void _gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type);
@@ -18681,10 +15629,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type);
-@@ -3976,8 +3976,8 @@
- lock.unlock();
+@@ -5238,8 +5238,8 @@
}
}
+ /** @param button cast=(GtkButton *) */
-public static final native void _gtk_button_clicked(int /*long*/ button);
-public static final void gtk_button_clicked(int /*long*/ button) {
+public static final native void _gtk_button_clicked(long /*int*/ button);
@@ -18692,10 +15640,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_button_clicked(button);
-@@ -3985,8 +3985,8 @@
- lock.unlock();
+@@ -5248,8 +5248,8 @@
}
}
+ /** @param button cast=(GtkButton *) */
-public static final native int _gtk_button_get_relief(int /*long*/ button);
-public static final int gtk_button_get_relief(int /*long*/ button) {
+public static final native int _gtk_button_get_relief(long /*int*/ button);
@@ -18703,7 +15651,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_button_get_relief(button);
-@@ -3994,8 +3994,8 @@
+@@ -5257,8 +5257,8 @@
lock.unlock();
}
}
@@ -18714,10 +15662,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_button_new();
-@@ -4003,8 +4003,8 @@
- lock.unlock();
- }
- }
+@@ -5270,8 +5270,8 @@
+ * @param button cast=(GtkButton *)
+ * @param newstyle cast=(GtkReliefStyle)
+ */
-public static final native void _gtk_button_set_relief(int /*long*/ button, int newstyle);
-public static final void gtk_button_set_relief(int /*long*/ button, int newstyle) {
+public static final native void _gtk_button_set_relief(long /*int*/ button, int newstyle);
@@ -18725,10 +15673,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_button_set_relief(button, newstyle);
-@@ -4012,8 +4012,8 @@
- lock.unlock();
+@@ -5280,8 +5280,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_calendar_new();
-public static final int /*long*/ gtk_calendar_new() {
+public static final native long /*int*/ _gtk_calendar_new();
@@ -18736,10 +15684,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_calendar_new();
-@@ -4021,8 +4021,8 @@
- lock.unlock();
- }
- }
+@@ -5295,8 +5295,8 @@
+ * @param month cast=(guint)
+ * @param year cast=(guint)
+ */
-public static final native boolean /*long*/ _gtk_calendar_select_month(int /*long*/ calendar, int month, int year);
-public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ calendar, int month, int year) {
+public static final native boolean /*long*/ _gtk_calendar_select_month(long /*int*/ calendar, int month, int year);
@@ -18747,10 +15695,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_calendar_select_month(calendar, month, year);
-@@ -4030,8 +4030,8 @@
- lock.unlock();
- }
- }
+@@ -5309,8 +5309,8 @@
+ * @param calendar cast=(GtkCalendar *)
+ * @param day cast=(guint)
+ */
-public static final native void _gtk_calendar_select_day(int /*long*/ calendar, int day);
-public static final void gtk_calendar_select_day(int /*long*/ calendar, int day) {
+public static final native void _gtk_calendar_select_day(long /*int*/ calendar, int day);
@@ -18758,10 +15706,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_calendar_select_day(calendar, day);
-@@ -4039,8 +4039,8 @@
- lock.unlock();
- }
- }
+@@ -5323,8 +5323,8 @@
+ * @param calendar cast=(GtkCalendar *)
+ * @param flags cast=(GtkCalendarDisplayOptions)
+ */
-public static final native void _gtk_calendar_set_display_options(int /*long*/ calendar, int flags);
-public static final void gtk_calendar_set_display_options(int /*long*/ calendar, int flags) {
+public static final native void _gtk_calendar_set_display_options(long /*int*/ calendar, int flags);
@@ -18769,10 +15717,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_calendar_set_display_options(calendar, flags);
-@@ -4048,8 +4048,8 @@
- lock.unlock();
- }
- }
+@@ -5337,8 +5337,8 @@
+ * @param calendar cast=(GtkCalendar *)
+ * @param flags cast=(GtkCalendarDisplayOptions)
+ */
-public static final native void _gtk_calendar_display_options(int /*long*/ calendar, int flags);
-public static final void gtk_calendar_display_options(int /*long*/ calendar, int flags) {
+public static final native void _gtk_calendar_display_options(long /*int*/ calendar, int flags);
@@ -18780,10 +15728,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_calendar_display_options(calendar, flags);
-@@ -4057,8 +4057,8 @@
- lock.unlock();
- }
- }
+@@ -5353,8 +5353,8 @@
+ * @param month cast=(guint *)
+ * @param day cast=(guint *)
+ */
-public static final native void _gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day);
-public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day) {
+public static final native void _gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day);
@@ -18791,10 +15739,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_calendar_get_date(calendar, year, month, day);
-@@ -4066,8 +4066,8 @@
- lock.unlock();
+@@ -5363,8 +5363,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_cell_layout_clear(int /*long*/ cell_layout);
-public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
+public static final native void _gtk_cell_layout_clear(long /*int*/ cell_layout);
@@ -18802,10 +15750,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_cell_layout_clear(cell_layout);
-@@ -4075,8 +4075,8 @@
- lock.unlock();
+@@ -5373,8 +5373,8 @@
}
}
+ /** @method flags=no_gen */
-public static final native void _gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel);
-public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel) {
+public static final native void _gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel);
@@ -18813,10 +15761,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel);
-@@ -4084,8 +4084,8 @@
- lock.unlock();
+@@ -5383,8 +5383,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand);
-public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand) {
+public static final native void _gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand);
@@ -18824,10 +15772,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_cell_layout_pack_start(cell_layout, cell, expand);
-@@ -4093,8 +4093,8 @@
- lock.unlock();
- }
- }
+@@ -5401,8 +5401,8 @@
+ * @param width cast=(gint *)
+ * @param height cast=(gint *)
+ */
-public static final native void _gtk_cell_renderer_get_size(int /*long*/ cell, int /*long*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
-public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*long*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
+public static final native void _gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
@@ -18835,7 +15783,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height);
-@@ -4102,8 +4102,8 @@
+@@ -5410,8 +5410,8 @@
lock.unlock();
}
}
@@ -18846,7 +15794,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_cell_renderer_pixbuf_new();
-@@ -4111,8 +4111,8 @@
+@@ -5419,8 +5419,8 @@
lock.unlock();
}
}
@@ -18857,7 +15805,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_cell_renderer_text_new();
-@@ -4120,8 +4120,8 @@
+@@ -5428,8 +5428,8 @@
lock.unlock();
}
}
@@ -18868,7 +15816,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_cell_renderer_toggle_new();
-@@ -4129,8 +4129,8 @@
+@@ -5437,8 +5437,8 @@
lock.unlock();
}
}
@@ -18879,10 +15827,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_check_button_new();
-@@ -4138,8 +4138,8 @@
- lock.unlock();
+@@ -5447,8 +5447,8 @@
}
}
+ /** @param check_menu_item cast=(GtkCheckMenuItem *) */
-public static final native boolean _gtk_check_menu_item_get_active(int /*long*/ check_menu_item);
-public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_menu_item) {
+public static final native boolean _gtk_check_menu_item_get_active(long /*int*/ check_menu_item);
@@ -18890,10 +15838,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_check_menu_item_get_active(check_menu_item);
-@@ -4147,8 +4147,8 @@
- lock.unlock();
+@@ -5457,8 +5457,8 @@
}
}
+ /** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_check_menu_item_new_with_label(byte[] label);
-public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label) {
+public static final native long /*int*/ _gtk_check_menu_item_new_with_label(byte[] label);
@@ -18901,10 +15849,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_check_menu_item_new_with_label(label);
-@@ -4156,8 +4156,8 @@
- lock.unlock();
- }
- }
+@@ -5470,8 +5470,8 @@
+ * @param wid cast=(GtkCheckMenuItem *)
+ * @param active cast=(gboolean)
+ */
-public static final native void _gtk_check_menu_item_set_active(int /*long*/ wid, boolean active);
-public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolean active) {
+public static final native void _gtk_check_menu_item_set_active(long /*int*/ wid, boolean active);
@@ -18912,7 +15860,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_check_menu_item_set_active(wid, active);
-@@ -4165,8 +4165,8 @@
+@@ -5479,8 +5479,8 @@
lock.unlock();
}
}
@@ -18923,10 +15871,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_check_version(required_major, required_minor, required_micro);
-@@ -4174,8 +4174,8 @@
- lock.unlock();
+@@ -5489,8 +5489,8 @@
}
}
+ /** @param clipboard cast=(GtkClipboard *) */
-public static final native void _gtk_clipboard_clear(int /*long*/ clipboard);
-public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
+public static final native void _gtk_clipboard_clear(long /*int*/ clipboard);
@@ -18934,10 +15882,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_clipboard_clear(clipboard);
-@@ -4183,8 +4183,8 @@
- lock.unlock();
+@@ -5499,8 +5499,8 @@
}
}
+ /** @param selection cast=(GdkAtom) */
-public static final native int /*long*/ _gtk_clipboard_get(int /*long*/ selection);
-public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
+public static final native long /*int*/ _gtk_clipboard_get(long /*int*/ selection);
@@ -18945,10 +15893,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_clipboard_get(selection);
-@@ -4192,8 +4192,8 @@
- lock.unlock();
- }
- }
+@@ -5516,8 +5516,8 @@
+ * @param clear_func cast=(GtkClipboardClearFunc)
+ * @param user_data cast=(GObject *)
+ */
-public static final native boolean _gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data);
-public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data) {
+public static final native boolean _gtk_clipboard_set_with_data(long /*int*/ clipboard, long /*int*/ target, int n_targets, long /*int*/ get_func, long /*int*/ clear_func, long /*int*/ user_data);
@@ -18956,10 +15904,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data);
-@@ -4201,8 +4201,8 @@
- lock.unlock();
- }
- }
+@@ -5529,8 +5529,8 @@
+ * @param clipboard cast=(GtkClipboard *)
+ * @param target cast=(GdkAtom)
+ */
-public static final native int /*long*/ _gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target);
-public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) {
+public static final native long /*int*/ _gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target);
@@ -18967,10 +15915,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_clipboard_wait_for_contents(clipboard, target);
-@@ -4210,8 +4210,8 @@
- lock.unlock();
+@@ -5539,8 +5539,8 @@
}
}
+ /** @param title cast=(const gchar *) */
-public static final native int /*long*/ _gtk_color_selection_dialog_new(byte[] title);
-public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
+public static final native long /*int*/ _gtk_color_selection_dialog_new(byte[] title);
@@ -18978,10 +15926,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_color_selection_dialog_new(title);
-@@ -4219,8 +4219,8 @@
- lock.unlock();
- }
- }
+@@ -5552,8 +5552,8 @@
+ * @param colorsel cast=(GtkColorSelection *)
+ * @param color cast=(GdkColor *),flags=no_in
+ */
-public static final native void _gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color);
-public static final void gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color) {
+public static final native void _gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color);
@@ -18989,10 +15937,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_color_selection_get_current_color(colorsel, color);
-@@ -4228,8 +4228,8 @@
- lock.unlock();
- }
- }
+@@ -5565,8 +5565,8 @@
+ * @param colorsel cast=(GtkColorSelection *)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color);
-public static final void gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color) {
+public static final native void _gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color);
@@ -19000,10 +15948,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_color_selection_set_current_color(colorsel, color);
-@@ -4237,8 +4237,8 @@
- lock.unlock();
+@@ -5575,8 +5575,8 @@
}
}
+ /** @param colorsel cast=(GtkColorSelection *) */
-public static final native void _gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette);
-public static final void gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette) {
+public static final native void _gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette);
@@ -19011,10 +15959,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_color_selection_set_has_palette(colorsel, has_palette);
-@@ -4246,8 +4246,8 @@
- lock.unlock();
+@@ -5585,8 +5585,8 @@
}
}
+ /** @param combo cast=(GtkCombo *) */
-public static final native void _gtk_combo_disable_activate(int /*long*/ combo);
-public static final void gtk_combo_disable_activate(int /*long*/ combo) {
+public static final native void _gtk_combo_disable_activate(long /*int*/ combo);
@@ -19022,7 +15970,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_disable_activate(combo);
-@@ -4255,8 +4255,8 @@
+@@ -5594,8 +5594,8 @@
lock.unlock();
}
}
@@ -19033,10 +15981,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_combo_new();
-@@ -4264,8 +4264,8 @@
- lock.unlock();
- }
- }
+@@ -5607,8 +5607,8 @@
+ * @param combo cast=(GtkCombo *)
+ * @param val cast=(gboolean)
+ */
-public static final native void _gtk_combo_set_case_sensitive(int /*long*/ combo, boolean val);
-public static final void gtk_combo_set_case_sensitive(int /*long*/ combo, boolean val) {
+public static final native void _gtk_combo_set_case_sensitive(long /*int*/ combo, boolean val);
@@ -19044,10 +15992,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_set_case_sensitive(combo, val);
-@@ -4273,8 +4273,8 @@
- lock.unlock();
+@@ -5617,8 +5617,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val);
-public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val) {
+public static final native void _gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val);
@@ -19055,10 +16003,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_box_set_focus_on_click(combo, val);
-@@ -4282,8 +4282,8 @@
- lock.unlock();
- }
- }
+@@ -5630,8 +5630,8 @@
+ * @param combo cast=(GtkCombo *)
+ * @param strings cast=(GList *)
+ */
-public static final native void _gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings);
-public static final void gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings) {
+public static final native void _gtk_combo_set_popdown_strings(long /*int*/ combo, long /*int*/ strings);
@@ -19066,10 +16014,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_set_popdown_strings(combo, strings);
-@@ -4291,8 +4291,8 @@
- lock.unlock();
+@@ -5640,8 +5640,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_combo_box_entry_new_text();
-public static final int /*long*/ gtk_combo_box_entry_new_text() {
+public static final native long /*int*/ _gtk_combo_box_entry_new_text();
@@ -19077,10 +16025,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_combo_box_entry_new_text();
-@@ -4300,8 +4300,8 @@
- lock.unlock();
+@@ -5650,8 +5650,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_combo_box_new_text();
-public static final int /*long*/ gtk_combo_box_new_text() {
+public static final native long /*int*/ _gtk_combo_box_new_text();
@@ -19088,10 +16036,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_combo_box_new_text();
-@@ -4309,8 +4309,8 @@
- lock.unlock();
+@@ -5660,8 +5660,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text);
-public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text) {
+public static final native void _gtk_combo_box_insert_text(long /*int*/ combo_box, int position, byte[] text);
@@ -19099,10 +16047,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_box_insert_text(combo_box, position, text);
-@@ -4318,8 +4318,8 @@
- lock.unlock();
+@@ -5670,8 +5670,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_combo_box_remove_text(int /*long*/ combo_box, int position);
-public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int position) {
+public static final native void _gtk_combo_box_remove_text(long /*int*/ combo_box, int position);
@@ -19110,10 +16058,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_box_remove_text(combo_box, position);
-@@ -4327,8 +4327,8 @@
- lock.unlock();
+@@ -5680,8 +5680,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_combo_box_get_active(int /*long*/ combo_box);
-public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
+public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
@@ -19121,10 +16069,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_combo_box_get_active(combo_box);
-@@ -4336,8 +4336,8 @@
- lock.unlock();
+@@ -5690,8 +5690,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_combo_box_get_model(int /*long*/ combo_box);
-public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box) {
+public static final native long /*int*/ _gtk_combo_box_get_model(long /*int*/ combo_box);
@@ -19132,10 +16080,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_combo_box_get_model(combo_box);
-@@ -4345,8 +4345,8 @@
- lock.unlock();
+@@ -5700,8 +5700,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_combo_box_set_active(int /*long*/ combo_box, int index);
-public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int index) {
+public static final native void _gtk_combo_box_set_active(long /*int*/ combo_box, int index);
@@ -19143,10 +16091,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_box_set_active(combo_box, index);
-@@ -4354,8 +4354,8 @@
- lock.unlock();
+@@ -5710,8 +5710,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_combo_box_popup(int /*long*/ combo_box);
-public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
+public static final native void _gtk_combo_box_popup(long /*int*/ combo_box);
@@ -19154,10 +16102,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_box_popup(combo_box);
-@@ -4363,8 +4363,8 @@
- lock.unlock();
+@@ -5720,8 +5720,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_combo_box_popdown(int /*long*/ combo_box);
-public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
+public static final native void _gtk_combo_box_popdown(long /*int*/ combo_box);
@@ -19165,10 +16113,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_combo_box_popdown(combo_box);
-@@ -4372,8 +4372,8 @@
- lock.unlock();
- }
- }
+@@ -5733,8 +5733,8 @@
+ * @param container cast=(GtkContainer *)
+ * @param widget cast=(GtkWidget *)
+ */
-public static final native void _gtk_container_add(int /*long*/ container, int /*long*/ widget);
-public static final void gtk_container_add(int /*long*/ container, int /*long*/ widget) {
+public static final native void _gtk_container_add(long /*int*/ container, long /*int*/ widget);
@@ -19176,10 +16124,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_container_add(container, widget);
-@@ -4381,8 +4381,8 @@
- lock.unlock();
- }
- }
+@@ -5747,8 +5747,8 @@
+ * @param callback cast=(GtkCallback)
+ * @param callback_data cast=(gpointer)
+ */
-public static final native void _gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data);
-public static final void gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data) {
+public static final native void _gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data);
@@ -19187,10 +16135,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_container_forall(container, callback, callback_data);
-@@ -4390,8 +4390,8 @@
- lock.unlock();
+@@ -5757,8 +5757,8 @@
}
}
+ /** @param container cast=(GtkContainer *) */
-public static final native int _gtk_container_get_border_width(int /*long*/ container);
-public static final int gtk_container_get_border_width(int /*long*/ container) {
+public static final native int _gtk_container_get_border_width(long /*int*/ container);
@@ -19198,10 +16146,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_container_get_border_width(container);
-@@ -4399,8 +4399,8 @@
- lock.unlock();
+@@ -5767,8 +5767,8 @@
}
}
+ /** @param container cast=(GtkContainer *) */
-public static final native int /*long*/ _gtk_container_get_children(int /*long*/ container);
-public static final int /*long*/ gtk_container_get_children(int /*long*/ container) {
+public static final native long /*int*/ _gtk_container_get_children(long /*int*/ container);
@@ -19209,10 +16157,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_container_get_children(container);
-@@ -4408,8 +4408,8 @@
- lock.unlock();
- }
- }
+@@ -5780,8 +5780,8 @@
+ * @param container cast=(GtkContainer *)
+ * @param widget cast=(GtkWidget *)
+ */
-public static final native void _gtk_container_remove(int /*long*/ container, int /*long*/ widget);
-public static final void gtk_container_remove(int /*long*/ container, int /*long*/ widget) {
+public static final native void _gtk_container_remove(long /*int*/ container, long /*int*/ widget);
@@ -19220,10 +16168,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_container_remove(container, widget);
-@@ -4417,8 +4417,8 @@
- lock.unlock();
+@@ -5790,8 +5790,8 @@
}
}
+ /** @param container cast=(GtkContainer *) */
-public static final native void _gtk_container_resize_children(int /*long*/ container);
-public static final void gtk_container_resize_children(int /*long*/ container) {
+public static final native void _gtk_container_resize_children(long /*int*/ container);
@@ -19231,10 +16179,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_container_resize_children(container);
-@@ -4426,8 +4426,8 @@
- lock.unlock();
- }
- }
+@@ -5803,8 +5803,8 @@
+ * @param container cast=(GtkContainer *)
+ * @param border_width cast=(guint)
+ */
-public static final native void _gtk_container_set_border_width(int /*long*/ container, int border_width);
-public static final void gtk_container_set_border_width(int /*long*/ container, int border_width) {
+public static final native void _gtk_container_set_border_width(long /*int*/ container, int border_width);
@@ -19242,10 +16190,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_container_set_border_width(container, border_width);
-@@ -4435,8 +4435,8 @@
- lock.unlock();
- }
- }
+@@ -5817,8 +5817,8 @@
+ * @param button_text cast=(const gchar *)
+ * @param response_id cast=(gint)
+ */
-public static final native int /*long*/ _gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id);
-public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id) {
+public static final native long /*int*/ _gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id);
@@ -19253,10 +16201,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_dialog_add_button(dialog, button_text, response_id);
-@@ -4444,8 +4444,8 @@
- lock.unlock();
+@@ -5827,8 +5827,8 @@
}
}
+ /** @param dialog cast=(GtkDialog *) */
-public static final native int _gtk_dialog_run(int /*long*/ dialog);
-public static final int gtk_dialog_run(int /*long*/ dialog) {
+public static final native int _gtk_dialog_run(long /*int*/ dialog);
@@ -19264,10 +16212,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_dialog_run(dialog);
-@@ -4453,8 +4453,8 @@
- lock.unlock();
- }
- }
+@@ -5843,8 +5843,8 @@
+ * @param button cast=(gint)
+ * @param event cast=(GdkEvent *)
+ */
-public static final native int /*long*/ _gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event);
-public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event) {
+public static final native long /*int*/ _gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event);
@@ -19275,10 +16223,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_drag_begin(widget, targets, actions, button, event);
-@@ -4462,8 +4462,8 @@
- lock.unlock();
- }
- }
+@@ -5859,8 +5859,8 @@
+ * @param current_x cast=(gint)
+ * @param current_y cast=(gint)
+ */
-public static final native boolean _gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y);
-public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y) {
+public static final native boolean _gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y);
@@ -19286,10 +16234,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y);
-@@ -4471,8 +4471,8 @@
- lock.unlock();
- }
- }
+@@ -5873,8 +5873,8 @@
+ * @param context cast=(GdkDragContext *)
+ * @param target_list cast=(GtkTargetList *)
+ */
-public static final native int /*long*/ _gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list);
-public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list) {
+public static final native long /*int*/ _gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list);
@@ -19297,10 +16245,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_drag_dest_find_target(widget, context, target_list);
-@@ -4480,8 +4480,8 @@
- lock.unlock();
- }
- }
+@@ -5889,8 +5889,8 @@
+ * @param n_targets cast=(gint)
+ * @param actions cast=(GdkDragAction)
+ */
-public static final native void _gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions);
-public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions) {
+public static final native void _gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions);
@@ -19308,10 +16256,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_drag_dest_set(widget, flags, targets, n_targets, actions);
-@@ -4489,8 +4489,8 @@
- lock.unlock();
+@@ -5899,8 +5899,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_drag_dest_unset(int /*long*/ widget);
-public static final void gtk_drag_dest_unset(int /*long*/ widget) {
+public static final native void _gtk_drag_dest_unset(long /*int*/ widget);
@@ -19319,10 +16267,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_drag_dest_unset(widget);
-@@ -4498,8 +4498,8 @@
- lock.unlock();
- }
- }
+@@ -5914,8 +5914,8 @@
+ * @param delete cast=(gboolean)
+ * @param time cast=(guint32)
+ */
-public static final native void _gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time);
-public static final void gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time) {
+public static final native void _gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time);
@@ -19330,10 +16278,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_drag_finish(context, success, delete, time);
-@@ -4507,8 +4507,8 @@
- lock.unlock();
- }
- }
+@@ -5929,8 +5929,8 @@
+ * @param target cast=(GdkAtom)
+ * @param time cast=(guint32)
+ */
-public static final native void _gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time);
-public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time) {
+public static final native void _gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time);
@@ -19341,10 +16289,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_drag_get_data(widget, context, target, time);
-@@ -4516,8 +4516,8 @@
- lock.unlock();
- }
- }
+@@ -5942,8 +5942,8 @@
+ * @param context cast=(GdkDragContext *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ */
-public static final native void _gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y);
-public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y) {
+public static final native void _gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y);
@@ -19352,7 +16300,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y);
-@@ -4525,8 +4525,8 @@
+@@ -5951,8 +5951,8 @@
lock.unlock();
}
}
@@ -19363,10 +16311,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_drawing_area_new();
-@@ -4534,8 +4534,8 @@
- lock.unlock();
+@@ -5961,8 +5961,8 @@
}
}
+ /** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_copy_clipboard(int /*long*/ editable);
-public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
+public static final native void _gtk_editable_copy_clipboard(long /*int*/ editable);
@@ -19374,10 +16322,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_copy_clipboard(editable);
-@@ -4543,8 +4543,8 @@
- lock.unlock();
+@@ -5971,8 +5971,8 @@
}
}
+ /** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_cut_clipboard(int /*long*/ editable);
-public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
+public static final native void _gtk_editable_cut_clipboard(long /*int*/ editable);
@@ -19385,10 +16333,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_cut_clipboard(editable);
-@@ -4552,8 +4552,8 @@
- lock.unlock();
+@@ -5981,8 +5981,8 @@
}
}
+ /** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_delete_selection(int /*long*/ editable);
-public static final void gtk_editable_delete_selection(int /*long*/ editable) {
+public static final native void _gtk_editable_delete_selection(long /*int*/ editable);
@@ -19396,10 +16344,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_delete_selection(editable);
-@@ -4561,8 +4561,8 @@
- lock.unlock();
- }
- }
+@@ -5995,8 +5995,8 @@
+ * @param start_pos cast=(gint)
+ * @param end_pos cast=(gint)
+ */
-public static final native void _gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos);
-public static final void gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos) {
+public static final native void _gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos);
@@ -19407,10 +16355,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_delete_text(editable, start_pos, end_pos);
-@@ -4570,8 +4570,8 @@
- lock.unlock();
- }
- }
+@@ -6009,8 +6009,8 @@
+ * @param start_pos cast=(gint)
+ * @param end_pos cast=(gint)
+ */
-public static final native int /*long*/ _gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos);
-public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos) {
+public static final native long /*int*/ _gtk_editable_get_chars(long /*int*/ editable, int start_pos, int end_pos);
@@ -19418,10 +16366,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_editable_get_chars(editable, start_pos, end_pos);
-@@ -4579,8 +4579,8 @@
- lock.unlock();
+@@ -6019,8 +6019,8 @@
}
}
+ /** @param editable cast=(GtkEditable *) */
-public static final native boolean _gtk_editable_get_editable(int /*long*/ editable);
-public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
+public static final native boolean _gtk_editable_get_editable(long /*int*/ editable);
@@ -19429,10 +16377,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_editable_get_editable(editable);
-@@ -4588,8 +4588,8 @@
- lock.unlock();
+@@ -6029,8 +6029,8 @@
}
}
+ /** @param editable cast=(GtkEditable *) */
-public static final native int _gtk_editable_get_position(int /*long*/ editable);
-public static final int gtk_editable_get_position(int /*long*/ editable) {
+public static final native int _gtk_editable_get_position(long /*int*/ editable);
@@ -19440,10 +16388,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_editable_get_position(editable);
-@@ -4597,8 +4597,8 @@
- lock.unlock();
- }
- }
+@@ -6043,8 +6043,8 @@
+ * @param start cast=(gint *)
+ * @param end cast=(gint *)
+ */
-public static final native boolean _gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end);
-public static final boolean gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end) {
+public static final native boolean _gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end);
@@ -19451,10 +16399,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_editable_get_selection_bounds(editable, start, end);
-@@ -4606,8 +4606,8 @@
- lock.unlock();
- }
- }
+@@ -6058,8 +6058,8 @@
+ * @param new_text_length cast=(gint)
+ * @param position cast=(gint *)
+ */
-public static final native void _gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position);
-public static final void gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position) {
+public static final native void _gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position);
@@ -19462,10 +16410,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_insert_text(editable, new_text, new_text_length, position);
-@@ -4615,8 +4615,8 @@
- lock.unlock();
+@@ -6068,8 +6068,8 @@
}
}
+ /** @param editable cast=(GtkEditable *) */
-public static final native void _gtk_editable_paste_clipboard(int /*long*/ editable);
-public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
+public static final native void _gtk_editable_paste_clipboard(long /*int*/ editable);
@@ -19473,10 +16421,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_paste_clipboard(editable);
-@@ -4624,8 +4624,8 @@
- lock.unlock();
- }
- }
+@@ -6082,8 +6082,8 @@
+ * @param start cast=(gint)
+ * @param end cast=(gint)
+ */
-public static final native void _gtk_editable_select_region(int /*long*/ editable, int start, int end);
-public static final void gtk_editable_select_region(int /*long*/ editable, int start, int end) {
+public static final native void _gtk_editable_select_region(long /*int*/ editable, int start, int end);
@@ -19484,10 +16432,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_select_region(editable, start, end);
-@@ -4633,8 +4633,8 @@
- lock.unlock();
- }
- }
+@@ -6095,8 +6095,8 @@
+ * @param entry cast=(GtkEditable *)
+ * @param editable cast=(gboolean)
+ */
-public static final native void _gtk_editable_set_editable(int /*long*/ entry, boolean editable);
-public static final void gtk_editable_set_editable(int /*long*/ entry, boolean editable) {
+public static final native void _gtk_editable_set_editable(long /*int*/ entry, boolean editable);
@@ -19495,10 +16443,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_set_editable(entry, editable);
-@@ -4642,8 +4642,8 @@
- lock.unlock();
- }
- }
+@@ -6108,8 +6108,8 @@
+ * @param editable cast=(GtkEditable *)
+ * @param position cast=(gint)
+ */
-public static final native void _gtk_editable_set_position(int /*long*/ editable, int position);
-public static final void gtk_editable_set_position(int /*long*/ editable, int position) {
+public static final native void _gtk_editable_set_position(long /*int*/ editable, int position);
@@ -19506,10 +16454,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_editable_set_position(editable, position);
-@@ -4651,8 +4651,8 @@
- lock.unlock();
+@@ -6118,8 +6118,8 @@
}
}
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _gtk_entry_get_inner_border (int /*long*/ entry);
+-public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry) {
++public static final native long /*int*/ _gtk_entry_get_inner_border (long /*int*/ entry);
++public static final long /*int*/ gtk_entry_get_inner_border (long /*int*/ entry) {
+ lock.lock();
+ try {
+ return _gtk_entry_get_inner_border(entry);
+@@ -6128,8 +6128,8 @@
+ }
+ }
+ /** @param entry cast=(GtkEntry *) */
-public static final native char _gtk_entry_get_invisible_char(int /*long*/ entry);
-public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
+public static final native char _gtk_entry_get_invisible_char(long /*int*/ entry);
@@ -19517,10 +16476,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_get_invisible_char(entry);
-@@ -4660,8 +4660,8 @@
- lock.unlock();
+@@ -6138,8 +6138,8 @@
}
}
+ /** @param entry cast=(GtkEntry *) */
-public static final native int /*long*/ _gtk_entry_get_layout (int /*long*/ entry);
-public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
+public static final native long /*int*/ _gtk_entry_get_layout (long /*int*/ entry);
@@ -19528,21 +16487,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_get_layout(entry);
-@@ -4669,8 +4669,8 @@
- lock.unlock();
+@@ -6148,8 +6148,8 @@
}
}
--public static final native void _gtk_entry_get_layout_offsets (int /*long*/ layout, int[] x, int[] y);
--public static final void gtk_entry_get_layout_offsets (int /*long*/ layout, int[] x, int[] y) {
-+public static final native void _gtk_entry_get_layout_offsets (long /*int*/ layout, int[] x, int[] y);
-+public static final void gtk_entry_get_layout_offsets (long /*int*/ layout, int[] x, int[] y) {
+ /** @param entry cast=(GtkEntry *) */
+-public static final native void _gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y);
+-public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y) {
++public static final native void _gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y);
++public static final void gtk_entry_get_layout_offsets (long /*int*/ entry, int[] x, int[] y) {
lock.lock();
try {
- _gtk_entry_get_layout_offsets(layout, x, y);
-@@ -4678,8 +4678,8 @@
- lock.unlock();
+ _gtk_entry_get_layout_offsets(entry, x, y);
+@@ -6158,8 +6158,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index);
-public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index) {
+public static final native int _gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index);
@@ -19550,10 +16509,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_text_index_to_layout_index(entry, index);
-@@ -4687,8 +4687,8 @@
- lock.unlock();
+@@ -6168,8 +6168,8 @@
}
}
+ /** @param entry cast=(GtkEntry *) */
-public static final native int _gtk_entry_get_max_length(int /*long*/ entry);
-public static final int gtk_entry_get_max_length(int /*long*/ entry) {
+public static final native int _gtk_entry_get_max_length(long /*int*/ entry);
@@ -19561,10 +16520,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_get_max_length(entry);
-@@ -4696,8 +4696,8 @@
- lock.unlock();
+@@ -6178,8 +6178,8 @@
}
}
+ /** @param entry cast=(GtkEntry *) */
-public static final native int /*long*/ _gtk_entry_get_text(int /*long*/ entry);
-public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
+public static final native long /*int*/ _gtk_entry_get_text(long /*int*/ entry);
@@ -19572,10 +16531,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_get_text(entry);
-@@ -4705,8 +4705,8 @@
- lock.unlock();
+@@ -6188,8 +6188,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native boolean _FcConfigAppFontAddFile(int /*long*/ config, byte[] file);
-public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] file) {
+public static final native boolean _FcConfigAppFontAddFile(long /*int*/ config, byte[] file);
@@ -19583,10 +16542,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _FcConfigAppFontAddFile(config, file);
-@@ -4714,8 +4714,8 @@
- lock.unlock();
+@@ -6198,8 +6198,8 @@
}
}
+ /** @param entry cast=(GtkEntry *) */
-public static final native boolean _gtk_entry_get_visibility(int /*long*/ entry);
-public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
+public static final native boolean _gtk_entry_get_visibility(long /*int*/ entry);
@@ -19594,7 +16553,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_get_visibility(entry);
-@@ -4723,8 +4723,8 @@
+@@ -6207,8 +6207,8 @@
lock.unlock();
}
}
@@ -19605,10 +16564,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_entry_new();
-@@ -4732,8 +4732,8 @@
- lock.unlock();
- }
- }
+@@ -6220,8 +6220,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_entry_set_activates_default(int /*long*/ entry, boolean setting);
-public static final void gtk_entry_set_activates_default(int /*long*/ entry, boolean setting) {
+public static final native void _gtk_entry_set_activates_default(long /*int*/ entry, boolean setting);
@@ -19616,10 +16575,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_activates_default(entry, setting);
-@@ -4741,8 +4741,8 @@
- lock.unlock();
- }
- }
+@@ -6234,8 +6234,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param xalign cast=(gfloat)
+ */
-public static final native void _gtk_entry_set_alignment(int /*long*/ entry, float xalign);
-public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalign) {
+public static final native void _gtk_entry_set_alignment(long /*int*/ entry, float xalign);
@@ -19627,10 +16586,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_alignment(entry, xalign);
-@@ -4750,8 +4750,8 @@
- lock.unlock();
- }
- }
+@@ -6247,8 +6247,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_entry_set_has_frame(int /*long*/ entry, boolean setting);
-public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean setting) {
+public static final native void _gtk_entry_set_has_frame(long /*int*/ entry, boolean setting);
@@ -19638,10 +16597,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_has_frame(entry, setting);
-@@ -4759,8 +4759,8 @@
- lock.unlock();
- }
- }
+@@ -6260,8 +6260,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param ch cast=(gint)
+ */
-public static final native void _gtk_entry_set_invisible_char(int /*long*/ entry, char ch);
-public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char ch) {
+public static final native void _gtk_entry_set_invisible_char(long /*int*/ entry, char ch);
@@ -19649,10 +16608,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_invisible_char(entry, ch);
-@@ -4768,8 +4768,8 @@
- lock.unlock();
- }
- }
+@@ -6273,8 +6273,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param max cast=(gint)
+ */
-public static final native void _gtk_entry_set_max_length(int /*long*/ entry, int max);
-public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
+public static final native void _gtk_entry_set_max_length(long /*int*/ entry, int max);
@@ -19660,10 +16619,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_max_length(entry, max);
-@@ -4777,8 +4777,8 @@
- lock.unlock();
- }
- }
+@@ -6286,8 +6286,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param text cast=(const gchar *)
+ */
-public static final native void _gtk_entry_set_text(int /*long*/ entry, byte[] text);
-public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
+public static final native void _gtk_entry_set_text(long /*int*/ entry, byte[] text);
@@ -19671,10 +16630,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_text(entry, text);
-@@ -4786,8 +4786,8 @@
- lock.unlock();
- }
- }
+@@ -6299,8 +6299,8 @@
+ * @param entry cast=(GtkEntry *)
+ * @param visible cast=(gboolean)
+ */
-public static final native void _gtk_entry_set_visibility(int /*long*/ entry, boolean visible);
-public static final void gtk_entry_set_visibility(int /*long*/ entry, boolean visible) {
+public static final native void _gtk_entry_set_visibility(long /*int*/ entry, boolean visible);
@@ -19682,10 +16641,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_entry_set_visibility(entry, visible);
-@@ -4804,8 +4804,8 @@
- lock.unlock();
+@@ -6318,8 +6318,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native boolean _gtk_expander_get_expanded(int /*long*/ expander);
-public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
+public static final native boolean _gtk_expander_get_expanded(long /*int*/ expander);
@@ -19693,10 +16652,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_expander_get_expanded(expander);
-@@ -4813,8 +4813,8 @@
- lock.unlock();
+@@ -6328,8 +6328,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_expander_get_label_widget(int /*long*/ expander);
-public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expander) {
+public static final native long /*int*/ _gtk_expander_get_label_widget(long /*int*/ expander);
@@ -19704,10 +16663,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_expander_get_label_widget(expander);
-@@ -4822,8 +4822,8 @@
- lock.unlock();
- }
- }
+@@ -6341,8 +6341,8 @@
+ * @method flags=dynamic
+ * @param label cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_expander_new(byte[] label);
-public static final int /*long*/ gtk_expander_new(byte[] label) {
+public static final native long /*int*/ _gtk_expander_new(byte[] label);
@@ -19715,10 +16674,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_expander_new(label);
-@@ -4831,8 +4831,8 @@
- lock.unlock();
+@@ -6351,8 +6351,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_expander_set_expanded(int /*long*/ expander, boolean expanded);
-public static final void gtk_expander_set_expanded(int /*long*/ expander, boolean expanded) {
+public static final native void _gtk_expander_set_expanded(long /*int*/ expander, boolean expanded);
@@ -19726,10 +16685,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_expander_set_expanded(expander, expanded);
-@@ -4840,8 +4840,8 @@
- lock.unlock();
- }
- }
+@@ -6364,8 +6364,8 @@
+ * @method flags=dynamic
+ * @param label cast=(const gchar *)
+ */
-public static final native void _gtk_expander_set_label(int /*long*/ expander, byte[] label);
-public static final void gtk_expander_set_label(int /*long*/ expander, byte[] label) {
+public static final native void _gtk_expander_set_label(long /*int*/ expander, byte[] label);
@@ -19737,10 +16696,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_expander_set_label(expander, label);
-@@ -4849,8 +4849,8 @@
- lock.unlock();
+@@ -6374,8 +6374,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget);
-public static final void gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget) {
+public static final native void _gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget);
@@ -19748,10 +16707,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_expander_set_label_widget(expander, label_widget);
-@@ -4858,8 +4858,8 @@
- lock.unlock();
+@@ -6384,8 +6384,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter);
-public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter) {
+public static final native void _gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter);
@@ -19759,10 +16718,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_add_filter(chooser, filter);
-@@ -4867,8 +4867,8 @@
- lock.unlock();
+@@ -6394,8 +6394,8 @@
}
}
+ /** @method flags=no_gen */
-public static final native int /*long*/ _gtk_file_chooser_dialog_new(byte[] title, int /*long*/ parent, int action, int /*long*/ first_button_text, int first_button_id, int /*long*/ second_button_text, int second_button_id, int /*long*/ terminator);
-public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /*long*/ parent, int action, int /*long*/ first_button_text, int first_button_id, int /*long*/ second_button_text, int second_button_id, int /*long*/ terminator) {
+public static final native long /*int*/ _gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator);
@@ -19770,10 +16729,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_chooser_dialog_new(title, parent, action, first_button_text, first_button_id, second_button_text, second_button_id, terminator);
-@@ -4876,8 +4876,8 @@
- lock.unlock();
+@@ -6404,8 +6404,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_current_folder(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_current_folder(long /*int*/ chooser);
@@ -19781,10 +16740,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_chooser_get_current_folder(chooser);
-@@ -4885,8 +4885,8 @@
- lock.unlock();
+@@ -6414,8 +6414,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_filename(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_filename(long /*int*/ chooser);
@@ -19792,10 +16751,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_chooser_get_filename(chooser);
-@@ -4894,8 +4894,8 @@
- lock.unlock();
+@@ -6424,8 +6424,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_filenames(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_filenames(long /*int*/ chooser);
@@ -19803,10 +16762,32 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_chooser_get_filenames(chooser);
-@@ -4903,8 +4903,8 @@
- lock.unlock();
+@@ -6434,8 +6434,8 @@
+ }
+ }
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _gtk_file_chooser_get_uri(int /*long*/ chooser);
+-public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser) {
++public static final native long /*int*/ _gtk_file_chooser_get_uri(long /*int*/ chooser);
++public static final long /*int*/ gtk_file_chooser_get_uri(long /*int*/ chooser) {
+ lock.lock();
+ try {
+ return _gtk_file_chooser_get_uri(chooser);
+@@ -6444,8 +6444,8 @@
+ }
+ }
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _gtk_file_chooser_get_uris(int /*long*/ chooser);
+-public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser) {
++public static final native long /*int*/ _gtk_file_chooser_get_uris(long /*int*/ chooser);
++public static final long /*int*/ gtk_file_chooser_get_uris(long /*int*/ chooser) {
+ lock.lock();
+ try {
+ return _gtk_file_chooser_get_uris(chooser);
+@@ -6454,8 +6454,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_chooser_get_filter(int /*long*/ chooser);
-public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ chooser) {
+public static final native long /*int*/ _gtk_file_chooser_get_filter(long /*int*/ chooser);
@@ -19814,10 +16795,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_chooser_get_filter(chooser);
-@@ -4912,8 +4912,8 @@
- lock.unlock();
+@@ -6464,8 +6464,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename);
-public static final void gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename) {
+public static final native void _gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename);
@@ -19825,10 +16806,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_current_folder(chooser, filename);
-@@ -4921,8 +4921,8 @@
- lock.unlock();
+@@ -6474,8 +6474,8 @@
}
}
+ /** @method flags=dynamic */
+-public static final native void _gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri);
+-public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri) {
++public static final native void _gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri);
++public static final void gtk_file_chooser_set_current_folder_uri(long /*int*/ chooser, byte [] uri) {
+ lock.lock();
+ try {
+ _gtk_file_chooser_set_current_folder_uri(chooser, uri);
+@@ -6484,8 +6484,8 @@
+ }
+ }
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name);
-public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name) {
+public static final native void _gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name);
@@ -19836,10 +16828,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_current_name(chooser, name);
-@@ -4930,8 +4930,8 @@
- lock.unlock();
+@@ -6494,8 +6494,8 @@
}
}
+ /** @method flags=dynamic */
+-public static final native void _gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only);
+-public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only) {
++public static final native void _gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only);
++public static final void gtk_file_chooser_set_local_only(long /*int*/ chooser, boolean local_only) {
+ lock.lock();
+ try {
+ _gtk_file_chooser_set_local_only(chooser, local_only);
+@@ -6504,8 +6504,8 @@
+ }
+ }
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation);
-public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation) {
+public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation);
@@ -19847,10 +16850,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation);
-@@ -4939,8 +4939,8 @@
- lock.unlock();
+@@ -6514,8 +6514,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget);
-public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget) {
+public static final native void _gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget);
@@ -19858,10 +16861,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_extra_widget(chooser, extra_widget);
-@@ -4948,8 +4948,8 @@
- lock.unlock();
+@@ -6524,8 +6524,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name);
-public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name) {
+public static final native void _gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name);
@@ -19869,10 +16872,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_filename(chooser, name);
-@@ -4957,8 +4957,8 @@
- lock.unlock();
+@@ -6534,8 +6534,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter);
-public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter) {
+public static final native void _gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter);
@@ -19880,10 +16883,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_filter(chooser, filter);
-@@ -4966,8 +4966,8 @@
- lock.unlock();
+@@ -6544,8 +6544,8 @@
}
}
+ /** @method flags=dynamic */
+-public static final native void _gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri);
+-public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri) {
++public static final native void _gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri);
++public static final void gtk_file_chooser_set_uri(long /*int*/ chooser, byte [] uri) {
+ lock.lock();
+ try {
+ _gtk_file_chooser_set_uri(chooser, uri);
+@@ -6554,8 +6554,8 @@
+ }
+ }
+ /** @method flags=dynamic */
-public static final native void _gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple);
-public static final void gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple) {
+public static final native void _gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple);
@@ -19891,10 +16905,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_chooser_set_select_multiple(chooser, select_multiple);
-@@ -4975,8 +4975,8 @@
- lock.unlock();
+@@ -6564,8 +6564,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern);
-public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern) {
+public static final native void _gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern);
@@ -19902,10 +16916,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_filter_add_pattern(filter, pattern);
-@@ -4984,8 +4984,8 @@
- lock.unlock();
+@@ -6574,8 +6574,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_filter_new();
-public static final int /*long*/ gtk_file_filter_new() {
+public static final native long /*int*/ _gtk_file_filter_new();
@@ -19913,10 +16927,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_filter_new();
-@@ -4993,8 +4993,8 @@
- lock.unlock();
+@@ -6584,8 +6584,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_file_filter_get_name(int /*long*/ filter);
-public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
+public static final native long /*int*/ _gtk_file_filter_get_name(long /*int*/ filter);
@@ -19924,10 +16938,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_filter_get_name(filter);
-@@ -5002,8 +5002,8 @@
- lock.unlock();
+@@ -6594,8 +6594,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_file_filter_set_name(int /*long*/ filter, byte[] name);
-public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] name) {
+public static final native void _gtk_file_filter_set_name(long /*int*/ filter, byte[] name);
@@ -19935,10 +16949,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_filter_set_name(filter, name);
-@@ -5011,8 +5011,8 @@
- lock.unlock();
+@@ -6604,8 +6604,8 @@
}
}
+ /** @param filesel cast=(GtkFileSelection *) */
-public static final native int /*long*/ _gtk_file_selection_get_filename(int /*long*/ filesel);
-public static final int /*long*/ gtk_file_selection_get_filename(int /*long*/ filesel) {
+public static final native long /*int*/ _gtk_file_selection_get_filename(long /*int*/ filesel);
@@ -19946,10 +16960,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_selection_get_filename(filesel);
-@@ -5020,8 +5020,8 @@
- lock.unlock();
+@@ -6614,8 +6614,8 @@
}
}
+ /** @param filesel cast=(GtkFileSelection *) */
-public static final native int /*long*/ _gtk_file_selection_get_selections(int /*long*/ filesel);
-public static final int /*long*/ gtk_file_selection_get_selections(int /*long*/ filesel) {
+public static final native long /*int*/ _gtk_file_selection_get_selections(long /*int*/ filesel);
@@ -19957,10 +16971,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_selection_get_selections(filesel);
-@@ -5029,8 +5029,8 @@
- lock.unlock();
+@@ -6624,8 +6624,8 @@
}
}
+ /** @param filesel cast=(GtkFileSelection *) */
-public static final native void _gtk_file_selection_hide_fileop_buttons(int /*long*/ filesel);
-public static final void gtk_file_selection_hide_fileop_buttons(int /*long*/ filesel) {
+public static final native void _gtk_file_selection_hide_fileop_buttons(long /*int*/ filesel);
@@ -19968,10 +16982,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_selection_hide_fileop_buttons(filesel);
-@@ -5038,8 +5038,8 @@
- lock.unlock();
+@@ -6634,8 +6634,8 @@
}
}
+ /** @param title cast=(const gchar *) */
-public static final native int /*long*/ _gtk_file_selection_new(byte[] title);
-public static final int /*long*/ gtk_file_selection_new(byte[] title) {
+public static final native long /*int*/ _gtk_file_selection_new(byte[] title);
@@ -19979,10 +16993,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_file_selection_new(title);
-@@ -5047,8 +5047,8 @@
- lock.unlock();
- }
- }
+@@ -6647,8 +6647,8 @@
+ * @param filesel cast=(GtkFileSelection *)
+ * @param filename cast=(const gchar *)
+ */
-public static final native void _gtk_file_selection_set_filename(int /*long*/ filesel, int /*long*/ filename);
-public static final void gtk_file_selection_set_filename(int /*long*/ filesel, int /*long*/ filename) {
+public static final native void _gtk_file_selection_set_filename(long /*int*/ filesel, long /*int*/ filename);
@@ -19990,10 +17004,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_selection_set_filename(filesel, filename);
-@@ -5056,8 +5056,8 @@
- lock.unlock();
- }
- }
+@@ -6660,8 +6660,8 @@
+ * @param filesel cast=(GtkFileSelection *)
+ * @param select_multiple cast=(gboolean)
+ */
-public static final native void _gtk_file_selection_set_select_multiple(int /*long*/ filesel, boolean select_multiple);
-public static final void gtk_file_selection_set_select_multiple(int /*long*/ filesel, boolean select_multiple) {
+public static final native void _gtk_file_selection_set_select_multiple(long /*int*/ filesel, boolean select_multiple);
@@ -20001,10 +17015,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_file_selection_set_select_multiple(filesel, select_multiple);
-@@ -5065,8 +5065,8 @@
- lock.unlock();
- }
- }
+@@ -6675,8 +6675,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native void _gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y);
-public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y) {
+public static final native void _gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y);
@@ -20012,7 +17026,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_fixed_move(fixed, widget, x, y);
-@@ -5074,8 +5074,8 @@
+@@ -6684,8 +6684,8 @@
lock.unlock();
}
}
@@ -20023,10 +17037,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_fixed_new();
-@@ -5083,8 +5083,8 @@
- lock.unlock();
- }
- }
+@@ -6697,8 +6697,8 @@
+ * @param fixed cast=(GtkFixed *)
+ * @param has_window cast=(gboolean)
+ */
-public static final native void _gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window);
-public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window) {
+public static final native void _gtk_fixed_set_has_window(long /*int*/ fixed, boolean has_window);
@@ -20034,10 +17048,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_fixed_set_has_window(fixed, has_window);
-@@ -5092,8 +5092,8 @@
- lock.unlock();
+@@ -6707,8 +6707,8 @@
}
}
+ /** @param fsd cast=(GtkFontSelectionDialog *) */
-public static final native int /*long*/ _gtk_font_selection_dialog_get_font_name(int /*long*/ fsd);
-public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*long*/ fsd) {
+public static final native long /*int*/ _gtk_font_selection_dialog_get_font_name(long /*int*/ fsd);
@@ -20045,10 +17059,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_font_selection_dialog_get_font_name(fsd);
-@@ -5101,8 +5101,8 @@
- lock.unlock();
+@@ -6717,8 +6717,8 @@
}
}
+ /** @param title cast=(const gchar *) */
-public static final native int /*long*/ _gtk_font_selection_dialog_new(byte[] title);
-public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
+public static final native long /*int*/ _gtk_font_selection_dialog_new(byte[] title);
@@ -20056,10 +17070,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_font_selection_dialog_new(title);
-@@ -5110,8 +5110,8 @@
- lock.unlock();
- }
- }
+@@ -6730,8 +6730,8 @@
+ * @param fsd cast=(GtkFontSelectionDialog *)
+ * @param fontname cast=(const gchar *)
+ */
-public static final native boolean _gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname);
-public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname) {
+public static final native boolean _gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname);
@@ -20067,10 +17081,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_font_selection_dialog_set_font_name(fsd, fontname);
-@@ -5119,8 +5119,8 @@
- lock.unlock();
+@@ -6740,8 +6740,8 @@
}
}
+ /** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_frame_new(byte[] label);
-public static final int /*long*/ gtk_frame_new(byte[] label) {
+public static final native long /*int*/ _gtk_frame_new(byte[] label);
@@ -20078,10 +17092,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_frame_new(label);
-@@ -5128,8 +5128,8 @@
- lock.unlock();
+@@ -6750,8 +6750,8 @@
}
}
+ /** @param frame cast=(GtkFrame *) */
-public static final native int /*long*/ _gtk_frame_get_label_widget(int /*long*/ frame);
-public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame) {
+public static final native long /*int*/ _gtk_frame_get_label_widget(long /*int*/ frame);
@@ -20089,10 +17103,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_frame_get_label_widget(frame);
-@@ -5137,8 +5137,8 @@
- lock.unlock();
- }
- }
+@@ -6763,8 +6763,8 @@
+ * @param frame cast=(GtkFrame *)
+ * @param label cast=(const gchar *)
+ */
-public static final native void _gtk_frame_set_label(int /*long*/ frame, byte[] label);
-public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
+public static final native void _gtk_frame_set_label(long /*int*/ frame, byte[] label);
@@ -20100,10 +17114,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_frame_set_label(frame, label);
-@@ -5146,8 +5146,8 @@
- lock.unlock();
- }
- }
+@@ -6776,8 +6776,8 @@
+ * @param frame cast=(GtkFrame *)
+ * @param label_widget cast=(GtkWidget *)
+ */
-public static final native void _gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget);
-public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget) {
+public static final native void _gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget);
@@ -20111,10 +17125,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_frame_set_label_widget(frame, label_widget);
-@@ -5155,8 +5155,8 @@
- lock.unlock();
- }
- }
+@@ -6789,8 +6789,8 @@
+ * @param frame cast=(GtkFrame *)
+ * @param type cast=(GtkShadowType)
+ */
-public static final native void _gtk_frame_set_shadow_type(int /*long*/ frame, int type);
-public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type) {
+public static final native void _gtk_frame_set_shadow_type(long /*int*/ frame, int type);
@@ -20122,7 +17136,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_frame_set_shadow_type(frame, type);
-@@ -5164,8 +5164,8 @@
+@@ -6798,8 +6798,8 @@
lock.unlock();
}
}
@@ -20133,7 +17147,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_get_current_event();
-@@ -5191,8 +5191,8 @@
+@@ -6826,8 +6826,8 @@
lock.unlock();
}
}
@@ -20144,10 +17158,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_get_default_language();
-@@ -5200,8 +5200,8 @@
- lock.unlock();
+@@ -6836,8 +6836,8 @@
}
}
+ /** @param event cast=(GdkEvent *) */
-public static final native int /*long*/ _gtk_get_event_widget(int /*long*/ event);
-public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
+public static final native long /*int*/ _gtk_get_event_widget(long /*int*/ event);
@@ -20155,10 +17169,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_get_event_widget(event);
-@@ -5209,8 +5209,8 @@
- lock.unlock();
+@@ -6846,8 +6846,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_grab_add(int /*long*/ widget);
-public static final void gtk_grab_add(int /*long*/ widget) {
+public static final native void _gtk_grab_add(long /*int*/ widget);
@@ -20166,7 +17180,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_grab_add(widget);
-@@ -5218,8 +5218,8 @@
+@@ -6855,8 +6855,8 @@
lock.unlock();
}
}
@@ -20177,10 +17191,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_grab_get_current();
-@@ -5227,8 +5227,8 @@
- lock.unlock();
+@@ -6865,8 +6865,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_grab_remove(int /*long*/ widget);
-public static final void gtk_grab_remove(int /*long*/ widget) {
+public static final native void _gtk_grab_remove(long /*int*/ widget);
@@ -20188,10 +17202,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_grab_remove(widget);
-@@ -5236,8 +5236,8 @@
- lock.unlock();
- }
- }
+@@ -6878,8 +6878,8 @@
+ * @param homogeneous cast=(gboolean)
+ * @param spacing cast=(gint)
+ */
-public static final native int /*long*/ _gtk_hbox_new(boolean homogeneous, int spacing);
-public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing) {
+public static final native long /*int*/ _gtk_hbox_new(boolean homogeneous, int spacing);
@@ -20199,10 +17213,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_hbox_new(homogeneous, spacing);
-@@ -5245,8 +5245,8 @@
- lock.unlock();
+@@ -6888,8 +6888,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native int /*long*/ _gtk_hscale_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_hscale_new(long /*int*/ adjustment);
@@ -20210,10 +17224,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_hscale_new(adjustment);
-@@ -5254,8 +5254,8 @@
- lock.unlock();
+@@ -6898,8 +6898,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native int /*long*/ _gtk_hscrollbar_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_hscrollbar_new(long /*int*/ adjustment);
@@ -20221,7 +17235,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_hscrollbar_new(adjustment);
-@@ -5263,8 +5263,8 @@
+@@ -6907,8 +6907,8 @@
lock.unlock();
}
}
@@ -20232,10 +17246,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_hseparator_new();
-@@ -5272,8 +5272,8 @@
- lock.unlock();
+@@ -6917,8 +6917,8 @@
}
}
+ /** @param stock_id cast=(const gchar *) */
-public static final native int /*long*/ _gtk_icon_factory_lookup_default(byte[] stock_id);
-public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id) {
+public static final native long /*int*/ _gtk_icon_factory_lookup_default(byte[] stock_id);
@@ -20243,10 +17257,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_icon_factory_lookup_default(stock_id);
-@@ -5281,8 +5281,8 @@
- lock.unlock();
+@@ -6927,8 +6927,8 @@
}
}
+ /** @param source cast=(GtkIconSource *) */
-public static final native void _gtk_icon_source_free(int /*long*/ source);
-public static final void gtk_icon_source_free(int /*long*/ source) {
+public static final native void _gtk_icon_source_free(long /*int*/ source);
@@ -20254,7 +17268,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_icon_source_free(source);
-@@ -5290,8 +5290,8 @@
+@@ -6936,8 +6936,8 @@
lock.unlock();
}
}
@@ -20265,10 +17279,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_icon_source_new();
-@@ -5299,8 +5299,8 @@
- lock.unlock();
- }
- }
+@@ -6949,8 +6949,8 @@
+ * @param source cast=(GtkIconSource *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ */
-public static final native void _gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf);
-public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf) {
+public static final native void _gtk_icon_source_set_pixbuf(long /*int*/ source, long /*int*/ pixbuf);
@@ -20276,10 +17290,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_icon_source_set_pixbuf(source, pixbuf);
-@@ -5308,8 +5308,8 @@
- lock.unlock();
- }
- }
+@@ -6967,8 +6967,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const char *)
+ */
-public static final native int /*long*/ _gtk_icon_set_render_icon(int /*long*/ icon_set, int /*long*/ style, int direction, int state, int size, int /*long*/ widget, int /*long*/ detail);
-public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set, int /*long*/ style, int direction, int state, int size, int /*long*/ widget, int /*long*/ detail) {
+public static final native long /*int*/ _gtk_icon_set_render_icon(long /*int*/ icon_set, long /*int*/ style, int direction, int state, int size, long /*int*/ widget, long /*int*/ detail);
@@ -20287,10 +17301,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail);
-@@ -5317,8 +5317,8 @@
- lock.unlock();
- }
- }
+@@ -6980,8 +6980,8 @@
+ * @param context cast=(GtkIMContext *)
+ * @param event cast=(GdkEventKey *)
+ */
-public static final native boolean _gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event);
-public static final boolean gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event) {
+public static final native boolean _gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event);
@@ -20298,10 +17312,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_im_context_filter_keypress(context, event);
-@@ -5326,8 +5326,8 @@
- lock.unlock();
+@@ -6990,8 +6990,8 @@
}
}
+ /** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_focus_in(int /*long*/ context);
-public static final void gtk_im_context_focus_in(int /*long*/ context) {
+public static final native void _gtk_im_context_focus_in(long /*int*/ context);
@@ -20309,10 +17323,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_context_focus_in(context);
-@@ -5335,8 +5335,8 @@
- lock.unlock();
+@@ -7000,8 +7000,8 @@
}
}
+ /** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_focus_out(int /*long*/ context);
-public static final void gtk_im_context_focus_out(int /*long*/ context) {
+public static final native void _gtk_im_context_focus_out(long /*int*/ context);
@@ -20320,10 +17334,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_context_focus_out(context);
-@@ -5344,8 +5344,8 @@
- lock.unlock();
- }
- }
+@@ -7015,8 +7015,8 @@
+ * @param attrs cast=(PangoAttrList **)
+ * @param cursor_pos cast=(gint *)
+ */
-public static final native void _gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos);
-public static final void gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos) {
+public static final native void _gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos);
@@ -20331,7 +17345,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
-@@ -5353,8 +5353,8 @@
+@@ -7024,8 +7024,8 @@
lock.unlock();
}
}
@@ -20342,10 +17356,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_im_context_get_type();
-@@ -5362,8 +5362,8 @@
- lock.unlock();
+@@ -7034,8 +7034,8 @@
}
}
+ /** @param context cast=(GtkIMContext *) */
-public static final native void _gtk_im_context_reset(int /*long*/ context);
-public static final void gtk_im_context_reset(int /*long*/ context) {
+public static final native void _gtk_im_context_reset(long /*int*/ context);
@@ -20353,10 +17367,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_context_reset(context);
-@@ -5371,8 +5371,8 @@
- lock.unlock();
- }
- }
+@@ -7047,8 +7047,8 @@
+ * @param context cast=(GtkIMContext *)
+ * @param window cast=(GdkWindow *)
+ */
-public static final native void _gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window);
-public static final void gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window) {
+public static final native void _gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window);
@@ -20364,10 +17378,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_context_set_client_window(context, window);
-@@ -5380,8 +5380,8 @@
- lock.unlock();
- }
- }
+@@ -7060,8 +7060,8 @@
+ * @param context cast=(GtkIMContext *)
+ * @param area cast=(GdkRectangle *),flags=no_out
+ */
-public static final native void _gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area);
-public static final void gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area) {
+public static final native void _gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area);
@@ -20375,10 +17389,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_context_set_cursor_location(context, area);
-@@ -5389,8 +5389,8 @@
- lock.unlock();
- }
- }
+@@ -7073,8 +7073,8 @@
+ * @param context cast=(GtkIMMulticontext *)
+ * @param menushell cast=(GtkMenuShell *)
+ */
-public static final native void _gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell);
-public static final void gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell) {
+public static final native void _gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell);
@@ -20386,7 +17400,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_im_multicontext_append_menuitems(context, menushell);
-@@ -5398,8 +5398,8 @@
+@@ -7082,8 +7082,8 @@
lock.unlock();
}
}
@@ -20397,10 +17411,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_im_multicontext_new();
-@@ -5407,8 +5407,8 @@
- lock.unlock();
+@@ -7092,8 +7092,8 @@
}
}
+ /** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_image_menu_item_new_with_label(byte[] label);
-public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label) {
+public static final native long /*int*/ _gtk_image_menu_item_new_with_label(byte[] label);
@@ -20408,10 +17422,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_image_menu_item_new_with_label(label);
-@@ -5416,8 +5416,8 @@
- lock.unlock();
- }
- }
+@@ -7105,8 +7105,8 @@
+ * @param menu_item cast=(GtkImageMenuItem *)
+ * @param image cast=(GtkWidget *)
+ */
-public static final native void _gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image);
-public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image) {
+public static final native void _gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image);
@@ -20419,7 +17433,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_image_menu_item_set_image(menu_item, image);
-@@ -5425,8 +5425,8 @@
+@@ -7114,8 +7114,8 @@
lock.unlock();
}
}
@@ -20430,10 +17444,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_image_new();
-@@ -5434,8 +5434,8 @@
- lock.unlock();
+@@ -7124,8 +7124,8 @@
}
}
+ /** @param pixbuf cast=(GdkPixbuf *) */
-public static final native int /*long*/ _gtk_image_new_from_pixbuf(int /*long*/ pixbuf);
-public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf) {
+public static final native long /*int*/ _gtk_image_new_from_pixbuf(long /*int*/ pixbuf);
@@ -20441,10 +17455,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_image_new_from_pixbuf(pixbuf);
-@@ -5443,8 +5443,8 @@
- lock.unlock();
- }
- }
+@@ -7137,8 +7137,8 @@
+ * @param pixmap cast=(GdkPixmap *)
+ * @param mask cast=(GdkBitmap *)
+ */
-public static final native int /*long*/ _gtk_image_new_from_pixmap(int /*long*/ pixmap, int /*long*/ mask);
-public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap, int /*long*/ mask) {
+public static final native long /*int*/ _gtk_image_new_from_pixmap(long /*int*/ pixmap, long /*int*/ mask);
@@ -20452,10 +17466,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_image_new_from_pixmap(pixmap, mask);
-@@ -5452,8 +5452,8 @@
- lock.unlock();
- }
- }
+@@ -7150,8 +7150,8 @@
+ * @param image cast=(GtkImage *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ */
-public static final native void _gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf);
-public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf) {
+public static final native void _gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf);
@@ -20463,10 +17477,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_image_set_from_pixbuf(image, pixbuf);
-@@ -5461,8 +5461,8 @@
- lock.unlock();
- }
- }
+@@ -7164,8 +7164,8 @@
+ * @param pixmap cast=(GdkBitmap *)
+ * @param mask cast=(GdkBitmap *)
+ */
-public static final native void _gtk_image_set_from_pixmap(int /*long*/ image, int /*long*/ pixmap, int /*long*/ mask);
-public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*long*/ pixmap, int /*long*/ mask) {
+public static final native void _gtk_image_set_from_pixmap(long /*int*/ image, long /*int*/ pixmap, long /*int*/ mask);
@@ -20474,10 +17488,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_image_set_from_pixmap(image, pixmap, mask);
-@@ -5470,8 +5470,8 @@
- lock.unlock();
- }
- }
+@@ -7177,8 +7177,8 @@
+ * @param argc cast=(int *)
+ * @param argv cast=(char ***)
+ */
-public static final native boolean _gtk_init_check(int /*long*/[] argc, int /*long*/[] argv);
-public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] argv) {
+public static final native boolean _gtk_init_check(long /*int*/[] argc, long /*int*/[] argv);
@@ -20485,10 +17499,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_init_check(argc, argv);
-@@ -5479,8 +5479,8 @@
- lock.unlock();
+@@ -7187,8 +7187,8 @@
}
}
+ /** @param label cast=(GtkLabel *) */
-public static final native int /*long*/ _gtk_label_get_layout(int /*long*/ label);
-public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
+public static final native long /*int*/ _gtk_label_get_layout(long /*int*/ label);
@@ -20496,10 +17510,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_label_get_layout(label);
-@@ -5488,8 +5488,8 @@
- lock.unlock();
+@@ -7197,8 +7197,8 @@
}
}
+ /** @param label cast=(GtkLabel *) */
-public static final native int _gtk_label_get_mnemonic_keyval(int /*long*/ label);
-public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
+public static final native int _gtk_label_get_mnemonic_keyval(long /*int*/ label);
@@ -20507,10 +17521,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_label_get_mnemonic_keyval(label);
-@@ -5497,8 +5497,8 @@
- lock.unlock();
+@@ -7207,8 +7207,8 @@
}
}
+ /** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_label_new(byte[] label);
-public static final int /*long*/ gtk_label_new(byte[] label) {
+public static final native long /*int*/ _gtk_label_new(byte[] label);
@@ -20518,10 +17532,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_label_new(label);
-@@ -5506,8 +5506,8 @@
- lock.unlock();
+@@ -7217,8 +7217,8 @@
}
}
+ /** @param str cast=(const gchar *) */
-public static final native int /*long*/ _gtk_label_new_with_mnemonic(byte[] str);
-public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
+public static final native long /*int*/ _gtk_label_new_with_mnemonic(byte[] str);
@@ -20529,10 +17543,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_label_new_with_mnemonic(str);
-@@ -5515,8 +5515,8 @@
- lock.unlock();
- }
- }
+@@ -7230,8 +7230,8 @@
+ * @param label cast=(GtkLabel *)
+ * @param attrs cast=(PangoAttrList *)
+ */
-public static final native void _gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs);
-public static final void gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs) {
+public static final native void _gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs);
@@ -20540,10 +17554,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_attributes(label, attrs);
-@@ -5524,8 +5524,8 @@
- lock.unlock();
- }
- }
+@@ -7243,8 +7243,8 @@
+ * @param label cast=(GtkLabel *)
+ * @param jtype cast=(GtkJustification)
+ */
-public static final native void _gtk_label_set_justify(int /*long*/ label, int jtype);
-public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
+public static final native void _gtk_label_set_justify(long /*int*/ label, int jtype);
@@ -20551,10 +17565,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_justify(label, jtype);
-@@ -5533,8 +5533,8 @@
- lock.unlock();
- }
- }
+@@ -7256,8 +7256,8 @@
+ * @param label cast=(GtkLabel *)
+ * @param wrap cast=(gboolean)
+ */
-public static final native void _gtk_label_set_line_wrap(int /*long*/ label, boolean wrap);
-public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wrap) {
+public static final native void _gtk_label_set_line_wrap(long /*int*/ label, boolean wrap);
@@ -20562,10 +17576,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_line_wrap(label, wrap);
-@@ -5542,8 +5542,8 @@
- lock.unlock();
+@@ -7266,8 +7266,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode);
-public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode) {
+public static final native void _gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode);
@@ -20573,10 +17587,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_line_wrap_mode(label, wrap_mode);
-@@ -5551,8 +5551,8 @@
- lock.unlock();
- }
- }
+@@ -7279,8 +7279,8 @@
+ * @param label cast=(GtkLabel *)
+ * @param str cast=(const gchar *)
+ */
-public static final native void _gtk_label_set_text(int /*long*/ label, int /*long*/ str);
-public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str) {
+public static final native void _gtk_label_set_text(long /*int*/ label, long /*int*/ str);
@@ -20584,10 +17598,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -5560,8 +5560,8 @@
- lock.unlock();
- }
- }
+@@ -7292,8 +7292,8 @@
+ * @param label cast=(GtkLabel *)
+ * @param str cast=(const gchar *)
+ */
-public static final native void _gtk_label_set_text(int /*long*/ label, byte[] str);
-public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
+public static final native void _gtk_label_set_text(long /*int*/ label, byte[] str);
@@ -20595,10 +17609,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_text(label, str);
-@@ -5569,8 +5569,8 @@
- lock.unlock();
- }
- }
+@@ -7305,8 +7305,8 @@
+ * @param label cast=(GtkLabel *)
+ * @param str cast=(const gchar *)
+ */
-public static final native void _gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str);
-public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str) {
+public static final native void _gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str);
@@ -20606,10 +17620,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_label_set_text_with_mnemonic(label, str);
-@@ -5578,8 +5578,8 @@
- lock.unlock();
- }
- }
+@@ -7318,8 +7318,8 @@
+ * @param list cast=(GtkList *)
+ * @param items cast=(GList *)
+ */
-public static final native void _gtk_list_append_items(int /*long*/ list, int /*long*/ items);
-public static final void gtk_list_append_items(int /*long*/ list, int /*long*/ items) {
+public static final native void _gtk_list_append_items(long /*int*/ list, long /*int*/ items);
@@ -20617,10 +17631,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_append_items(list, items);
-@@ -5587,8 +5587,8 @@
- lock.unlock();
+@@ -7328,8 +7328,8 @@
}
}
+ /** @param list cast=(GtkList *) */
-public static final native void _gtk_list_clear_items(int /*long*/ list, int start, int end);
-public static final void gtk_list_clear_items(int /*long*/ list, int start, int end) {
+public static final native void _gtk_list_clear_items(long /*int*/ list, int start, int end);
@@ -20628,10 +17642,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_clear_items(list, start, end);
-@@ -5596,8 +5596,8 @@
- lock.unlock();
- }
- }
+@@ -7341,8 +7341,8 @@
+ * @param list cast=(GtkList *)
+ * @param items cast=(GList *)
+ */
-public static final native void _gtk_list_insert_items(int /*long*/ list, int /*long*/ items, int position);
-public static final void gtk_list_insert_items(int /*long*/ list, int /*long*/ items, int position) {
+public static final native void _gtk_list_insert_items(long /*int*/ list, long /*int*/ items, int position);
@@ -20639,10 +17653,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_insert_items(list, items, position);
-@@ -5605,8 +5605,8 @@
- lock.unlock();
+@@ -7351,8 +7351,8 @@
}
}
+ /** @param label cast=(const gchar *) */
-public static final native int /*long*/ _gtk_list_item_new_with_label(byte[] label);
-public static final int /*long*/ gtk_list_item_new_with_label(byte[] label) {
+public static final native long /*int*/ _gtk_list_item_new_with_label(byte[] label);
@@ -20650,10 +17664,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_list_item_new_with_label(label);
-@@ -5614,8 +5614,8 @@
- lock.unlock();
- }
- }
+@@ -7364,8 +7364,8 @@
+ * @param list cast=(GtkList *)
+ * @param items cast=(GList *)
+ */
-public static final native void _gtk_list_remove_items(int /*long*/ list, int /*long*/ items);
-public static final void gtk_list_remove_items(int /*long*/ list, int /*long*/ items) {
+public static final native void _gtk_list_remove_items(long /*int*/ list, long /*int*/ items);
@@ -20661,10 +17675,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_remove_items(list, items);
-@@ -5623,8 +5623,8 @@
- lock.unlock();
+@@ -7374,8 +7374,8 @@
}
}
+ /** @param list cast=(GtkList *) */
-public static final native void _gtk_list_select_item(int /*long*/ list, int item);
-public static final void gtk_list_select_item(int /*long*/ list, int item) {
+public static final native void _gtk_list_select_item(long /*int*/ list, int item);
@@ -20672,10 +17686,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_select_item(list, item);
-@@ -5632,8 +5632,8 @@
- lock.unlock();
+@@ -7384,8 +7384,8 @@
}
}
+ /** @param list cast=(GtkList *) */
-public static final native void _gtk_list_unselect_all(int /*long*/ list);
-public static final void gtk_list_unselect_all(int /*long*/ list) {
+public static final native void _gtk_list_unselect_all(long /*int*/ list);
@@ -20683,10 +17697,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_unselect_all(list);
-@@ -5641,8 +5641,8 @@
- lock.unlock();
+@@ -7394,8 +7394,8 @@
}
}
+ /** @param list cast=(GtkList *) */
-public static final native void _gtk_list_unselect_item(int /*long*/ list, int item);
-public static final void gtk_list_unselect_item(int /*long*/ list, int item) {
+public static final native void _gtk_list_unselect_item(long /*int*/ list, int item);
@@ -20694,10 +17708,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_unselect_item(list, item);
-@@ -5650,8 +5650,8 @@
- lock.unlock();
- }
- }
+@@ -7407,8 +7407,8 @@
+ * @param list_store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter);
-public static final void gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter) {
+public static final native void _gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter);
@@ -20705,10 +17719,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_append(list_store, iter);
-@@ -5659,8 +5659,8 @@
- lock.unlock();
+@@ -7417,8 +7417,8 @@
}
}
+ /** @param store cast=(GtkListStore *) */
-public static final native void _gtk_list_store_clear(int /*long*/ store);
-public static final void gtk_list_store_clear(int /*long*/ store) {
+public static final native void _gtk_list_store_clear(long /*int*/ store);
@@ -20716,10 +17730,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_clear(store);
-@@ -5668,8 +5668,8 @@
- lock.unlock();
- }
- }
+@@ -7431,8 +7431,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param position cast=(gint)
+ */
-public static final native void _gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position);
-public static final void gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position) {
+public static final native void _gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position);
@@ -20727,10 +17741,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_insert(list_store, iter, position);
-@@ -5677,8 +5677,8 @@
- lock.unlock();
- }
- }
+@@ -7444,8 +7444,8 @@
+ * @param numColumns cast=(gint)
+ * @param types cast=(GType *)
+ */
-public static final native int /*long*/ _gtk_list_store_newv(int numColumns, int /*long*/[] types);
-public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*/[] types) {
+public static final native long /*int*/ _gtk_list_store_newv(int numColumns, long /*int*/[] types);
@@ -20738,10 +17752,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_list_store_newv(numColumns, types);
-@@ -5686,8 +5686,8 @@
- lock.unlock();
- }
- }
+@@ -7457,8 +7457,8 @@
+ * @param list_store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter);
-public static final void gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter) {
+public static final native void _gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter);
@@ -20749,10 +17763,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_remove(list_store, iter);
-@@ -5695,8 +5695,8 @@
- lock.unlock();
- }
- }
+@@ -7470,8 +7470,8 @@
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator);
@@ -20760,10 +17774,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -5704,8 +5704,8 @@
- lock.unlock();
- }
- }
+@@ -7483,8 +7483,8 @@
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator);
@@ -20771,10 +17785,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -5713,8 +5713,8 @@
- lock.unlock();
- }
- }
+@@ -7496,8 +7496,8 @@
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator);
@@ -20782,10 +17796,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -5722,8 +5722,8 @@
- lock.unlock();
- }
- }
+@@ -7510,8 +7510,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param value flags=no_out
+ */
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator);
@@ -20793,10 +17807,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -5731,8 +5731,8 @@
- lock.unlock();
- }
- }
+@@ -7523,8 +7523,8 @@
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator);
-public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) {
+public static final native void _gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator);
@@ -20804,10 +17818,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_list_store_set(store, iter, column, value, terminator);
-@@ -5785,8 +5785,8 @@
- lock.unlock();
+@@ -7581,8 +7581,8 @@
}
}
+ /** @param event cast=(GdkEvent *) */
-public static final native void _gtk_main_do_event(int /*long*/ event);
-public static final void gtk_main_do_event(int /*long*/ event) {
+public static final native void _gtk_main_do_event(long /*int*/ event);
@@ -20815,7 +17829,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_main_do_event(event);
-@@ -5794,8 +5794,8 @@
+@@ -7590,8 +7590,8 @@
lock.unlock();
}
}
@@ -20826,10 +17840,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_menu_bar_new();
-@@ -5803,8 +5803,8 @@
- lock.unlock();
+@@ -7600,8 +7600,8 @@
}
}
+ /** @param menu cast=(GtkMenu *) */
+-public static final native int /*long*/ _gtk_menu_get_attach_widget(int /*long*/ menu);
+-public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
++public static final native long /*int*/ _gtk_menu_get_attach_widget(long /*int*/ menu);
++public static final long /*int*/ gtk_menu_get_attach_widget(long /*int*/ menu) {
+ lock.lock();
+ try {
+ return _gtk_menu_get_attach_widget(menu);
+@@ -7610,8 +7610,8 @@
+ }
+ }
+ /** @param menu_item cast=(GtkMenuItem *) */
-public static final native void _gtk_menu_item_remove_submenu(int /*long*/ menu_item);
-public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
+public static final native void _gtk_menu_item_remove_submenu(long /*int*/ menu_item);
@@ -20837,10 +17862,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_item_remove_submenu(menu_item);
-@@ -5812,8 +5812,8 @@
- lock.unlock();
+@@ -7620,8 +7620,8 @@
}
}
+ /** @param menu_item cast=(GtkMenuItem *) */
-public static final native int /*long*/ _gtk_menu_item_get_submenu(int /*long*/ menu_item);
-public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_item) {
+public static final native long /*int*/ _gtk_menu_item_get_submenu(long /*int*/ menu_item);
@@ -20848,10 +17873,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_menu_item_get_submenu(menu_item);
-@@ -5821,8 +5821,8 @@
- lock.unlock();
- }
- }
+@@ -7633,8 +7633,8 @@
+ * @param menu_item cast=(GtkMenuItem *)
+ * @param submenu cast=(GtkWidget *)
+ */
-public static final native void _gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu);
-public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu) {
+public static final native void _gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu);
@@ -20859,7 +17884,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_item_set_submenu(menu_item, submenu);
-@@ -5830,8 +5830,8 @@
+@@ -7642,8 +7642,8 @@
lock.unlock();
}
}
@@ -20870,10 +17895,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_menu_new();
-@@ -5839,8 +5839,8 @@
- lock.unlock();
+@@ -7652,8 +7652,8 @@
}
}
+ /** @param menu cast=(GtkMenu *) */
-public static final native void _gtk_menu_popdown(int /*long*/ menu);
-public static final void gtk_menu_popdown(int /*long*/ menu) {
+public static final native void _gtk_menu_popdown(long /*int*/ menu);
@@ -20881,10 +17906,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_popdown(menu);
-@@ -5848,8 +5848,8 @@
- lock.unlock();
- }
- }
+@@ -7670,8 +7670,8 @@
+ * @param button cast=(guint)
+ * @param activate_time cast=(guint32)
+ */
-public static final native void _gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_menu_shell, int /*long*/ parent_menu_item, int /*long*/ func, int /*long*/ data, int button, int activate_time);
-public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_menu_shell, int /*long*/ parent_menu_item, int /*long*/ func, int /*long*/ data, int button, int activate_time) {
+public static final native void _gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time);
@@ -20892,10 +17917,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time);
-@@ -5857,8 +5857,8 @@
- lock.unlock();
+@@ -7680,8 +7680,8 @@
}
}
+ /** @param menu_shell cast=(GtkMenuShell *) */
-public static final native void _gtk_menu_shell_deactivate(int /*long*/ menu_shell);
-public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
+public static final native void _gtk_menu_shell_deactivate(long /*int*/ menu_shell);
@@ -20903,10 +17928,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_shell_deactivate(menu_shell);
-@@ -5866,8 +5866,8 @@
- lock.unlock();
- }
- }
+@@ -7694,8 +7694,8 @@
+ * @param child cast=(GtkWidget *)
+ * @param position cast=(gint)
+ */
-public static final native void _gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position);
-public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position) {
+public static final native void _gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position);
@@ -20914,10 +17939,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_shell_insert(menu_shell, child, position);
-@@ -5875,8 +5875,8 @@
- lock.unlock();
- }
- }
+@@ -7707,8 +7707,8 @@
+ * @param menu_shell cast=(GtkMenuShell *)
+ * @param menu_item cast=(GtkWidget *)
+ */
-public static final native void _gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item);
-public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item) {
+public static final native void _gtk_menu_shell_select_item(long /*int*/ menu_shell, long /*int*/ menu_item);
@@ -20925,10 +17950,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_shell_select_item(menu_shell, menu_item);
-@@ -5884,8 +5884,8 @@
- lock.unlock();
- }
- }
+@@ -7721,8 +7721,8 @@
+ * @param menu_shell cast=(GtkMenuShell *)
+ * @param take_focus cast=(gboolean)
+ */
-public static final native void _gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus);
-public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus) {
+public static final native void _gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus);
@@ -20936,10 +17961,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_menu_shell_set_take_focus(menu_shell, take_focus);
-@@ -5893,8 +5893,8 @@
- lock.unlock();
- }
- }
+@@ -7737,8 +7737,8 @@
+ * @param buttons cast=(GtkButtonsType)
+ * @param message_format cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format);
-public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format) {
+public static final native long /*int*/ _gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format);
@@ -20947,10 +17972,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_message_dialog_new(parent, flags, type, buttons, message_format);
-@@ -5902,8 +5902,8 @@
- lock.unlock();
- }
- }
+@@ -7751,8 +7751,8 @@
+ * @param xalign cast=(gfloat)
+ * @param yalign cast=(gfloat)
+ */
-public static final native void _gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign);
-public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign) {
+public static final native void _gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign);
@@ -20958,10 +17983,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_misc_set_alignment(misc, xalign, yalign);
-@@ -5911,8 +5911,8 @@
- lock.unlock();
+@@ -7761,8 +7761,8 @@
}
}
+ /** @param notebook cast=(GtkNotebook *) */
-public static final native int _gtk_notebook_get_current_page(int /*long*/ notebook);
-public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
+public static final native int _gtk_notebook_get_current_page(long /*int*/ notebook);
@@ -20969,10 +17994,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_notebook_get_current_page(notebook);
-@@ -5920,8 +5920,8 @@
- lock.unlock();
+@@ -7771,8 +7771,8 @@
}
}
+ /** @param notebook cast=(GtkNotebook *) */
-public static final native boolean _gtk_notebook_get_scrollable(int /*long*/ notebook);
-public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
+public static final native boolean _gtk_notebook_get_scrollable(long /*int*/ notebook);
@@ -20980,10 +18005,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_notebook_get_scrollable(notebook);
-@@ -5929,8 +5929,8 @@
- lock.unlock();
- }
- }
+@@ -7786,8 +7786,8 @@
+ * @param tab_label cast=(GtkWidget *)
+ * @param position cast=(gint)
+ */
-public static final native void _gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position);
-public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position) {
+public static final native void _gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position);
@@ -20991,7 +18016,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_insert_page(notebook, child, tab_label, position);
-@@ -5938,8 +5938,8 @@
+@@ -7795,8 +7795,8 @@
lock.unlock();
}
}
@@ -21002,10 +18027,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_notebook_new();
-@@ -5947,8 +5947,8 @@
- lock.unlock();
+@@ -7805,8 +7805,8 @@
}
}
+ /** @param notebook cast=(GtkNotebook *) */
-public static final native void _gtk_notebook_next_page(int /*long*/ notebook);
-public static final void gtk_notebook_next_page(int /*long*/ notebook) {
+public static final native void _gtk_notebook_next_page(long /*int*/ notebook);
@@ -21013,10 +18038,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_next_page(notebook);
-@@ -5956,8 +5956,8 @@
- lock.unlock();
+@@ -7815,8 +7815,8 @@
}
}
+ /** @param notebook cast=(GtkNotebook *) */
-public static final native void _gtk_notebook_prev_page(int /*long*/ notebook);
-public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
+public static final native void _gtk_notebook_prev_page(long /*int*/ notebook);
@@ -21024,10 +18049,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_prev_page(notebook);
-@@ -5965,8 +5965,8 @@
- lock.unlock();
- }
- }
+@@ -7828,8 +7828,8 @@
+ * @param notebook cast=(GtkNotebook *)
+ * @param page_num cast=(gint)
+ */
-public static final native void _gtk_notebook_remove_page(int /*long*/ notebook, int page_num);
-public static final void gtk_notebook_remove_page(int /*long*/ notebook, int page_num) {
+public static final native void _gtk_notebook_remove_page(long /*int*/ notebook, int page_num);
@@ -21035,10 +18060,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_remove_page(notebook, page_num);
-@@ -5974,8 +5974,8 @@
- lock.unlock();
- }
- }
+@@ -7841,8 +7841,8 @@
+ * @param notebook cast=(GtkNotebook *)
+ * @param page_num cast=(gint)
+ */
-public static final native void _gtk_notebook_set_current_page(int /*long*/ notebook, int page_num);
-public static final void gtk_notebook_set_current_page(int /*long*/ notebook, int page_num) {
+public static final native void _gtk_notebook_set_current_page(long /*int*/ notebook, int page_num);
@@ -21046,10 +18071,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_set_current_page(notebook, page_num);
-@@ -5983,8 +5983,8 @@
- lock.unlock();
- }
- }
+@@ -7854,8 +7854,8 @@
+ * @param notebook cast=(GtkNotebook *)
+ * @param scrollable cast=(gboolean)
+ */
-public static final native void _gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable);
-public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable) {
+public static final native void _gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable);
@@ -21057,10 +18082,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_set_scrollable(notebook, scrollable);
-@@ -5992,8 +5992,8 @@
- lock.unlock();
- }
- }
+@@ -7867,8 +7867,8 @@
+ * @param notebook cast=(GtkNotebook *)
+ * @param show_tabs cast=(gboolean)
+ */
-public static final native void _gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs);
-public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs) {
+public static final native void _gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs);
@@ -21068,10 +18093,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_set_show_tabs(notebook, show_tabs);
-@@ -6001,8 +6001,8 @@
- lock.unlock();
- }
- }
+@@ -7880,8 +7880,8 @@
+ * @param notebook cast=(GtkNotebook *)
+ * @param pos cast=(GtkPositionType)
+ */
-public static final native void _gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos);
-public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos) {
+public static final native void _gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos);
@@ -21079,10 +18104,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_notebook_set_tab_pos(notebook, pos);
-@@ -6010,8 +6010,8 @@
- lock.unlock();
+@@ -7890,8 +7890,8 @@
}
}
+ /** @param object cast=(GtkObject *) */
-public static final native void _gtk_object_sink(int /*long*/ object);
-public static final void gtk_object_sink(int /*long*/ object) {
+public static final native void _gtk_object_sink(long /*int*/ object);
@@ -21090,10 +18115,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_object_sink(object);
-@@ -6019,8 +6019,8 @@
- lock.unlock();
+@@ -7900,8 +7900,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_page_setup_new ();
-public static final int /*long*/ gtk_page_setup_new () {
+public static final native long /*int*/ _gtk_page_setup_new ();
@@ -21101,10 +18126,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_new ();
-@@ -6028,8 +6028,8 @@
- lock.unlock();
+@@ -7910,8 +7910,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_page_setup_get_orientation(int /*long*/ setup);
-public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
+public static final native int _gtk_page_setup_get_orientation(long /*int*/ setup);
@@ -21112,10 +18137,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_orientation(setup);
-@@ -6037,8 +6037,8 @@
- lock.unlock();
+@@ -7920,8 +7920,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_orientation(int /*long*/ setup, int orientation);
-public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int orientation) {
+public static final native void _gtk_page_setup_set_orientation(long /*int*/ setup, int orientation);
@@ -21123,10 +18148,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_page_setup_set_orientation(setup, orientation);
-@@ -6046,8 +6046,8 @@
- lock.unlock();
+@@ -7930,8 +7930,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_page_setup_get_paper_size(int /*long*/ setup);
-public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setup) {
+public static final native long /*int*/ _gtk_page_setup_get_paper_size(long /*int*/ setup);
@@ -21134,10 +18159,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_paper_size(setup);
-@@ -6055,8 +6055,8 @@
- lock.unlock();
+@@ -7940,8 +7940,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size);
-public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size) {
+public static final native void _gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size);
@@ -21145,10 +18170,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_page_setup_set_paper_size(setup, size);
-@@ -6064,8 +6064,8 @@
- lock.unlock();
+@@ -7950,8 +7950,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_top_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_top_margin(long /*int*/ setup, int unit);
@@ -21156,10 +18181,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_top_margin(setup, unit);
-@@ -6073,8 +6073,8 @@
- lock.unlock();
+@@ -7960,8 +7960,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit);
@@ -21167,10 +18192,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_page_setup_set_top_margin(setup, margin, unit);
-@@ -6082,8 +6082,8 @@
- lock.unlock();
+@@ -7970,8 +7970,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit);
@@ -21178,10 +18203,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_bottom_margin(setup, unit);
-@@ -6091,8 +6091,8 @@
- lock.unlock();
+@@ -7980,8 +7980,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit);
@@ -21189,10 +18214,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_page_setup_set_bottom_margin(setup, margin, unit);
-@@ -6100,8 +6100,8 @@
- lock.unlock();
+@@ -7990,8 +7990,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_left_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_left_margin(long /*int*/ setup, int unit);
@@ -21200,10 +18225,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_left_margin(setup, unit);
-@@ -6109,8 +6109,8 @@
- lock.unlock();
+@@ -8000,8 +8000,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit);
@@ -21211,10 +18236,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_page_setup_set_left_margin(setup, margin, unit);
-@@ -6118,8 +6118,8 @@
- lock.unlock();
+@@ -8010,8 +8010,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_right_margin(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_right_margin(long /*int*/ setup, int unit);
@@ -21222,10 +18247,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_right_margin(setup, unit);
-@@ -6127,8 +6127,8 @@
- lock.unlock();
+@@ -8020,8 +8020,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit);
-public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit) {
+public static final native void _gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit);
@@ -21233,10 +18258,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_page_setup_set_right_margin(setup, margin, unit);
-@@ -6136,8 +6136,8 @@
- lock.unlock();
+@@ -8030,8 +8030,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_paper_width(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_paper_width(long /*int*/ setup, int unit);
@@ -21244,10 +18269,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_paper_width(setup, unit);
-@@ -6145,8 +6145,8 @@
- lock.unlock();
+@@ -8040,8 +8040,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_paper_height(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_paper_height(long /*int*/ setup, int unit);
@@ -21255,10 +18280,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_paper_height(setup, unit);
-@@ -6154,8 +6154,8 @@
- lock.unlock();
+@@ -8050,8 +8050,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_page_width(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_page_width(long /*int*/ setup, int unit);
@@ -21266,10 +18291,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_page_width(setup, unit);
-@@ -6163,8 +6163,8 @@
- lock.unlock();
+@@ -8060,8 +8060,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_page_setup_get_page_height(int /*long*/ setup, int unit);
-public static final double gtk_page_setup_get_page_height(int /*long*/ setup, int unit) {
+public static final native double _gtk_page_setup_get_page_height(long /*int*/ setup, int unit);
@@ -21277,10 +18302,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_page_setup_get_page_height(setup, unit);
-@@ -6172,8 +6172,8 @@
- lock.unlock();
- }
- }
+@@ -8076,8 +8076,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_handle(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
-public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
+public static final native void _gtk_paint_handle(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
@@ -21288,10 +18313,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -6181,8 +6181,8 @@
- lock.unlock();
- }
- }
+@@ -8091,8 +8091,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_flat_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_flat_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21299,10 +18324,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -6190,8 +6190,8 @@
- lock.unlock();
- }
- }
+@@ -8107,8 +8107,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_focus(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_focus(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21310,10 +18335,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height);
-@@ -6199,8 +6199,8 @@
- lock.unlock();
- }
- }
+@@ -8122,8 +8122,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_option(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_option(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_option(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21321,10 +18346,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -6208,8 +6208,8 @@
- lock.unlock();
- }
- }
+@@ -8137,8 +8137,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_slider(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
-public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
+public static final native void _gtk_paint_slider(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
@@ -21332,10 +18357,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
-@@ -6217,8 +6217,8 @@
- lock.unlock();
- }
- }
+@@ -8152,8 +8152,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_tab(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_tab(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21343,10 +18368,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -6226,8 +6226,8 @@
- lock.unlock();
- }
- }
+@@ -8167,8 +8167,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_arrow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height);
-public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height) {
+public static final native void _gtk_paint_arrow(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height);
@@ -21354,10 +18379,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
-@@ -6236,8 +6236,8 @@
- }
- }
-
+@@ -8183,8 +8183,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_box(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21365,10 +18390,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -6245,8 +6245,8 @@
- lock.unlock();
- }
- }
+@@ -8198,8 +8198,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
-public static final native void _gtk_paint_box_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
-public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
+public static final native void _gtk_paint_box_gap(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
@@ -21376,10 +18401,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_box_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
-@@ -6254,8 +6254,8 @@
- lock.unlock();
- }
- }
+@@ -8213,8 +8213,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_check(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_check(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21387,10 +18412,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -6263,8 +6263,8 @@
- lock.unlock();
- }
- }
+@@ -8228,8 +8228,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_expander(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int expander_style);
-public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int expander_style) {
+public static final native void _gtk_paint_expander(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int expander_style);
@@ -21398,10 +18423,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style);
-@@ -6272,8 +6272,8 @@
- lock.unlock();
- }
- }
+@@ -8243,8 +8243,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
-public static final native void _gtk_paint_extension(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side);
-public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side) {
+public static final native void _gtk_paint_extension(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side);
@@ -21409,10 +18434,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
-@@ -6281,8 +6281,8 @@
- lock.unlock();
- }
- }
+@@ -8258,8 +8258,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_hline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x1 , int x2, int y);
-public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x1 , int x2, int y) {
+public static final native void _gtk_paint_hline(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x1 , int x2, int y);
@@ -21420,10 +18445,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y);
-@@ -6290,8 +6290,8 @@
- lock.unlock();
- }
- }
+@@ -8274,8 +8274,8 @@
+ * @param detail cast=(const gchar *)
+ * @param layout cast=(PangoLayout *)
+ */
-public static final native void _gtk_paint_layout(int /*long*/ style, int /*long*/ window, int state_type, boolean use_text, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int /*long*/ layout);
-public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ window, int state_type, boolean use_text, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int /*long*/ layout) {
+public static final native void _gtk_paint_layout(long /*int*/ style, long /*int*/ window, int state_type, boolean use_text, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, long /*int*/ layout);
@@ -21431,10 +18456,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout);
-@@ -6299,8 +6299,8 @@
- lock.unlock();
- }
- }
+@@ -8289,8 +8289,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
-public static final native void _gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
-public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
+public static final native void _gtk_paint_shadow_gap(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
@@ -21442,10 +18467,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_shadow_gap(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
-@@ -6308,8 +6308,8 @@
- lock.unlock();
- }
- }
+@@ -8304,8 +8304,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
-public static final native void _gtk_paint_shadow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
-public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
+public static final native void _gtk_paint_shadow(long /*int*/ style, long /*int*/ window, int state_type, int shadow_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int x , int y, int width, int height);
@@ -21453,10 +18478,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
-@@ -6317,8 +6317,8 @@
- lock.unlock();
- }
- }
+@@ -8319,8 +8319,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native void _gtk_paint_vline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int y1 , int y2, int x);
-public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int y1 , int y2, int x) {
+public static final native void _gtk_paint_vline(long /*int*/ style, long /*int*/ window, int state_type, GdkRectangle area, long /*int*/ widget, byte[] detail, int y1 , int y2, int x);
@@ -21464,10 +18489,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x);
-@@ -6326,8 +6326,8 @@
- lock.unlock();
+@@ -8329,8 +8329,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_paper_size_free(int /*long*/ size);
-public static final void gtk_paper_size_free(int /*long*/ size) {
+public static final native void _gtk_paper_size_free(long /*int*/ size);
@@ -21475,10 +18500,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_paper_size_free(size);
-@@ -6335,8 +6335,8 @@
- lock.unlock();
+@@ -8339,8 +8339,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_new(byte [] name);
-public static final int /*long*/ gtk_paper_size_new(byte [] name) {
+public static final native long /*int*/ _gtk_paper_size_new(byte [] name);
@@ -21486,10 +18511,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_new(name);
-@@ -6344,8 +6344,8 @@
- lock.unlock();
+@@ -8349,8 +8349,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
-public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
+public static final native long /*int*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
@@ -21497,10 +18522,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height);
-@@ -6353,8 +6353,8 @@
- lock.unlock();
+@@ -8359,8 +8359,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
-public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
+public static final native long /*int*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
@@ -21508,10 +18533,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_new_custom(name, display_name, width, height, unit);
-@@ -6362,8 +6362,8 @@
- lock.unlock();
+@@ -8369,8 +8369,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_get_name(int /*long*/ size);
-public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
+public static final native long /*int*/ _gtk_paper_size_get_name(long /*int*/ size);
@@ -21519,10 +18544,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_get_name(size);
-@@ -6371,8 +6371,8 @@
- lock.unlock();
+@@ -8379,8 +8379,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_get_display_name(int /*long*/ size);
-public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ size) {
+public static final native long /*int*/ _gtk_paper_size_get_display_name(long /*int*/ size);
@@ -21530,10 +18555,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_get_display_name(size);
-@@ -6380,8 +6380,8 @@
- lock.unlock();
+@@ -8389,8 +8389,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_paper_size_get_ppd_name(int /*long*/ size);
-public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size) {
+public static final native long /*int*/ _gtk_paper_size_get_ppd_name(long /*int*/ size);
@@ -21541,10 +18566,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_get_ppd_name(size);
-@@ -6389,8 +6389,8 @@
- lock.unlock();
+@@ -8399,8 +8399,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_paper_size_get_width(int /*long*/ size, int unit);
-public static final double gtk_paper_size_get_width(int /*long*/ size, int unit) {
+public static final native double _gtk_paper_size_get_width(long /*int*/ size, int unit);
@@ -21552,10 +18577,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_get_width(size, unit);
-@@ -6398,8 +6398,8 @@
- lock.unlock();
+@@ -8409,8 +8409,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_paper_size_get_height(int /*long*/ size, int unit);
-public static final double gtk_paper_size_get_height(int /*long*/ size, int unit) {
+public static final native double _gtk_paper_size_get_height(long /*int*/ size, int unit);
@@ -21563,10 +18588,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_get_height(size, unit);
-@@ -6407,8 +6407,8 @@
- lock.unlock();
+@@ -8419,8 +8419,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native boolean _gtk_paper_size_is_custom(int /*long*/ size);
-public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
+public static final native boolean _gtk_paper_size_is_custom(long /*int*/ size);
@@ -21574,10 +18599,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_paper_size_is_custom(size);
-@@ -6416,8 +6416,8 @@
- lock.unlock();
+@@ -8429,8 +8429,8 @@
}
}
+ /** @param plug cast=(GtkPlug *) */
-public static final native int /*long*/ _gtk_plug_get_id(int /*long*/ plug);
-public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
+public static final native long /*int*/ _gtk_plug_get_id(long /*int*/ plug);
@@ -21585,7 +18610,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_plug_get_id(plug);
-@@ -6425,8 +6425,8 @@
+@@ -8438,8 +8438,8 @@
lock.unlock();
}
}
@@ -21596,10 +18621,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_plug_new(socket_id);
-@@ -6434,8 +6434,8 @@
- lock.unlock();
+@@ -8448,8 +8448,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_printer_get_backend(int /*long*/ printer);
-public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
+public static final native long /*int*/ _gtk_printer_get_backend(long /*int*/ printer);
@@ -21607,10 +18632,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_printer_get_backend(printer);
-@@ -6443,8 +6443,8 @@
- lock.unlock();
+@@ -8458,8 +8458,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_printer_get_name(int /*long*/ printer);
-public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
+public static final native long /*int*/ _gtk_printer_get_name(long /*int*/ printer);
@@ -21618,10 +18643,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_printer_get_name(printer);
-@@ -6452,8 +6452,8 @@
- lock.unlock();
+@@ -8468,8 +8468,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native boolean _gtk_printer_is_default(int /*long*/ printer);
-public static final boolean gtk_printer_is_default(int /*long*/ printer) {
+public static final native boolean _gtk_printer_is_default(long /*int*/ printer);
@@ -21629,10 +18654,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_printer_is_default(printer);
-@@ -6461,8 +6461,8 @@
- lock.unlock();
- }
- }
+@@ -8483,8 +8483,8 @@
+ * @param destroy cast=(GDestroyNotify)
+ * @param wait cast=(gboolean)
+ */
-public static final native void _gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait);
-public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait) {
+public static final native void _gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait);
@@ -21640,10 +18665,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_enumerate_printers(func, data, destroy, wait);
-@@ -6470,8 +6470,8 @@
- lock.unlock();
- }
- }
+@@ -8496,8 +8496,8 @@
+ * @method flags=dynamic
+ * @param title cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup);
-public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup) {
+public static final native long /*int*/ _gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup);
@@ -21651,10 +18676,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_new(title, printer, settings, page_setup);
-@@ -6479,8 +6479,8 @@
- lock.unlock();
+@@ -8506,8 +8506,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_job_get_settings(int /*long*/ job);
-public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
+public static final native long /*int*/ _gtk_print_job_get_settings(long /*int*/ job);
@@ -21662,10 +18687,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_get_settings(job);
-@@ -6488,8 +6488,8 @@
- lock.unlock();
+@@ -8516,8 +8516,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_job_get_printer(int /*long*/ job);
-public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
+public static final native long /*int*/ _gtk_print_job_get_printer(long /*int*/ job);
@@ -21673,10 +18698,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_get_printer(job);
-@@ -6497,8 +6497,8 @@
- lock.unlock();
+@@ -8526,8 +8526,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_job_get_title(int /*long*/ job);
-public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
+public static final native long /*int*/ _gtk_print_job_get_title(long /*int*/ job);
@@ -21684,10 +18709,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_get_title(job);
-@@ -6506,8 +6506,8 @@
- lock.unlock();
+@@ -8536,8 +8536,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_print_job_get_status(int /*long*/ job);
-public static final int gtk_print_job_get_status(int /*long*/ job) {
+public static final native int _gtk_print_job_get_status(long /*int*/ job);
@@ -21695,10 +18720,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_get_status(job);
-@@ -6515,8 +6515,8 @@
- lock.unlock();
- }
- }
+@@ -8550,8 +8550,8 @@
+ * @param filename cast=(const gchar *)
+ * @param error cast=(GError **)
+ */
-public static final native boolean _gtk_print_job_set_source_file(int /*long*/ job, byte[] filename, int /*long*/ error[]);
-public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte[] filename, int /*long*/ error[]) {
+public static final native boolean _gtk_print_job_set_source_file(long /*int*/ job, byte[] filename, long /*int*/ error[]);
@@ -21706,10 +18731,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_set_source_file(job, filename, error);
-@@ -6524,8 +6524,8 @@
- lock.unlock();
- }
- }
+@@ -8563,8 +8563,8 @@
+ * @method flags=dynamic
+ * @param error cast=(GError **)
+ */
-public static final native int /*long*/ _gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]);
-public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]) {
+public static final native long /*int*/ _gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]);
@@ -21717,10 +18742,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_job_get_surface(job, error);
-@@ -6533,8 +6533,8 @@
- lock.unlock();
- }
- }
+@@ -8577,8 +8577,8 @@
+ * @param user_data cast=(gpointer)
+ * @param dnotify cast=(GDestroyNotify)
+ */
-public static final native void _gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify);
-public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify) {
+public static final native void _gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify);
@@ -21728,10 +18753,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_job_send(job, callback, user_data, dnotify);
-@@ -6542,8 +6542,8 @@
- lock.unlock();
+@@ -8587,8 +8587,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_settings_new();
-public static final int /*long*/ gtk_print_settings_new() {
+public static final native long /*int*/ _gtk_print_settings_new();
@@ -21739,10 +18764,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_new();
-@@ -6551,8 +6551,8 @@
- lock.unlock();
- }
- }
+@@ -8600,8 +8600,8 @@
+ * @method flags=dynamic
+ * @param data cast=(gpointer)
+ */
-public static final native void _gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data);
-public static final void gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data) {
+public static final native void _gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data);
@@ -21750,10 +18775,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_foreach(settings, func, data);
-@@ -6560,8 +6560,8 @@
- lock.unlock();
- }
- }
+@@ -8613,8 +8613,8 @@
+ * @method flags=dynamic
+ * @param key cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_print_settings_get(int /*long*/ settings, byte [] key);
-public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, byte [] key) {
+public static final native long /*int*/ _gtk_print_settings_get(long /*int*/ settings, byte [] key);
@@ -21761,10 +18786,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get(settings, key);
-@@ -6569,8 +6569,8 @@
- lock.unlock();
- }
- }
+@@ -8627,8 +8627,8 @@
+ * @param key cast=(const gchar *)
+ * @param value cast=(const gchar *)
+ */
-public static final native void _gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value);
-public static final void gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value) {
+public static final native void _gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value);
@@ -21772,10 +18797,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set(settings, key, value);
-@@ -6578,8 +6578,8 @@
- lock.unlock();
+@@ -8637,8 +8637,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_settings_get_printer(int /*long*/ settings);
-public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ settings) {
+public static final native long /*int*/ _gtk_print_settings_get_printer(long /*int*/ settings);
@@ -21783,10 +18808,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_printer(settings);
-@@ -6587,8 +6587,8 @@
- lock.unlock();
+@@ -8647,8 +8647,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer);
-public static final void gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer) {
+public static final native void _gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer);
@@ -21794,10 +18819,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set_printer(settings, printer);
-@@ -6596,8 +6596,8 @@
- lock.unlock();
+@@ -8657,8 +8657,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_orientation(int /*long*/ settings);
-public static final int gtk_print_settings_get_orientation(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_orientation(long /*int*/ settings);
@@ -21805,10 +18830,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_orientation(settings);
-@@ -6605,8 +6605,8 @@
- lock.unlock();
+@@ -8667,8 +8667,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_orientation(int /*long*/ settings, int orientation);
-public static final void gtk_print_settings_set_orientation(int /*long*/ settings, int orientation) {
+public static final native void _gtk_print_settings_set_orientation(long /*int*/ settings, int orientation);
@@ -21816,10 +18841,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set_orientation(settings, orientation);
-@@ -6614,8 +6614,8 @@
- lock.unlock();
+@@ -8677,8 +8677,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native boolean _gtk_print_settings_get_collate(int /*long*/ settings);
-public static final boolean gtk_print_settings_get_collate(int /*long*/ settings) {
+public static final native boolean _gtk_print_settings_get_collate(long /*int*/ settings);
@@ -21827,10 +18852,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_collate(settings);
-@@ -6623,8 +6623,8 @@
- lock.unlock();
- }
- }
+@@ -8690,8 +8690,8 @@
+ * @method flags=dynamic
+ * @param collate cast=(gboolean)
+ */
-public static final native void _gtk_print_settings_set_collate(int /*long*/ settings, boolean collate);
-public static final void gtk_print_settings_set_collate(int /*long*/ settings, boolean collate) {
+public static final native void _gtk_print_settings_set_collate(long /*int*/ settings, boolean collate);
@@ -21838,10 +18863,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set_collate(settings, collate);
-@@ -6632,8 +6632,8 @@
- lock.unlock();
+@@ -8700,8 +8700,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_n_copies(int /*long*/ settings);
-public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_n_copies(long /*int*/ settings);
@@ -21849,10 +18874,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_n_copies(settings);
-@@ -6641,8 +6641,8 @@
- lock.unlock();
- }
- }
+@@ -8713,8 +8713,8 @@
+ * @method flags=dynamic
+ * @param num_copies cast=(gint)
+ */
-public static final native void _gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies);
-public static final void gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies) {
+public static final native void _gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies);
@@ -21860,10 +18885,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set_n_copies(settings, num_copies);
-@@ -6650,8 +6650,8 @@
- lock.unlock();
+@@ -8723,8 +8723,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_print_pages(int /*long*/ settings);
-public static final int gtk_print_settings_get_print_pages(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_print_pages(long /*int*/ settings);
@@ -21871,10 +18896,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_print_pages(settings);
-@@ -6659,8 +6659,8 @@
- lock.unlock();
+@@ -8733,8 +8733,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_print_settings_set_print_pages(int /*long*/ settings, int pages);
-public static final void gtk_print_settings_set_print_pages(int /*long*/ settings, int pages) {
+public static final native void _gtk_print_settings_set_print_pages(long /*int*/ settings, int pages);
@@ -21882,10 +18907,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set_print_pages(settings, pages);
-@@ -6668,8 +6668,8 @@
- lock.unlock();
- }
- }
+@@ -8746,8 +8746,8 @@
+ * @method flags=dynamic
+ * @param num_ranges cast=(gint *)
+ */
-public static final native int /*long*/ _gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges);
-public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges) {
+public static final native long /*int*/ _gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges);
@@ -21893,10 +18918,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_page_ranges(settings, num_ranges);
-@@ -6677,8 +6677,8 @@
- lock.unlock();
- }
- }
+@@ -8759,8 +8759,8 @@
+ * @method flags=dynamic
+ * @param num_ranges cast=(gint)
+ */
-public static final native void _gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges);
-public static final void gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges) {
+public static final native void _gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges);
@@ -21904,10 +18929,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges);
-@@ -6686,8 +6686,8 @@
- lock.unlock();
+@@ -8769,8 +8769,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_print_settings_get_paper_width(int /*long*/ settings, int unit);
-public static final double gtk_print_settings_get_paper_width(int /*long*/ settings, int unit) {
+public static final native double _gtk_print_settings_get_paper_width(long /*int*/ settings, int unit);
@@ -21915,10 +18940,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_paper_width(settings, unit);
-@@ -6695,8 +6695,8 @@
- lock.unlock();
+@@ -8779,8 +8779,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native double _gtk_print_settings_get_paper_height(int /*long*/ settings, int unit);
-public static final double gtk_print_settings_get_paper_height(int /*long*/ settings, int unit) {
+public static final native double _gtk_print_settings_get_paper_height(long /*int*/ settings, int unit);
@@ -21926,10 +18951,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_paper_height(settings, unit);
-@@ -6704,8 +6704,8 @@
- lock.unlock();
+@@ -8789,8 +8789,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_print_settings_get_resolution(int /*long*/ settings);
-public static final int gtk_print_settings_get_resolution(int /*long*/ settings) {
+public static final native int _gtk_print_settings_get_resolution(long /*int*/ settings);
@@ -21937,10 +18962,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_settings_get_resolution(settings);
-@@ -6713,8 +6713,8 @@
- lock.unlock();
- }
- }
+@@ -8803,8 +8803,8 @@
+ * @param title cast=(const gchar *)
+ * @param parent cast=(GtkWindow *)
+ */
-public static final native int /*long*/ _gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent);
-public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent) {
+public static final native long /*int*/ _gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent);
@@ -21948,10 +18973,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_unix_dialog_new(title, parent);
-@@ -6722,8 +6722,8 @@
- lock.unlock();
+@@ -8813,8 +8813,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup);
-public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup) {
+public static final native void _gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup);
@@ -21959,10 +18984,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_unix_dialog_set_page_setup(dialog, page_setup);
-@@ -6731,8 +6731,8 @@
- lock.unlock();
+@@ -8823,8 +8823,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog);
-public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog) {
+public static final native long /*int*/ _gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog);
@@ -21970,10 +18995,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_unix_dialog_get_page_setup(dialog);
-@@ -6740,8 +6740,8 @@
- lock.unlock();
- }
- }
+@@ -8836,8 +8836,8 @@
+ * @method flags=dynamic
+ * @param current_page cast=(gint)
+ */
-public static final native void _gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page);
-public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page) {
+public static final native void _gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page);
@@ -21981,10 +19006,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_unix_dialog_set_current_page(dialog, current_page);
-@@ -6749,8 +6749,8 @@
- lock.unlock();
+@@ -8846,8 +8846,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _gtk_print_unix_dialog_get_current_page(int /*long*/ dialog);
-public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dialog) {
+public static final native int _gtk_print_unix_dialog_get_current_page(long /*int*/ dialog);
@@ -21992,10 +19017,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_unix_dialog_get_current_page(dialog);
-@@ -6758,8 +6758,8 @@
- lock.unlock();
+@@ -8856,8 +8856,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings);
-public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings) {
+public static final native void _gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings);
@@ -22003,10 +19028,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_unix_dialog_set_settings(dialog, settings);
-@@ -6767,8 +6767,8 @@
- lock.unlock();
+@@ -8866,8 +8866,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_unix_dialog_get_settings(int /*long*/ dialog);
-public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/ dialog) {
+public static final native long /*int*/ _gtk_print_unix_dialog_get_settings(long /*int*/ dialog);
@@ -22014,10 +19039,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_unix_dialog_get_settings(dialog);
-@@ -6776,8 +6776,8 @@
- lock.unlock();
+@@ -8876,8 +8876,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog);
-public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog) {
+public static final native long /*int*/ _gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog);
@@ -22025,10 +19050,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_print_unix_dialog_get_selected_printer(dialog);
-@@ -6785,8 +6785,8 @@
- lock.unlock();
+@@ -8886,8 +8886,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities);
-public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities) {
+public static final native void _gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities);
@@ -22036,7 +19061,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities);
-@@ -6794,8 +6794,8 @@
+@@ -8895,8 +8895,8 @@
lock.unlock();
}
}
@@ -22047,10 +19072,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_progress_bar_new();
-@@ -6803,8 +6803,8 @@
- lock.unlock();
+@@ -8905,8 +8905,8 @@
}
}
+ /** @param pbar cast=(GtkProgressBar *) */
-public static final native void _gtk_progress_bar_pulse(int /*long*/ pbar);
-public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
+public static final native void _gtk_progress_bar_pulse(long /*int*/ pbar);
@@ -22058,10 +19083,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_progress_bar_pulse(pbar);
-@@ -6812,8 +6812,8 @@
- lock.unlock();
- }
- }
+@@ -8918,8 +8918,8 @@
+ * @param pbar cast=(GtkProgressBar *)
+ * @param fraction cast=(gdouble)
+ */
-public static final native void _gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction);
-public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction) {
+public static final native void _gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction);
@@ -22069,10 +19094,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_progress_bar_set_fraction(pbar, fraction);
-@@ -6821,8 +6821,8 @@
- lock.unlock();
- }
- }
+@@ -8931,8 +8931,8 @@
+ * @param pbar cast=(GtkProgressBar *)
+ * @param orientation cast=(GtkProgressBarOrientation)
+ */
-public static final native void _gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation);
-public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation) {
+public static final native void _gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation);
@@ -22080,10 +19105,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_progress_bar_set_orientation(pbar, orientation);
-@@ -6830,8 +6830,8 @@
- lock.unlock();
+@@ -8941,8 +8941,8 @@
}
}
+ /** @param radio_button cast=(GtkRadioButton *) */
-public static final native int /*long*/ _gtk_radio_button_get_group(int /*long*/ radio_button);
-public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_button) {
+public static final native long /*int*/ _gtk_radio_button_get_group(long /*int*/ radio_button);
@@ -22091,10 +19116,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_radio_button_get_group(radio_button);
-@@ -6839,8 +6839,8 @@
- lock.unlock();
+@@ -8951,8 +8951,8 @@
}
}
+ /** @param group cast=(GSList *) */
-public static final native int /*long*/ _gtk_radio_button_new(int /*long*/ group);
-public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
+public static final native long /*int*/ _gtk_radio_button_new(long /*int*/ group);
@@ -22102,10 +19127,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_radio_button_new(group);
-@@ -6848,8 +6848,8 @@
- lock.unlock();
+@@ -8961,8 +8961,8 @@
}
}
+ /** @param radio_menu_item cast=(GtkRadioMenuItem *) */
-public static final native int /*long*/ _gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item);
-public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item) {
+public static final native long /*int*/ _gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item);
@@ -22113,10 +19138,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_radio_menu_item_get_group(radio_menu_item);
-@@ -6857,8 +6857,8 @@
- lock.unlock();
+@@ -8971,8 +8971,8 @@
}
}
+ /** @param group cast=(GSList *) */
-public static final native int /*long*/ _gtk_radio_menu_item_new(int /*long*/ group);
-public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
+public static final native long /*int*/ _gtk_radio_menu_item_new(long /*int*/ group);
@@ -22124,10 +19149,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_radio_menu_item_new(group);
-@@ -6866,8 +6866,8 @@
- lock.unlock();
- }
- }
+@@ -8984,8 +8984,8 @@
+ * @param group cast=(GSList *)
+ * @param label cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label);
-public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label) {
+public static final native long /*int*/ _gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label);
@@ -22135,10 +19160,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_radio_menu_item_new_with_label(group, label);
-@@ -6875,8 +6875,8 @@
- lock.unlock();
+@@ -8994,8 +8994,8 @@
}
}
+ /** @param range cast=(GtkRange *) */
-public static final native int /*long*/ _gtk_range_get_adjustment(int /*long*/ range);
-public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
+public static final native long /*int*/ _gtk_range_get_adjustment(long /*int*/ range);
@@ -22146,10 +19171,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_range_get_adjustment(range);
-@@ -6884,8 +6884,8 @@
- lock.unlock();
+@@ -9004,8 +9004,8 @@
}
}
+ /** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_increments(int /*long*/ range, double step, double page);
-public static final void gtk_range_set_increments(int /*long*/ range, double step, double page) {
+public static final native void _gtk_range_set_increments(long /*int*/ range, double step, double page);
@@ -22157,10 +19182,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_range_set_increments(range, step, page);
-@@ -6893,8 +6893,8 @@
- lock.unlock();
+@@ -9014,8 +9014,8 @@
}
}
+ /** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_inverted(int /*long*/ range, boolean setting);
-public static final void gtk_range_set_inverted(int /*long*/ range, boolean setting) {
+public static final native void _gtk_range_set_inverted(long /*int*/ range, boolean setting);
@@ -22168,10 +19193,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_range_set_inverted(range, setting);
-@@ -6902,8 +6902,8 @@
- lock.unlock();
+@@ -9024,8 +9024,8 @@
}
}
+ /** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_range(int /*long*/ range, double min, double max);
-public static final void gtk_range_set_range(int /*long*/ range, double min, double max) {
+public static final native void _gtk_range_set_range(long /*int*/ range, double min, double max);
@@ -22179,10 +19204,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_range_set_range(range, min, max);
-@@ -6911,8 +6911,8 @@
- lock.unlock();
+@@ -9034,8 +9034,8 @@
}
}
+ /** @param range cast=(GtkRange *) */
-public static final native void _gtk_range_set_value(int /*long*/ range, double value);
-public static final void gtk_range_set_value(int /*long*/ range, double value) {
+public static final native void _gtk_range_set_value(long /*int*/ range, double value);
@@ -22190,10 +19215,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_range_set_value(range, value);
-@@ -6929,8 +6929,8 @@
- lock.unlock();
+@@ -9054,8 +9054,8 @@
}
}
+ /** @param style cast=(GtkRcStyle *) */
-public static final native int /*long*/ _gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index);
-public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index) {
+public static final native long /*int*/ _gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index);
@@ -22201,10 +19226,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_rc_style_get_bg_pixmap_name(style, index);
-@@ -6938,8 +6938,8 @@
- lock.unlock();
+@@ -9064,8 +9064,8 @@
}
}
+ /** @param style cast=(GtkRcStyle *) */
-public static final native int _gtk_rc_style_get_color_flags(int /*long*/ style, int index);
-public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int index) {
+public static final native int _gtk_rc_style_get_color_flags(long /*int*/ style, int index);
@@ -22212,10 +19237,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_rc_style_get_color_flags(style, index);
-@@ -6947,8 +6947,8 @@
- lock.unlock();
- }
- }
+@@ -9077,8 +9077,8 @@
+ * @param style cast=(GtkRcStyle *)
+ * @param color flags=no_out
+ */
-public static final native void _gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color);
@@ -22223,10 +19248,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_rc_style_set_bg(style, index, color);
-@@ -6956,8 +6956,8 @@
- lock.unlock();
- }
- }
+@@ -9090,8 +9090,8 @@
+ * @param style cast=(GtkRcStyle *)
+ * @param name cast=(char *)
+ */
-public static final native void _gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name);
-public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name) {
+public static final native void _gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name);
@@ -22234,10 +19259,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_rc_style_set_bg_pixmap_name(style, index, name);
-@@ -6965,8 +6965,8 @@
- lock.unlock();
+@@ -9100,8 +9100,8 @@
}
}
+ /** @param style cast=(GtkRcStyle *) */
-public static final native void _gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag);
-public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag) {
+public static final native void _gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag);
@@ -22245,10 +19270,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_rc_style_set_color_flags(style, index, flag);
-@@ -6974,8 +6974,8 @@
- lock.unlock();
- }
- }
+@@ -9113,8 +9113,8 @@
+ * @param scale cast=(GtkScale *)
+ * @param digits cast=(gint)
+ */
-public static final native void _gtk_scale_set_digits(int /*long*/ scale, int digits);
-public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
+public static final native void _gtk_scale_set_digits(long /*int*/ scale, int digits);
@@ -22256,10 +19281,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scale_set_digits(scale, digits);
-@@ -6983,8 +6983,8 @@
- lock.unlock();
- }
- }
+@@ -9126,8 +9126,8 @@
+ * @param scale cast=(GtkScale *)
+ * @param draw_value cast=(gboolean)
+ */
-public static final native void _gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value);
-public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value) {
+public static final native void _gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value);
@@ -22267,10 +19292,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scale_set_draw_value(scale, draw_value);
-@@ -6992,8 +6992,8 @@
- lock.unlock();
- }
- }
+@@ -9139,8 +9139,8 @@
+ * @param style cast=(GtkRcStyle *)
+ * @param color flags=no_out
+ */
-public static final native void _gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color);
@@ -22278,10 +19303,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_rc_style_set_fg(style, index, color);
-@@ -7001,8 +7001,8 @@
- lock.unlock();
- }
- }
+@@ -9152,8 +9152,8 @@
+ * @param style cast=(GtkRcStyle *)
+ * @param color flags=no_out
+ */
-public static final native void _gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color);
@@ -22289,10 +19314,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_rc_style_set_text(style, index, color);
-@@ -7010,8 +7010,8 @@
- lock.unlock();
- }
- }
+@@ -9165,8 +9165,8 @@
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param child cast=(GtkWidget *)
+ */
-public static final native void _gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child);
-public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child) {
+public static final native void _gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child);
@@ -22300,10 +19325,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scrolled_window_add_with_viewport(scrolled_window, child);
-@@ -7019,8 +7019,8 @@
- lock.unlock();
+@@ -9175,8 +9175,8 @@
}
}
+ /** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int /*long*/ _gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window);
-public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window) {
+public static final native long /*int*/ _gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window);
@@ -22311,10 +19336,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_scrolled_window_get_hadjustment(scrolled_window);
-@@ -7028,8 +7028,8 @@
- lock.unlock();
- }
- }
+@@ -9189,8 +9189,8 @@
+ * @param hscrollbar_policy cast=(GtkPolicyType *)
+ * @param vscrollbar_policy cast=(GtkPolicyType *)
+ */
-public static final native void _gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
-public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {
+public static final native void _gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
@@ -22322,10 +19347,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -7037,8 +7037,8 @@
- lock.unlock();
+@@ -9199,8 +9199,8 @@
}
}
+ /** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int _gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window);
-public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window) {
+public static final native int _gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window);
@@ -22333,10 +19358,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_scrolled_window_get_shadow_type(scrolled_window);
-@@ -7046,8 +7046,8 @@
- lock.unlock();
+@@ -9209,8 +9209,8 @@
}
}
+ /** @param scrolled_window cast=(GtkScrolledWindow *) */
-public static final native int /*long*/ _gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window);
-public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window) {
+public static final native long /*int*/ _gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window);
@@ -22344,10 +19369,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_scrolled_window_get_vadjustment(scrolled_window);
-@@ -7055,8 +7055,8 @@
- lock.unlock();
- }
- }
+@@ -9222,8 +9222,8 @@
+ * @param hadjustment cast=(GtkAdjustment *)
+ * @param vadjustment cast=(GtkAdjustment *)
+ */
-public static final native int /*long*/ _gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment);
-public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment) {
+public static final native long /*int*/ _gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment);
@@ -22355,10 +19380,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_scrolled_window_new(hadjustment, vadjustment);
-@@ -7064,8 +7064,8 @@
- lock.unlock();
- }
- }
+@@ -9235,8 +9235,8 @@
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param placement cast=(GtkCornerType)
+ */
-public static final native void _gtk_scrolled_window_set_placement(int /*long*/ scrolled_window, int placement);
-public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled_window, int placement) {
+public static final native void _gtk_scrolled_window_set_placement(long /*int*/ scrolled_window, int placement);
@@ -22366,10 +19391,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scrolled_window_set_placement(scrolled_window, placement);
-@@ -7073,8 +7073,8 @@
- lock.unlock();
- }
- }
+@@ -9249,8 +9249,8 @@
+ * @param hscrollbar_policy cast=(GtkPolicyType)
+ * @param vscrollbar_policy cast=(GtkPolicyType)
+ */
-public static final native void _gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
-public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {
+public static final native void _gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
@@ -22377,10 +19402,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy);
-@@ -7082,8 +7082,8 @@
- lock.unlock();
- }
- }
+@@ -9262,8 +9262,8 @@
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param type cast=(GtkShadowType)
+ */
-public static final native void _gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type);
-public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type) {
+public static final native void _gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type);
@@ -22388,7 +19413,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_scrolled_window_set_shadow_type(scrolled_window, type);
-@@ -7091,8 +7091,8 @@
+@@ -9271,8 +9271,8 @@
lock.unlock();
}
}
@@ -22399,10 +19424,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_settings_get_default();
-@@ -7100,8 +7100,8 @@
- lock.unlock();
+@@ -9281,8 +9281,8 @@
}
}
+ /** @param selection_data cast=(GtkSelectionData *) */
-public static final native void _gtk_selection_data_free(int /*long*/ selection_data);
-public static final void gtk_selection_data_free(int /*long*/ selection_data) {
+public static final native void _gtk_selection_data_free(long /*int*/ selection_data);
@@ -22410,10 +19435,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_selection_data_free(selection_data);
-@@ -7109,8 +7109,8 @@
- lock.unlock();
- }
- }
+@@ -9297,8 +9297,8 @@
+ * @param data cast=(const guchar *)
+ * @param length cast=(gint)
+ */
-public static final native void _gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length);
-public static final void gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length) {
+public static final native void _gtk_selection_data_set(long /*int*/ selection_data, long /*int*/ type, int format, long /*int*/ data, int length);
@@ -22421,7 +19446,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_selection_data_set(selection_data, type, format, data, length);
-@@ -7118,8 +7118,8 @@
+@@ -9306,8 +9306,8 @@
lock.unlock();
}
}
@@ -22432,7 +19457,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_separator_menu_item_new();
-@@ -7127,8 +7127,8 @@
+@@ -9315,8 +9315,8 @@
lock.unlock();
}
}
@@ -22443,10 +19468,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_set_locale();
-@@ -7136,8 +7136,8 @@
- lock.unlock();
+@@ -9325,8 +9325,8 @@
}
}
+ /** @param socket cast=(GtkSocket *) */
-public static final native int /*long*/ _gtk_socket_get_id(int /*long*/ socket);
-public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
+public static final native long /*int*/ _gtk_socket_get_id(long /*int*/ socket);
@@ -22454,7 +19479,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_socket_get_id(socket);
-@@ -7145,8 +7145,8 @@
+@@ -9334,8 +9334,8 @@
lock.unlock();
}
}
@@ -22465,10 +19490,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_socket_new();
-@@ -7154,8 +7154,8 @@
- lock.unlock();
+@@ -9344,8 +9344,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native int /*long*/ _gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits);
-public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits) {
+public static final native long /*int*/ _gtk_spin_button_new(long /*int*/ adjustment, double climb_rate, int digits);
@@ -22476,10 +19501,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_spin_button_new(adjustment, climb_rate, digits);
-@@ -7163,8 +7163,8 @@
- lock.unlock();
+@@ -9354,8 +9354,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native int /*long*/ _gtk_spin_button_get_adjustment(int /*long*/ spin_button);
-public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spin_button) {
+public static final native long /*int*/ _gtk_spin_button_get_adjustment(long /*int*/ spin_button);
@@ -22487,10 +19512,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_spin_button_get_adjustment(spin_button);
-@@ -7173,8 +7173,8 @@
- }
+@@ -9365,8 +9365,8 @@
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native int _gtk_spin_button_get_digits(int /*long*/ spin_button);
-public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
+public static final native int _gtk_spin_button_get_digits(long /*int*/ spin_button);
@@ -22498,10 +19523,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_spin_button_get_digits(spin_button);
-@@ -7182,8 +7182,8 @@
- lock.unlock();
+@@ -9375,8 +9375,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_digits(int /*long*/ spin_button, int digits);
-public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, int digits) {
+public static final native void _gtk_spin_button_set_digits(long /*int*/ spin_button, int digits);
@@ -22509,10 +19534,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_spin_button_set_digits(spin_button, digits);
-@@ -7191,8 +7191,8 @@
- lock.unlock();
+@@ -9385,8 +9385,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page);
-public static final void gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page) {
+public static final native void _gtk_spin_button_set_increments(long /*int*/ spin_button, double step, double page);
@@ -22520,10 +19545,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_spin_button_set_increments(spin_button, step, page);
-@@ -7200,8 +7200,8 @@
- lock.unlock();
+@@ -9395,8 +9395,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min);
-public static final void gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min) {
+public static final native void _gtk_spin_button_set_range(long /*int*/ spin_button, double max, double min);
@@ -22531,10 +19556,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_spin_button_set_range(spin_button, max, min);
-@@ -7209,8 +7209,8 @@
- lock.unlock();
+@@ -9405,8 +9405,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_value(int /*long*/ spin_button, double value);
-public static final void gtk_spin_button_set_value(int /*long*/ spin_button, double value) {
+public static final native void _gtk_spin_button_set_value(long /*int*/ spin_button, double value);
@@ -22542,10 +19567,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_spin_button_set_value(spin_button, value);
-@@ -7218,8 +7218,8 @@
- lock.unlock();
+@@ -9415,8 +9415,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap);
-public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap) {
+public static final native void _gtk_spin_button_set_wrap(long /*int*/ spin_button, boolean wrap);
@@ -22553,10 +19578,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_spin_button_set_wrap(spin_button, wrap);
-@@ -7227,8 +7227,8 @@
- lock.unlock();
+@@ -9425,8 +9425,8 @@
}
}
+ /** @param spin_button cast=(GtkSpinButton*) */
-public static final native void _gtk_spin_button_update(int /*long*/ spin_button);
-public static final void gtk_spin_button_update(int /*long*/ spin_button) {
+public static final native void _gtk_spin_button_update(long /*int*/ spin_button);
@@ -22564,10 +19589,76 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_spin_button_update(spin_button);
-@@ -7236,8 +7236,8 @@
- lock.unlock();
+@@ -9437,8 +9437,8 @@
+ /**
+ * @method flags=dynamic
+ */
+-public static final native boolean _gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation);
+-public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation) {
++public static final native boolean _gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation);
++public static final boolean gtk_status_icon_get_geometry(long /*int*/ handle, long /*int*/ screen, GdkRectangle area, long /*int*/ orientation) {
+ lock.lock();
+ try {
+ return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
+@@ -9449,8 +9449,8 @@
+ /**
+ * @method flags=dynamic
+ */
+-public static final native boolean _gtk_status_icon_get_visible(int /*long*/ handle);
+-public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
++public static final native boolean _gtk_status_icon_get_visible(long /*int*/ handle);
++public static final boolean gtk_status_icon_get_visible(long /*int*/ handle) {
+ lock.lock();
+ try {
+ return _gtk_status_icon_get_visible(handle);
+@@ -9459,8 +9459,8 @@
}
}
+ /** @method flags=dynamic */
+-public static final native int /*long*/ _gtk_status_icon_new();
+-public static final int /*long*/ gtk_status_icon_new() {
++public static final native long /*int*/ _gtk_status_icon_new();
++public static final long /*int*/ gtk_status_icon_new() {
+ lock.lock();
+ try {
+ return _gtk_status_icon_new();
+@@ -9471,8 +9471,8 @@
+ /**
+ * @method flags=dynamic
+ */
+-public static final native void _gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf);
+-public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf) {
++public static final native void _gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf);
++public static final void gtk_status_icon_set_from_pixbuf(long /*int*/ handle, long /*int*/ pixbuf) {
+ lock.lock();
+ try {
+ _gtk_status_icon_set_from_pixbuf(handle, pixbuf);
+@@ -9483,8 +9483,8 @@
+ /**
+ * @method flags=dynamic
+ */
+-public static final native void _gtk_status_icon_set_visible(int /*long*/ handle, boolean visible);
+-public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolean visible) {
++public static final native void _gtk_status_icon_set_visible(long /*int*/ handle, boolean visible);
++public static final void gtk_status_icon_set_visible(long /*int*/ handle, boolean visible) {
+ lock.lock();
+ try {
+ _gtk_status_icon_set_visible(handle, visible);
+@@ -9495,8 +9495,8 @@
+ /**
+ * @method flags=dynamic
+ */
+-public static final native void _gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text);
+-public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text) {
++public static final native void _gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text);
++public static final void gtk_status_icon_set_tooltip(long /*int*/ handle, byte[] tip_text) {
+ lock.lock();
+ try {
+ _gtk_status_icon_set_tooltip(handle, tip_text);
+@@ -9508,8 +9508,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_base(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_base(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_base(long /*int*/ style, int index, GdkColor color);
@@ -22575,10 +19666,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_base(style, index, color);
-@@ -7245,8 +7245,8 @@
- lock.unlock();
- }
- }
+@@ -9521,8 +9521,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_black(int /*long*/ style, GdkColor color);
-public static final void gtk_style_get_black(int /*long*/ style, GdkColor color) {
+public static final native void _gtk_style_get_black(long /*int*/ style, GdkColor color);
@@ -22586,10 +19677,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_black(style, color);
-@@ -7254,8 +7254,8 @@
- lock.unlock();
- }
- }
+@@ -9534,8 +9534,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_bg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_bg(long /*int*/ style, int index, GdkColor color);
@@ -22597,10 +19688,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_bg(style, index, color);
-@@ -7263,8 +7263,8 @@
- lock.unlock();
- }
- }
+@@ -9547,8 +9547,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_dark(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_dark(long /*int*/ style, int index, GdkColor color);
@@ -22608,10 +19699,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_dark(style, index, color);
-@@ -7272,8 +7272,8 @@
- lock.unlock();
- }
- }
+@@ -9560,8 +9560,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_fg(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_fg(long /*int*/ style, int index, GdkColor color);
@@ -22619,10 +19710,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_fg(style, index, color);
-@@ -7281,8 +7281,8 @@
- lock.unlock();
- }
- }
+@@ -9573,8 +9573,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
-public static final native void _gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_fg_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22630,10 +19721,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_fg_gc(style, index, gc);
-@@ -7290,8 +7290,8 @@
- lock.unlock();
- }
- }
+@@ -9586,8 +9586,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
-public static final native void _gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_bg_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22641,10 +19732,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_bg_gc(style, index, gc);
-@@ -7299,8 +7299,8 @@
- lock.unlock();
- }
- }
+@@ -9599,8 +9599,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
-public static final native void _gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_light_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22652,10 +19743,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_light_gc(style, index, gc);
-@@ -7308,8 +7308,8 @@
- lock.unlock();
- }
- }
+@@ -9612,8 +9612,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
-public static final native void _gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_dark_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22663,10 +19754,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_dark_gc(style, index, gc);
-@@ -7317,8 +7317,8 @@
- lock.unlock();
- }
- }
+@@ -9625,8 +9625,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
-public static final native void _gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_mid_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22674,10 +19765,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_mid_gc(style, index, gc);
-@@ -7326,8 +7326,8 @@
- lock.unlock();
- }
- }
+@@ -9638,8 +9638,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
-public static final native void _gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_text_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22685,10 +19776,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_text_gc(style, index, gc);
-@@ -7335,8 +7335,8 @@
- lock.unlock();
- }
- }
+@@ -9651,8 +9651,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
-public static final native void _gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc);
-public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc) {
+public static final native void _gtk_style_get_text_aa_gc(long /*int*/ style, int index, long /*int*/[] gc);
@@ -22696,10 +19787,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_text_aa_gc(style, index, gc);
-@@ -7344,8 +7344,8 @@
- lock.unlock();
- }
- }
+@@ -9664,8 +9664,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
-public static final native void _gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc);
-public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc) {
+public static final native void _gtk_style_get_black_gc(long /*int*/ style, long /*int*/[] gc);
@@ -22707,10 +19798,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_black_gc(style, gc);
-@@ -7353,8 +7353,8 @@
- lock.unlock();
- }
- }
+@@ -9677,8 +9677,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
-public static final native void _gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc);
-public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc) {
+public static final native void _gtk_style_get_white_gc(long /*int*/ style, long /*int*/[] gc);
@@ -22718,10 +19809,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_white_gc(style, gc);
-@@ -7362,8 +7362,8 @@
- lock.unlock();
+@@ -9687,8 +9687,8 @@
}
}
+ /** @param style cast=(GtkStyle *) */
-public static final native int /*long*/ _gtk_style_get_font_desc(int /*long*/ style);
-public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
+public static final native long /*int*/ _gtk_style_get_font_desc(long /*int*/ style);
@@ -22729,10 +19820,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_style_get_font_desc(style);
-@@ -7371,8 +7371,8 @@
- lock.unlock();
- }
- }
+@@ -9700,8 +9700,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_light(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_light(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_light(long /*int*/ style, int index, GdkColor color);
@@ -22740,10 +19831,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_light(style, index, color);
-@@ -7380,8 +7380,8 @@
- lock.unlock();
- }
- }
+@@ -9713,8 +9713,8 @@
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
-public static final native void _gtk_style_get_text(int /*long*/ style, int index, GdkColor color);
-public static final void gtk_style_get_text(int /*long*/ style, int index, GdkColor color) {
+public static final native void _gtk_style_get_text(long /*int*/ style, int index, GdkColor color);
@@ -22751,10 +19842,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_style_get_text(style, index, color);
-@@ -7389,8 +7389,8 @@
- lock.unlock();
+@@ -9723,8 +9723,8 @@
}
}
+ /** @param style cast=(GtkStyle *) */
-public static final native int _gtk_style_get_xthickness(int /*long*/ style);
-public static final int gtk_style_get_xthickness(int /*long*/ style) {
+public static final native int _gtk_style_get_xthickness(long /*int*/ style);
@@ -22762,10 +19853,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_style_get_xthickness(style);
-@@ -7398,8 +7398,8 @@
- lock.unlock();
+@@ -9733,8 +9733,8 @@
}
}
+ /** @param style cast=(GtkStyle *) */
-public static final native int _gtk_style_get_ythickness(int /*long*/ style);
-public static final int gtk_style_get_ythickness(int /*long*/ style) {
+public static final native int _gtk_style_get_ythickness(long /*int*/ style);
@@ -22773,10 +19864,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_style_get_ythickness(style);
-@@ -7407,8 +7407,8 @@
- lock.unlock();
- }
- }
+@@ -9748,8 +9748,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail);
-public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail) {
+public static final native long /*int*/ _gtk_style_render_icon(long /*int*/ style, long /*int*/ source, int direction, int state, int size, long /*int*/ widget, byte[] detail);
@@ -22784,10 +19875,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_style_render_icon(style, source, direction, state, size, widget, detail);
-@@ -7416,8 +7416,8 @@
- lock.unlock();
- }
- }
+@@ -9761,8 +9761,8 @@
+ * @param targets cast=(const GtkTargetEntry *)
+ * @param ntargets cast=(guint)
+ */
-public static final native int /*long*/ _gtk_target_list_new(int /*long*/ targets, int ntargets);
-public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int ntargets) {
+public static final native long /*int*/ _gtk_target_list_new(long /*int*/ targets, int ntargets);
@@ -22795,10 +19886,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_target_list_new(targets, ntargets);
-@@ -7425,8 +7425,8 @@
- lock.unlock();
+@@ -9771,8 +9771,8 @@
}
}
+ /** @param list cast=(GtkTargetList *) */
-public static final native void _gtk_target_list_unref(int /*long*/ list);
-public static final void gtk_target_list_unref(int /*long*/ list) {
+public static final native void _gtk_target_list_unref(long /*int*/ list);
@@ -22806,10 +19897,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_target_list_unref(list);
-@@ -7434,8 +7434,8 @@
- lock.unlock();
- }
- }
+@@ -9784,8 +9784,8 @@
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param clipboard cast=(GtkClipboard *)
+ */
-public static final native void _gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard);
-public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard) {
+public static final native void _gtk_text_buffer_copy_clipboard(long /*int*/ buffer, long /*int*/ clipboard);
@@ -22817,10 +19908,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_copy_clipboard(buffer, clipboard);
-@@ -7443,8 +7443,8 @@
- lock.unlock();
- }
- }
+@@ -9798,8 +9798,8 @@
+ * @param clipboard cast=(GtkClipboard *)
+ * @param default_editable cast=(gboolean)
+ */
-public static final native void _gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable);
-public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable) {
+public static final native void _gtk_text_buffer_cut_clipboard(long /*int*/ buffer, long /*int*/ clipboard, boolean default_editable);
@@ -22828,10 +19919,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_cut_clipboard(buffer, clipboard, default_editable);
-@@ -7452,8 +7452,8 @@
- lock.unlock();
- }
- }
+@@ -9812,8 +9812,8 @@
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ */
-public static final native void _gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end);
-public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end) {
+public static final native void _gtk_text_buffer_delete(long /*int*/ buffer, byte[] start, byte[] end);
@@ -22839,10 +19930,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_delete(buffer, start, end);
-@@ -7461,8 +7461,8 @@
- lock.unlock();
- }
- }
+@@ -9826,8 +9826,8 @@
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ */
-public static final native void _gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end);
-public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end) {
+public static final native void _gtk_text_buffer_get_bounds(long /*int*/ buffer, byte[] start, byte[] end);
@@ -22850,10 +19941,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_get_bounds(buffer, start, end);
-@@ -7470,8 +7470,8 @@
- lock.unlock();
+@@ -9836,8 +9836,8 @@
}
}
+ /** @param buffer cast=(GtkTextBuffer *) */
-public static final native int _gtk_text_buffer_get_char_count(int /*long*/ buffer);
-public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
+public static final native int _gtk_text_buffer_get_char_count(long /*int*/ buffer);
@@ -22861,10 +19952,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_buffer_get_char_count(buffer);
-@@ -7479,8 +7479,8 @@
- lock.unlock();
- }
- }
+@@ -9849,8 +9849,8 @@
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ */
-public static final native void _gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter);
-public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter) {
+public static final native void _gtk_text_buffer_get_end_iter(long /*int*/ buffer, byte[] iter);
@@ -22872,10 +19963,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_get_end_iter(buffer, iter);
-@@ -7488,8 +7488,8 @@
- lock.unlock();
+@@ -9859,8 +9859,8 @@
}
}
+ /** @param buffer cast=(GtkTextBuffer *) */
-public static final native int /*long*/ _gtk_text_buffer_get_insert(int /*long*/ buffer);
-public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer) {
+public static final native long /*int*/ _gtk_text_buffer_get_insert(long /*int*/ buffer);
@@ -22883,10 +19974,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_buffer_get_insert(buffer);
-@@ -7497,8 +7497,8 @@
- lock.unlock();
- }
- }
+@@ -9873,8 +9873,8 @@
+ * @param iter cast=(GtkTextIter *)
+ * @param line_number cast=(gint)
+ */
-public static final native void _gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number);
-public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number) {
+public static final native void _gtk_text_buffer_get_iter_at_line(long /*int*/ buffer, byte[] iter, int line_number);
@@ -22894,10 +19985,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_get_iter_at_line(buffer, iter, line_number);
-@@ -7506,8 +7506,8 @@
- lock.unlock();
- }
- }
+@@ -9887,8 +9887,8 @@
+ * @param iter cast=(GtkTextIter *)
+ * @param mark cast=(GtkTextMark *)
+ */
-public static final native void _gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark);
-public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark) {
+public static final native void _gtk_text_buffer_get_iter_at_mark(long /*int*/ buffer, byte[] iter, long /*int*/ mark);
@@ -22905,10 +19996,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-@@ -7515,8 +7515,8 @@
- lock.unlock();
- }
- }
+@@ -9901,8 +9901,8 @@
+ * @param iter cast=(GtkTextIter *)
+ * @param char_offset cast=(gint)
+ */
-public static final native void _gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset);
-public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset) {
+public static final native void _gtk_text_buffer_get_iter_at_offset(long /*int*/ buffer, byte[] iter, int char_offset);
@@ -22916,10 +20007,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_get_iter_at_offset(buffer, iter, char_offset);
-@@ -7524,8 +7524,8 @@
- lock.unlock();
+@@ -9911,8 +9911,8 @@
}
}
+ /** @param buffer cast=(GtkTextBuffer *) */
-public static final native int _gtk_text_buffer_get_line_count(int /*long*/ buffer);
-public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
+public static final native int _gtk_text_buffer_get_line_count(long /*int*/ buffer);
@@ -22927,10 +20018,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_buffer_get_line_count(buffer);
-@@ -7533,8 +7533,8 @@
- lock.unlock();
+@@ -9921,8 +9921,8 @@
}
}
+ /** @param buffer cast=(GtkTextBuffer *) */
-public static final native int /*long*/ _gtk_text_buffer_get_selection_bound(int /*long*/ buffer);
-public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*/ buffer) {
+public static final native long /*int*/ _gtk_text_buffer_get_selection_bound(long /*int*/ buffer);
@@ -22938,10 +20029,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_buffer_get_selection_bound(buffer);
-@@ -7542,8 +7542,8 @@
- lock.unlock();
- }
- }
+@@ -9935,8 +9935,8 @@
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ */
-public static final native boolean _gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end);
-public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end) {
+public static final native boolean _gtk_text_buffer_get_selection_bounds(long /*int*/ buffer, byte[] start, byte[] end);
@@ -22949,10 +20040,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_buffer_get_selection_bounds(buffer, start, end);
-@@ -7551,8 +7551,8 @@
- lock.unlock();
- }
- }
+@@ -9950,8 +9950,8 @@
+ * @param end cast=(GtkTextIter *)
+ * @param include_hidden_chars cast=(gboolean)
+ */
-public static final native int /*long*/ _gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
-public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {
+public static final native long /*int*/ _gtk_text_buffer_get_text(long /*int*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
@@ -22960,10 +20051,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_buffer_get_text(buffer, start, end, include_hidden_chars);
-@@ -7560,8 +7560,8 @@
- lock.unlock();
- }
- }
+@@ -9965,8 +9965,8 @@
+ * @param text cast=(const gchar *)
+ * @param len cast=(gint)
+ */
-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len);
-public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len) {
+public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, byte[] iter, byte[] text, int len);
@@ -22971,10 +20062,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -7569,8 +7569,8 @@
- lock.unlock();
- }
- }
+@@ -9980,8 +9980,8 @@
+ * @param text cast=(const gchar *)
+ * @param len cast=(gint)
+ */
-public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len);
-public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len) {
+public static final native void _gtk_text_buffer_insert(long /*int*/ buffer, long /*int*/ iter, byte[] text, int len);
@@ -22982,10 +20073,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_insert(buffer, iter, text, len);
-@@ -7578,8 +7578,8 @@
- lock.unlock();
- }
- }
+@@ -9994,8 +9994,8 @@
+ * @param mark cast=(GtkTextMark *)
+ * @param where cast=(const GtkTextIter *)
+ */
-public static final native void _gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where);
-public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where) {
+public static final native void _gtk_text_buffer_move_mark(long /*int*/ buffer, long /*int*/ mark, byte[] where);
@@ -22993,10 +20084,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_move_mark(buffer, mark, where);
-@@ -7587,8 +7587,8 @@
- lock.unlock();
- }
- }
+@@ -10009,8 +10009,8 @@
+ * @param override_location cast=(GtkTextIter *)
+ * @param default_editable cast=(gboolean)
+ */
-public static final native void _gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable);
-public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable) {
+public static final native void _gtk_text_buffer_paste_clipboard(long /*int*/ buffer, long /*int*/ clipboard, byte[] override_location, boolean default_editable);
@@ -23004,10 +20095,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_paste_clipboard(buffer, clipboard, override_location, default_editable);
-@@ -7596,8 +7596,8 @@
- lock.unlock();
- }
- }
+@@ -10022,8 +10022,8 @@
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param where cast=(const GtkTextIter *)
+ */
-public static final native void _gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where);
-public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where) {
+public static final native void _gtk_text_buffer_place_cursor(long /*int*/ buffer, byte[] where);
@@ -23015,10 +20106,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_place_cursor(buffer, where);
-@@ -7605,8 +7605,8 @@
- lock.unlock();
- }
- }
+@@ -10036,8 +10036,8 @@
+ * @param text cast=(const gchar *)
+ * @param len cast=(gint)
+ */
-public static final native void _gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len);
-public static final void gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len) {
+public static final native void _gtk_text_buffer_set_text(long /*int*/ buffer, byte[] text, int len);
@@ -23026,10 +20117,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_buffer_set_text(buffer, text, len);
-@@ -7632,8 +7632,8 @@
- lock.unlock();
- }
- }
+@@ -10073,8 +10073,8 @@
+ * @param window_x cast=(gint *)
+ * @param window_y cast=(gint *)
+ */
-public static final native void _gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
-public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) {
+public static final native void _gtk_text_view_buffer_to_window_coords(long /*int*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
@@ -23037,10 +20128,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_buffer_to_window_coords(text_view, win, buffer_x, buffer_y, window_x, window_y);
-@@ -7641,8 +7641,8 @@
- lock.unlock();
+@@ -10083,8 +10083,8 @@
}
}
+ /** @param text_view cast=(GtkTextView *) */
-public static final native int /*long*/ _gtk_text_view_get_buffer(int /*long*/ text_view);
-public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view) {
+public static final native long /*int*/ _gtk_text_view_get_buffer(long /*int*/ text_view);
@@ -23048,10 +20139,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_view_get_buffer(text_view);
-@@ -7650,8 +7650,8 @@
- lock.unlock();
+@@ -10093,8 +10093,8 @@
}
}
+ /** @param text_view cast=(GtkTextView *) */
-public static final native boolean _gtk_text_view_get_editable(int /*long*/ text_view);
-public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
+public static final native boolean _gtk_text_view_get_editable(long /*int*/ text_view);
@@ -23059,10 +20150,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_view_get_editable(text_view);
-@@ -7659,8 +7659,8 @@
- lock.unlock();
- }
- }
+@@ -10108,8 +10108,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native void _gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y);
-public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y) {
+public static final native void _gtk_text_view_get_iter_at_location(long /*int*/ text_view, byte[] iter, int x, int y);
@@ -23070,10 +20161,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_get_iter_at_location(text_view, iter, x, y);
-@@ -7668,8 +7668,8 @@
- lock.unlock();
- }
- }
+@@ -10122,8 +10122,8 @@
+ * @param iter cast=(const GtkTextIter *)
+ * @param location cast=(GdkRectangle *),flags=no_in
+ */
-public static final native void _gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location);
-public static final void gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location) {
+public static final native void _gtk_text_view_get_iter_location(long /*int*/ text_view, byte[] iter, GdkRectangle location);
@@ -23081,10 +20172,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_get_iter_location(text_view, iter, location);
-@@ -7677,8 +7677,8 @@
- lock.unlock();
- }
- }
+@@ -10137,8 +10137,8 @@
+ * @param y cast=(gint)
+ * @param line_top cast=(gint *)
+ */
-public static final native void _gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top);
-public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top) {
+public static final native void _gtk_text_view_get_line_at_y(long /*int*/ text_view, byte[] target_iter, int y, int[] line_top);
@@ -23092,10 +20183,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_get_line_at_y(text_view, target_iter, y, line_top);
-@@ -7686,8 +7686,8 @@
- lock.unlock();
- }
- }
+@@ -10150,8 +10150,8 @@
+ * @param text_view cast=(GtkTextView *)
+ * @param visible_rect cast=(GdkRectangle *),flags=no_in
+ */
-public static final native void _gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect);
-public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect) {
+public static final native void _gtk_text_view_get_visible_rect(long /*int*/ text_view, GdkRectangle visible_rect);
@@ -23103,10 +20194,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_get_visible_rect(text_view, visible_rect);
-@@ -7695,8 +7695,8 @@
- lock.unlock();
- }
- }
+@@ -10163,8 +10163,8 @@
+ * @param text_view cast=(GtkTextView *)
+ * @param win cast=(GtkTextWindowType)
+ */
-public static final native int /*long*/ _gtk_text_view_get_window(int /*long*/ text_view, int win);
-public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view, int win) {
+public static final native long /*int*/ _gtk_text_view_get_window(long /*int*/ text_view, int win);
@@ -23114,7 +20205,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_view_get_window(text_view, win);
-@@ -7704,8 +7704,8 @@
+@@ -10172,8 +10172,8 @@
lock.unlock();
}
}
@@ -23125,10 +20216,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_view_new();
-@@ -7713,8 +7713,8 @@
- lock.unlock();
- }
- }
+@@ -10185,8 +10185,8 @@
+ * @param text_view cast=(GtkTextView *)
+ * @param mark cast=(GtkTextMark *)
+ */
-public static final native void _gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark);
-public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark) {
+public static final native void _gtk_text_view_scroll_mark_onscreen(long /*int*/ text_view, long /*int*/ mark);
@@ -23136,10 +20227,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_scroll_mark_onscreen(text_view, mark);
-@@ -7722,8 +7722,8 @@
- lock.unlock();
- }
- }
+@@ -10202,8 +10202,8 @@
+ * @param xalign cast=(gdouble)
+ * @param yalign cast=(gdouble)
+ */
-public static final native boolean _gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
-public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) {
+public static final native boolean _gtk_text_view_scroll_to_iter(long /*int*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
@@ -23147,10 +20238,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_text_view_scroll_to_iter(text_view, iter, within_margin, use_align, xalign, yalign);
-@@ -7731,8 +7731,8 @@
- lock.unlock();
- }
- }
+@@ -10215,8 +10215,8 @@
+ * @param text_view cast=(GtkTextView *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_text_view_set_editable(int /*long*/ text_view, boolean setting);
-public static final void gtk_text_view_set_editable(int /*long*/ text_view, boolean setting) {
+public static final native void _gtk_text_view_set_editable(long /*int*/ text_view, boolean setting);
@@ -23158,10 +20249,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_set_editable(text_view, setting);
-@@ -7740,8 +7740,8 @@
- lock.unlock();
+@@ -10225,8 +10225,8 @@
}
}
+ /** @param text_view cast=(GtkTextView *) */
-public static final native void _gtk_text_view_set_justification(int /*long*/ text_view, int justification);
-public static final void gtk_text_view_set_justification(int /*long*/ text_view, int justification) {
+public static final native void _gtk_text_view_set_justification(long /*int*/ text_view, int justification);
@@ -23169,10 +20260,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_set_justification(text_view, justification);
-@@ -7749,8 +7749,8 @@
- lock.unlock();
- }
- }
+@@ -10238,8 +10238,8 @@
+ * @param text_view cast=(GtkTextView *)
+ * @param tabs cast=(PangoTabArray *)
+ */
-public static final native void _gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs);
-public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs) {
+public static final native void _gtk_text_view_set_tabs(long /*int*/ text_view, long /*int*/ tabs);
@@ -23180,10 +20271,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_set_tabs(text_view, tabs);
-@@ -7758,8 +7758,8 @@
- lock.unlock();
+@@ -10248,8 +10248,8 @@
}
}
+ /** @param text_view cast=(GtkTextView *) */
-public static final native void _gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode);
-public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode) {
+public static final native void _gtk_text_view_set_wrap_mode(long /*int*/ text_view, int wrap_mode);
@@ -23191,10 +20282,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_set_wrap_mode(text_view, wrap_mode);
-@@ -7767,8 +7767,8 @@
- lock.unlock();
- }
- }
+@@ -10265,8 +10265,8 @@
+ * @param buffer_x cast=(gint *)
+ * @param buffer_y cast=(gint *)
+ */
-public static final native void _gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y);
-public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y) {
+public static final native void _gtk_text_view_window_to_buffer_coords(long /*int*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y);
@@ -23202,10 +20293,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_text_view_window_to_buffer_coords(text_view, win, window_x, window_y, buffer_x, buffer_y);
-@@ -7776,8 +7776,8 @@
- lock.unlock();
- }
- }
+@@ -10279,8 +10279,8 @@
+ * @param function cast=(GtkFunction)
+ * @param data cast=(gpointer)
+ */
-public static final native int _gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data);
-public static final int gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data) {
+public static final native int _gtk_timeout_add(int interval, long /*int*/ function, long /*int*/ data);
@@ -23213,10 +20304,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_timeout_add(interval, function, data);
-@@ -7794,8 +7794,8 @@
- lock.unlock();
+@@ -10299,8 +10299,8 @@
}
}
+ /** @param toggle_button cast=(GtkToggleButton *) */
-public static final native boolean _gtk_toggle_button_get_active(int /*long*/ toggle_button);
-public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_button) {
+public static final native boolean _gtk_toggle_button_get_active(long /*int*/ toggle_button);
@@ -23224,7 +20315,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_toggle_button_get_active(toggle_button);
-@@ -7803,8 +7803,8 @@
+@@ -10308,8 +10308,8 @@
lock.unlock();
}
}
@@ -23235,10 +20326,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_toggle_button_new();
-@@ -7812,8 +7812,8 @@
- lock.unlock();
+@@ -10318,8 +10318,8 @@
}
}
+ /** @param toggle_button cast=(GtkToggleButton *) */
-public static final native boolean _gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button);
-public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button) {
+public static final native boolean _gtk_toggle_button_get_inconsistent(long /*int*/ toggle_button);
@@ -23246,10 +20337,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_toggle_button_get_inconsistent(toggle_button);
-@@ -7821,8 +7821,8 @@
- lock.unlock();
- }
- }
+@@ -10331,8 +10331,8 @@
+ * @param toggle_button cast=(GtkToggleButton *)
+ * @param is_active cast=(gboolean)
+ */
-public static final native void _gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active);
-public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active) {
+public static final native void _gtk_toggle_button_set_active(long /*int*/ toggle_button, boolean is_active);
@@ -23257,10 +20348,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_toggle_button_set_active(toggle_button, is_active);
-@@ -7830,8 +7830,8 @@
- lock.unlock();
- }
- }
+@@ -10344,8 +10344,8 @@
+ * @param toggle_button cast=(GtkToggleButton *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting);
-public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting) {
+public static final native void _gtk_toggle_button_set_inconsistent(long /*int*/ toggle_button, boolean setting);
@@ -23268,10 +20359,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_toggle_button_set_inconsistent(toggle_button, setting);
-@@ -7839,8 +7839,8 @@
- lock.unlock();
- }
- }
+@@ -10357,8 +10357,8 @@
+ * @param toggle_button cast=(GtkToggleButton *)
+ * @param draw_indicator cast=(gboolean)
+ */
-public static final native void _gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator);
-public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator) {
+public static final native void _gtk_toggle_button_set_mode(long /*int*/ toggle_button, boolean draw_indicator);
@@ -23279,10 +20370,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_toggle_button_set_mode(toggle_button, draw_indicator);
-@@ -7848,8 +7848,8 @@
- lock.unlock();
- }
- }
+@@ -10373,8 +10373,8 @@
+ * @param tooltip_private_text cast=(const char *)
+ * @param position cast=(gint)
+ */
-public static final native void _gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position);
-public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) {
+public static final native void _gtk_toolbar_insert_widget(long /*int*/ toolbar, long /*int*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position);
@@ -23290,7 +20381,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_toolbar_insert_widget(toolbar, widget, tooltip_text, tooltip_private_text, position);
-@@ -7857,8 +7857,8 @@
+@@ -10382,8 +10382,8 @@
lock.unlock();
}
}
@@ -23301,10 +20392,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_toolbar_new();
-@@ -7866,8 +7866,8 @@
- lock.unlock();
- }
- }
+@@ -10395,8 +10395,8 @@
+ * @param toolbar cast=(GtkToolbar *)
+ * @param orientation cast=(GtkOrientation)
+ */
-public static final native void _gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation);
-public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation) {
+public static final native void _gtk_toolbar_set_orientation(long /*int*/ toolbar, int orientation);
@@ -23312,10 +20403,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_toolbar_set_orientation(toolbar, orientation);
-@@ -7875,8 +7875,8 @@
- lock.unlock();
+@@ -10405,8 +10405,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_tooltips_data_get(int /*long*/ widget);
-public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_tooltips_data_get(long /*int*/ widget);
@@ -23323,10 +20414,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tooltips_data_get(widget);
-@@ -7884,8 +7884,8 @@
- lock.unlock();
+@@ -10415,8 +10415,8 @@
}
}
+ /** @param tooltips cast=(GtkTooltips *) */
-public static final native void _gtk_tooltips_disable(int /*long*/ tooltips);
-public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
+public static final native void _gtk_tooltips_disable(long /*int*/ tooltips);
@@ -23334,10 +20425,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tooltips_disable(tooltips);
-@@ -7893,8 +7893,8 @@
- lock.unlock();
+@@ -10425,8 +10425,8 @@
}
}
+ /** @param tooltips cast=(GtkTooltips *) */
-public static final native void _gtk_tooltips_enable(int /*long*/ tooltips);
-public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
+public static final native void _gtk_tooltips_enable(long /*int*/ tooltips);
@@ -23345,7 +20436,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tooltips_enable(tooltips);
-@@ -7902,8 +7902,8 @@
+@@ -10434,8 +10434,8 @@
lock.unlock();
}
}
@@ -23356,10 +20447,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tooltips_new();
-@@ -7911,8 +7911,8 @@
- lock.unlock();
+@@ -10444,8 +10444,8 @@
}
}
+ /** @param tooltips cast=(GtkTooltips *) */
-public static final native void _gtk_tooltips_force_window(int /*long*/ tooltips);
-public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
+public static final native void _gtk_tooltips_force_window(long /*int*/ tooltips);
@@ -23367,10 +20458,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tooltips_force_window(tooltips);
-@@ -7920,8 +7920,8 @@
- lock.unlock();
- }
- }
+@@ -10459,8 +10459,8 @@
+ * @param tip_text cast=(const gchar *)
+ * @param tip_private cast=(const gchar *)
+ */
-public static final native void _gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private);
-public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private) {
+public static final native void _gtk_tooltips_set_tip(long /*int*/ tooltips, long /*int*/ widget, byte[] tip_text, byte[] tip_private);
@@ -23378,10 +20469,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tooltips_set_tip(tooltips, widget, tip_text, tip_private);
-@@ -7929,8 +7929,8 @@
- lock.unlock();
- }
- }
+@@ -10472,8 +10472,8 @@
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator);
-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator) {
+public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, int[] value, long /*int*/ terminator);
@@ -23389,10 +20480,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -7938,8 +7938,8 @@
- lock.unlock();
- }
- }
+@@ -10485,8 +10485,8 @@
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator);
-public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator) {
+public static final native void _gtk_tree_model_get(long /*int*/ tree_model, long /*int*/ iter, int column, long[] value, long /*int*/ terminator);
@@ -23400,10 +20491,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_model_get(tree_model, iter, column, value, terminator);
-@@ -7947,8 +7947,8 @@
- lock.unlock();
- }
- }
+@@ -10499,8 +10499,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param path cast=(GtkTreePath *)
+ */
-public static final native boolean _gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path);
-public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path) {
+public static final native boolean _gtk_tree_model_get_iter(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ path);
@@ -23411,10 +20502,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_get_iter(tree_model, iter, path);
-@@ -7956,8 +7956,8 @@
- lock.unlock();
- }
- }
+@@ -10512,8 +10512,8 @@
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native boolean _gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter);
-public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter) {
+public static final native boolean _gtk_tree_model_get_iter_first(long /*int*/ tree_model, long /*int*/ iter);
@@ -23422,10 +20513,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_get_iter_first(tree_model, iter);
-@@ -7965,8 +7965,8 @@
- lock.unlock();
+@@ -10522,8 +10522,8 @@
}
}
+ /** @param tree_model cast=(GtkTreeModel *) */
-public static final native int _gtk_tree_model_get_n_columns(int /*long*/ tree_model);
-public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
+public static final native int _gtk_tree_model_get_n_columns(long /*int*/ tree_model);
@@ -23433,10 +20524,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_get_n_columns(tree_model);
-@@ -7974,8 +7974,8 @@
- lock.unlock();
- }
- }
+@@ -10535,8 +10535,8 @@
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native int /*long*/ _gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter);
-public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter) {
+public static final native long /*int*/ _gtk_tree_model_get_path(long /*int*/ tree_model, long /*int*/ iter);
@@ -23444,7 +20535,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_get_path(tree_model, iter);
-@@ -7983,8 +7983,8 @@
+@@ -10544,8 +10544,8 @@
lock.unlock();
}
}
@@ -23455,10 +20546,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_get_type();
-@@ -7992,8 +7992,8 @@
- lock.unlock();
- }
- }
+@@ -10558,8 +10558,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ */
-public static final native boolean _gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent);
-public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent) {
+public static final native boolean _gtk_tree_model_iter_children(long /*int*/ model, long /*int*/ iter, long /*int*/ parent);
@@ -23466,10 +20557,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_iter_children(model, iter, parent);
-@@ -8001,8 +8001,8 @@
- lock.unlock();
- }
- }
+@@ -10571,8 +10571,8 @@
+ * @param model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native int _gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter);
-public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter) {
+public static final native int _gtk_tree_model_iter_n_children(long /*int*/ model, long /*int*/ iter);
@@ -23477,10 +20568,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_iter_n_children(model, iter);
-@@ -8010,8 +8010,8 @@
- lock.unlock();
- }
- }
+@@ -10584,8 +10584,8 @@
+ * @param model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native boolean _gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter);
-public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter) {
+public static final native boolean _gtk_tree_model_iter_next(long /*int*/ model, long /*int*/ iter);
@@ -23488,10 +20579,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_iter_next(model, iter);
-@@ -8019,8 +8019,8 @@
- lock.unlock();
- }
- }
+@@ -10598,8 +10598,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ */
-public static final native boolean _gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n);
-public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n) {
+public static final native boolean _gtk_tree_model_iter_nth_child(long /*int*/ tree_model, long /*int*/ iter, long /*int*/ parent, int n);
@@ -23499,10 +20590,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_model_iter_nth_child(tree_model, iter, parent, n);
-@@ -8028,8 +8028,8 @@
- lock.unlock();
+@@ -10608,8 +10608,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_append_index(int /*long*/ path, int index);
-public static final void gtk_tree_path_append_index(int /*long*/ path, int index) {
+public static final native void _gtk_tree_path_append_index(long /*int*/ path, int index);
@@ -23510,10 +20601,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_path_append_index(path, index);
-@@ -8037,8 +8037,8 @@
- lock.unlock();
- }
- }
+@@ -10621,8 +10621,8 @@
+ * @param a cast=(const GtkTreePath *)
+ * @param b cast=(const GtkTreePath *)
+ */
-public static final native int /*long*/ _gtk_tree_path_compare(int /*long*/ a, int /*long*/ b);
-public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*long*/ b) {
+public static final native long /*int*/ _gtk_tree_path_compare(long /*int*/ a, long /*int*/ b);
@@ -23521,10 +20612,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_compare(a, b);
-@@ -8046,8 +8046,8 @@
- lock.unlock();
+@@ -10631,8 +10631,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_down(int /*long*/ path);
-public static final void gtk_tree_path_down(int /*long*/ path) {
+public static final native void _gtk_tree_path_down(long /*int*/ path);
@@ -23532,10 +20623,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_path_down(path);
-@@ -8055,8 +8055,8 @@
- lock.unlock();
+@@ -10641,8 +10641,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_free(int /*long*/ path);
-public static final void gtk_tree_path_free(int /*long*/ path) {
+public static final native void _gtk_tree_path_free(long /*int*/ path);
@@ -23543,10 +20634,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_path_free(path);
-@@ -8064,8 +8064,8 @@
- lock.unlock();
+@@ -10651,8 +10651,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native int _gtk_tree_path_get_depth(int /*long*/ path);
-public static final int gtk_tree_path_get_depth(int /*long*/ path) {
+public static final native int _gtk_tree_path_get_depth(long /*int*/ path);
@@ -23554,10 +20645,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_get_depth(path);
-@@ -8073,8 +8073,8 @@
- lock.unlock();
+@@ -10661,8 +10661,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native int /*long*/ _gtk_tree_path_get_indices(int /*long*/ path);
-public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
+public static final native long /*int*/ _gtk_tree_path_get_indices(long /*int*/ path);
@@ -23565,7 +20656,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_get_indices(path);
-@@ -8082,8 +8082,8 @@
+@@ -10670,8 +10670,8 @@
lock.unlock();
}
}
@@ -23576,7 +20667,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_new();
-@@ -8091,8 +8091,8 @@
+@@ -10679,8 +10679,8 @@
lock.unlock();
}
}
@@ -23587,10 +20678,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_new_first();
-@@ -8100,8 +8100,8 @@
- lock.unlock();
+@@ -10689,8 +10689,8 @@
}
}
+ /** @param path cast=(const gchar *) */
-public static final native int /*long*/ _gtk_tree_path_new_from_string(byte[] path);
-public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
+public static final native long /*int*/ _gtk_tree_path_new_from_string(byte[] path);
@@ -23598,10 +20689,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -8109,8 +8109,8 @@
- lock.unlock();
+@@ -10699,8 +10699,8 @@
}
}
+ /** @param path cast=(const gchar *) */
-public static final native int /*long*/ _gtk_tree_path_new_from_string(int /*long*/ path);
-public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path) {
+public static final native long /*int*/ _gtk_tree_path_new_from_string(long /*int*/ path);
@@ -23609,10 +20700,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_new_from_string(path);
-@@ -8118,8 +8118,8 @@
- lock.unlock();
+@@ -10709,8 +10709,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native void _gtk_tree_path_next(int /*long*/ path);
-public static final void gtk_tree_path_next(int /*long*/ path) {
+public static final native void _gtk_tree_path_next(long /*int*/ path);
@@ -23620,10 +20711,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_path_next(path);
-@@ -8127,8 +8127,8 @@
- lock.unlock();
+@@ -10719,8 +10719,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native boolean _gtk_tree_path_prev(int /*long*/ path);
-public static final boolean gtk_tree_path_prev(int /*long*/ path) {
+public static final native boolean _gtk_tree_path_prev(long /*int*/ path);
@@ -23631,10 +20722,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_prev(path);
-@@ -8136,8 +8136,8 @@
- lock.unlock();
+@@ -10729,8 +10729,8 @@
}
}
+ /** @param path cast=(GtkTreePath *) */
-public static final native boolean _gtk_tree_path_up(int /*long*/ path);
-public static final boolean gtk_tree_path_up(int /*long*/ path) {
+public static final native boolean _gtk_tree_path_up(long /*int*/ path);
@@ -23642,10 +20733,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_path_up(path);
-@@ -8145,8 +8145,8 @@
- lock.unlock();
- }
- }
+@@ -10742,8 +10742,8 @@
+ * @method flags=dynamic
+ * @param selection cast=(GtkTreeSelection *)
+ */
-public static final native int _gtk_tree_selection_count_selected_rows(int /*long*/ selection);
-public static final int gtk_tree_selection_count_selected_rows(int /*long*/ selection) {
+public static final native int _gtk_tree_selection_count_selected_rows(long /*int*/ selection);
@@ -23653,10 +20744,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_selection_count_selected_rows(selection);
-@@ -8154,8 +8154,8 @@
- lock.unlock();
- }
- }
+@@ -10756,8 +10756,8 @@
+ * @param model cast=(GtkTreeModel **)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native boolean _gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter);
-public static final boolean gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter) {
+public static final native boolean _gtk_tree_selection_get_selected(long /*int*/ selection, long /*int*/[] model, long /*int*/ iter);
@@ -23664,10 +20755,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_selection_get_selected(selection, model, iter);
-@@ -8163,8 +8163,8 @@
- lock.unlock();
- }
- }
+@@ -10770,8 +10770,8 @@
+ * @param selection cast=(GtkTreeSelection *)
+ * @param model cast=(GtkTreeModel **)
+ */
-public static final native int /*long*/ _gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model);
-public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model) {
+public static final native long /*int*/ _gtk_tree_selection_get_selected_rows(long /*int*/ selection, long /*int*/[] model);
@@ -23675,10 +20766,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_selection_get_selected_rows(selection, model);
-@@ -8172,8 +8172,8 @@
- lock.unlock();
- }
- }
+@@ -10783,8 +10783,8 @@
+ * @param selection cast=(GtkTreeSelection *)
+ * @param path cast=(GtkTreePath *)
+ */
-public static final native boolean _gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path);
-public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path) {
+public static final native boolean _gtk_tree_selection_path_is_selected(long /*int*/ selection, long /*int*/ path);
@@ -23686,10 +20777,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_selection_path_is_selected(selection, path);
-@@ -8181,8 +8181,8 @@
- lock.unlock();
+@@ -10793,8 +10793,8 @@
}
}
+ /** @param selection cast=(GtkTreeSelection *) */
-public static final native void _gtk_tree_selection_select_all(int /*long*/ selection);
-public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
+public static final native void _gtk_tree_selection_select_all(long /*int*/ selection);
@@ -23697,10 +20788,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_selection_select_all(selection);
-@@ -8190,8 +8190,8 @@
- lock.unlock();
- }
- }
+@@ -10806,8 +10806,8 @@
+ * @param selection cast=(GtkTreeSelection *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter);
-public static final void gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter) {
+public static final native void _gtk_tree_selection_select_iter(long /*int*/ selection, long /*int*/ iter);
@@ -23708,10 +20799,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_selection_select_iter(selection, iter);
-@@ -8199,8 +8199,8 @@
- lock.unlock();
- }
- }
+@@ -10820,8 +10820,8 @@
+ * @param func cast=(GtkTreeSelectionForeachFunc)
+ * @param data cast=(gpointer)
+ */
-public static final native void _gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data);
-public static final void gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data) {
+public static final native void _gtk_tree_selection_selected_foreach(long /*int*/ selection, long /*int*/ func, long /*int*/ data);
@@ -23719,10 +20810,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_selection_selected_foreach(selection, func, data);
-@@ -8208,8 +8208,8 @@
- lock.unlock();
- }
- }
+@@ -10833,8 +10833,8 @@
+ * @param selection cast=(GtkTreeSelection *)
+ * @param mode cast=(GtkSelectionMode)
+ */
-public static final native void _gtk_tree_selection_set_mode(int /*long*/ selection, int mode);
-public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int mode) {
+public static final native void _gtk_tree_selection_set_mode(long /*int*/ selection, int mode);
@@ -23730,10 +20821,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_selection_set_mode(selection, mode);
-@@ -8217,8 +8217,8 @@
- lock.unlock();
+@@ -10843,8 +10843,8 @@
}
}
+ /** @param selection cast=(GtkTreeSelection *) */
-public static final native void _gtk_tree_selection_unselect_all(int /*long*/ selection);
-public static final void gtk_tree_selection_unselect_all(int /*long*/ selection) {
+public static final native void _gtk_tree_selection_unselect_all(long /*int*/ selection);
@@ -23741,10 +20832,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_selection_unselect_all(selection);
-@@ -8226,8 +8226,8 @@
- lock.unlock();
- }
- }
+@@ -10856,8 +10856,8 @@
+ * @param selection cast=(GtkTreeSelection *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter);
-public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter) {
+public static final native void _gtk_tree_selection_unselect_iter(long /*int*/ selection, long /*int*/ iter);
@@ -23752,10 +20843,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_selection_unselect_iter(selection, iter);
-@@ -8235,8 +8235,8 @@
- lock.unlock();
- }
- }
+@@ -10870,8 +10870,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent);
-public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent) {
+public static final native void _gtk_tree_store_append(long /*int*/ store, long /*int*/ iter, long /*int*/ parent);
@@ -23763,10 +20854,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_append(store, iter, parent);
-@@ -8244,8 +8244,8 @@
- lock.unlock();
+@@ -10880,8 +10880,8 @@
}
}
+ /** @param store cast=(GtkTreeStore *) */
-public static final native void _gtk_tree_store_clear(int /*long*/ store);
-public static final void gtk_tree_store_clear(int /*long*/ store) {
+public static final native void _gtk_tree_store_clear(long /*int*/ store);
@@ -23774,10 +20865,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_clear(store);
-@@ -8253,8 +8253,8 @@
- lock.unlock();
- }
- }
+@@ -10895,8 +10895,8 @@
+ * @param parent cast=(GtkTreeIter *)
+ * @param position cast=(gint)
+ */
-public static final native void _gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position);
-public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position) {
+public static final native void _gtk_tree_store_insert(long /*int*/ store, long /*int*/ iter, long /*int*/ parent, int position);
@@ -23785,10 +20876,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_insert(store, iter, parent, position);
-@@ -8262,8 +8262,8 @@
- lock.unlock();
+@@ -10905,8 +10905,8 @@
}
}
+ /** @param types cast=(GType *) */
-public static final native int /*long*/ _gtk_tree_store_newv(int numColumns, int /*long*/[] types);
-public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*/[] types) {
+public static final native long /*int*/ _gtk_tree_store_newv(int numColumns, long /*int*/[] types);
@@ -23796,10 +20887,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_store_newv(numColumns, types);
-@@ -8271,8 +8271,8 @@
- lock.unlock();
- }
- }
+@@ -10918,8 +10918,8 @@
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter);
-public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter) {
+public static final native void _gtk_tree_store_remove(long /*int*/ store, long /*int*/ iter);
@@ -23807,10 +20898,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_remove(store, iter);
-@@ -8280,8 +8280,8 @@
- lock.unlock();
- }
- }
+@@ -10931,8 +10931,8 @@
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator);
@@ -23818,10 +20909,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -8289,8 +8289,8 @@
- lock.unlock();
- }
- }
+@@ -10944,8 +10944,8 @@
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator);
@@ -23829,10 +20920,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -8298,8 +8298,8 @@
- lock.unlock();
- }
- }
+@@ -10957,8 +10957,8 @@
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator);
@@ -23840,10 +20931,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -8307,8 +8307,8 @@
- lock.unlock();
- }
- }
+@@ -10971,8 +10971,8 @@
+ * @param iter cast=(GtkTreeIter *)
+ * @param value flags=no_out
+ */
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator);
@@ -23851,10 +20942,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -8316,8 +8316,8 @@
- lock.unlock();
- }
- }
+@@ -10984,8 +10984,8 @@
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator);
-public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) {
+public static final native void _gtk_tree_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator);
@@ -23862,10 +20953,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_store_set(store, iter, column, value, terminator);
-@@ -8325,8 +8325,8 @@
- lock.unlock();
- }
- }
+@@ -10997,8 +10997,8 @@
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
-public static final native int /*long*/ _gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path);
-public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path) {
+public static final native long /*int*/ _gtk_tree_view_create_row_drag_icon(long /*int*/ view, long /*int*/ path);
@@ -23873,10 +20964,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_create_row_drag_icon(view, path);
-@@ -8334,8 +8334,8 @@
- lock.unlock();
- }
- }
+@@ -11010,8 +11010,8 @@
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
-public static final native boolean _gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path);
-public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path) {
+public static final native boolean _gtk_tree_view_collapse_row(long /*int*/ view, long /*int*/ path);
@@ -23884,10 +20975,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_collapse_row(view, path);
-@@ -8343,8 +8343,8 @@
- lock.unlock();
- }
- }
+@@ -11025,8 +11025,8 @@
+ * @param attribute cast=(const gchar *)
+ * @param column cast=(gint)
+ */
-public static final native void _gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column);
-public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column) {
+public static final native void _gtk_tree_view_column_add_attribute(long /*int*/ treeColumn, long /*int*/ cellRenderer, byte[] attribute, int column);
@@ -23895,10 +20986,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_add_attribute(treeColumn, cellRenderer, attribute, column);
-@@ -8352,8 +8352,8 @@
- lock.unlock();
- }
- }
+@@ -11041,8 +11041,8 @@
+ * @param start_pos cast=(gint *)
+ * @param width cast=(gint *)
+ */
-public static final native boolean _gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width);
-public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width) {
+public static final native boolean _gtk_tree_view_column_cell_get_position(long /*int*/ tree_column, long /*int*/ cell_renderer, int[] start_pos, int[] width);
@@ -23906,10 +20997,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_cell_get_position(tree_column, cell_renderer, start_pos, width);
-@@ -8361,8 +8361,8 @@
- lock.unlock();
- }
- }
+@@ -11058,8 +11058,8 @@
+ * @param width cast=(gint *)
+ * @param height cast=(gint *)
+ */
-public static final native void _gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
-public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
+public static final native void _gtk_tree_view_column_cell_get_size(long /*int*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
@@ -23917,10 +21008,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_cell_get_size(tree_column, cell_area, x_offset, y_offset, width, height);
-@@ -8370,8 +8370,8 @@
- lock.unlock();
- }
- }
+@@ -11072,8 +11072,8 @@
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
-public static final native void _gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded);
-public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded) {
+public static final native void _gtk_tree_view_column_cell_set_cell_data(long /*int*/ tree_column, long /*int*/ tree_model, long /*int*/ iter, boolean is_expander, boolean is_expanded);
@@ -23928,10 +21019,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_cell_set_cell_data(tree_column, tree_model, iter, is_expander, is_expanded);
-@@ -8379,8 +8379,8 @@
- lock.unlock();
+@@ -11082,8 +11082,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_clear(int /*long*/ tree_column);
-public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
+public static final native void _gtk_tree_view_column_clear(long /*int*/ tree_column);
@@ -23939,10 +21030,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_clear(tree_column);
-@@ -8388,8 +8388,8 @@
- lock.unlock();
+@@ -11092,8 +11092,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column);
-public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) {
+public static final native long /*int*/ _gtk_tree_view_column_get_cell_renderers(long /*int*/ tree_column);
@@ -23950,10 +21041,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_cell_renderers(tree_column);
-@@ -8397,8 +8397,8 @@
- lock.unlock();
+@@ -11102,8 +11102,8 @@
}
}
+ /** @param column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_fixed_width(int /*long*/ column);
-public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column) {
+public static final native int _gtk_tree_view_column_get_fixed_width(long /*int*/ column);
@@ -23961,10 +21052,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_fixed_width(column);
-@@ -8406,8 +8406,8 @@
- lock.unlock();
+@@ -11112,8 +11112,8 @@
}
}
+ /** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) {
+public static final native boolean _gtk_tree_view_column_get_reorderable(long /*int*/ column);
@@ -23972,10 +21063,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_reorderable(column);
-@@ -8415,8 +8415,8 @@
- lock.unlock();
+@@ -11122,8 +11122,8 @@
}
}
+ /** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_resizable(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ column) {
+public static final native boolean _gtk_tree_view_column_get_resizable(long /*int*/ column);
@@ -23983,10 +21074,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_resizable(column);
-@@ -8424,8 +8424,8 @@
- lock.unlock();
+@@ -11132,8 +11132,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_sizing(int /*long*/ tree_column);
-public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column) {
+public static final native int _gtk_tree_view_column_get_sizing(long /*int*/ tree_column);
@@ -23994,10 +21085,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_sizing(tree_column);
-@@ -8433,8 +8433,8 @@
- lock.unlock();
+@@ -11142,8 +11142,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_spacing(int /*long*/ tree_column);
-public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_column) {
+public static final native int _gtk_tree_view_column_get_spacing(long /*int*/ tree_column);
@@ -24005,10 +21096,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_spacing(tree_column);
-@@ -8442,8 +8442,8 @@
- lock.unlock();
+@@ -11152,8 +11152,8 @@
}
}
+ /** @param column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_visible(int /*long*/ column);
-public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column) {
+public static final native boolean _gtk_tree_view_column_get_visible(long /*int*/ column);
@@ -24016,10 +21107,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_visible(column);
-@@ -8451,8 +8451,8 @@
- lock.unlock();
+@@ -11162,8 +11162,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native boolean _gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column);
-public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column) {
+public static final native boolean _gtk_tree_view_column_get_sort_indicator(long /*int*/ tree_column);
@@ -24027,10 +21118,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_sort_indicator(tree_column);
-@@ -8460,8 +8460,8 @@
- lock.unlock();
+@@ -11172,8 +11172,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_sort_order(int /*long*/ tree_column);
-public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_column) {
+public static final native int _gtk_tree_view_column_get_sort_order(long /*int*/ tree_column);
@@ -24038,10 +21129,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_sort_order(tree_column);
-@@ -8469,8 +8469,8 @@
- lock.unlock();
+@@ -11182,8 +11182,8 @@
}
}
+ /** @param column cast=(GtkTreeViewColumn *) */
-public static final native int _gtk_tree_view_column_get_width(int /*long*/ column);
-public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
+public static final native int _gtk_tree_view_column_get_width(long /*int*/ column);
@@ -24049,7 +21140,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_get_width(column);
-@@ -8478,8 +8478,8 @@
+@@ -11191,8 +11191,8 @@
lock.unlock();
}
}
@@ -24060,10 +21151,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_column_new();
-@@ -8487,8 +8487,8 @@
- lock.unlock();
- }
- }
+@@ -11205,8 +11205,8 @@
+ * @param cell_renderer cast=(GtkCellRenderer *)
+ * @param expand cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);
-public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {
+public static final native void _gtk_tree_view_column_pack_start(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
@@ -24071,10 +21162,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_pack_start(tree_column, cell_renderer, expand);
-@@ -8496,8 +8496,8 @@
- lock.unlock();
- }
- }
+@@ -11219,8 +11219,8 @@
+ * @param cell_renderer cast=(GtkCellRenderer *)
+ * @param expand cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);
-public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {
+public static final native void _gtk_tree_view_column_pack_end(long /*int*/ tree_column, long /*int*/ cell_renderer, boolean expand);
@@ -24082,10 +21173,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_pack_end(tree_column, cell_renderer, expand);
-@@ -8505,8 +8505,8 @@
- lock.unlock();
+@@ -11229,8 +11229,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign);
-public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign) {
+public static final native void _gtk_tree_view_column_set_alignment(long /*int*/ tree_column, float xalign);
@@ -24093,10 +21184,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_alignment(tree_column, xalign);
-@@ -8514,8 +8514,8 @@
- lock.unlock();
- }
- }
+@@ -11245,8 +11245,8 @@
+ * @param func_data cast=(gpointer)
+ * @param destroy cast=(GtkDestroyNotify)
+ */
-public static final native void _gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy);
-public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy) {
+public static final native void _gtk_tree_view_column_set_cell_data_func(long /*int*/ tree_column, long /*int*/ cell_renderer, long /*int*/ func, long /*int*/ func_data, long /*int*/ destroy);
@@ -24104,10 +21195,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_cell_data_func(tree_column, cell_renderer, func, func_data, destroy);
-@@ -8523,8 +8523,8 @@
- lock.unlock();
- }
- }
+@@ -11258,8 +11258,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param clickable cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable);
-public static final void gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable) {
+public static final native void _gtk_tree_view_column_set_clickable(long /*int*/ column, boolean clickable);
@@ -24115,10 +21206,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_clickable(column, clickable);
-@@ -8532,8 +8532,8 @@
- lock.unlock();
- }
- }
+@@ -11271,8 +11271,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param fixed_width cast=(gint)
+ */
-public static final native void _gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width);
-public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width) {
+public static final native void _gtk_tree_view_column_set_fixed_width(long /*int*/ column, int fixed_width);
@@ -24126,10 +21217,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_fixed_width(column, fixed_width);
-@@ -8541,8 +8541,8 @@
- lock.unlock();
- }
- }
+@@ -11284,8 +11284,8 @@
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param min_width cast=(gint)
+ */
-public static final native void _gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width);
-public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width) {
+public static final native void _gtk_tree_view_column_set_min_width(long /*int*/ tree_column, int min_width);
@@ -24137,10 +21228,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_min_width(tree_column, min_width);
-@@ -8550,8 +8550,8 @@
- lock.unlock();
- }
- }
+@@ -11297,8 +11297,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param reorderable cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable);
-public static final void gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable) {
+public static final native void _gtk_tree_view_column_set_reorderable(long /*int*/ column, boolean reorderable);
@@ -24148,10 +21239,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_reorderable(column, reorderable);
-@@ -8559,8 +8559,8 @@
- lock.unlock();
- }
- }
+@@ -11310,8 +11310,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param resizable cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable);
-public static final void gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable) {
+public static final native void _gtk_tree_view_column_set_resizable(long /*int*/ column, boolean resizable);
@@ -24159,10 +21250,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_resizable(column, resizable);
-@@ -8568,8 +8568,8 @@
- lock.unlock();
- }
- }
+@@ -11323,8 +11323,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param type cast=(GtkTreeViewColumnSizing)
+ */
-public static final native void _gtk_tree_view_column_set_sizing(int /*long*/ column, int type);
-public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, int type) {
+public static final native void _gtk_tree_view_column_set_sizing(long /*int*/ column, int type);
@@ -24170,10 +21261,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_sizing(column, type);
-@@ -8577,8 +8577,8 @@
- lock.unlock();
- }
- }
+@@ -11336,8 +11336,8 @@
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting);
-public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting) {
+public static final native void _gtk_tree_view_column_set_sort_indicator(long /*int*/ tree_column, boolean setting);
@@ -24181,10 +21272,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_sort_indicator(tree_column, setting);
-@@ -8586,8 +8586,8 @@
- lock.unlock();
- }
- }
+@@ -11349,8 +11349,8 @@
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param order cast=(GtkSortType)
+ */
-public static final native void _gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order);
-public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order) {
+public static final native void _gtk_tree_view_column_set_sort_order(long /*int*/ tree_column, int order);
@@ -24192,10 +21283,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_sort_order(tree_column, order);
-@@ -8595,8 +8595,8 @@
- lock.unlock();
- }
- }
+@@ -11362,8 +11362,8 @@
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param title cast=(const gchar *)
+ */
-public static final native void _gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title);
-public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title) {
+public static final native void _gtk_tree_view_column_set_title(long /*int*/ tree_column, byte[] title);
@@ -24203,10 +21294,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_title(tree_column, title);
-@@ -8604,8 +8604,8 @@
- lock.unlock();
+@@ -11372,8 +11372,8 @@
}
}
+ /** @param tree_column cast=(GtkTreeViewColumn *) */
-public static final native void _gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible);
-public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible) {
+public static final native void _gtk_tree_view_column_set_visible (long /*int*/ tree_column, boolean visible);
@@ -24214,10 +21305,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_visible(tree_column, visible);
-@@ -8613,8 +8613,8 @@
- lock.unlock();
- }
- }
+@@ -11385,8 +11385,8 @@
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param widget cast=(GtkWidget *)
+ */
-public static final native void _gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget);
-public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget) {
+public static final native void _gtk_tree_view_column_set_widget(long /*int*/ tree_column, long /*int*/ widget);
@@ -24225,10 +21316,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_column_set_widget(tree_column, widget);
-@@ -8622,8 +8622,8 @@
- lock.unlock();
- }
- }
+@@ -11398,8 +11398,8 @@
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
-public static final native void _gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos);
-public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos) {
+public static final native void _gtk_tree_view_set_drag_dest_row(long /*int*/ view, long /*int*/ path, int pos);
@@ -24236,10 +21327,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_drag_dest_row(view, path, pos);
-@@ -8631,8 +8631,8 @@
- lock.unlock();
+@@ -11408,8 +11408,8 @@
}
}
+ /** @param view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search);
-public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search) {
+public static final native void _gtk_tree_view_set_enable_search (long /*int*/ view, boolean enable_search);
@@ -24247,10 +21338,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_enable_search(view, enable_search);
-@@ -8640,8 +8640,8 @@
- lock.unlock();
- }
- }
+@@ -11422,8 +11422,8 @@
+ * @param path cast=(GtkTreePath *)
+ * @param open_all cast=(gboolean)
+ */
-public static final native boolean _gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all);
-public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all) {
+public static final native boolean _gtk_tree_view_expand_row(long /*int*/ view, long /*int*/ path, boolean open_all);
@@ -24258,10 +21349,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_expand_row(view, path, open_all);
-@@ -8649,8 +8649,8 @@
- lock.unlock();
- }
- }
+@@ -11437,8 +11437,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param rect cast=(GdkRectangle *)
+ */
-public static final native void _gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);
-public static final void gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {
+public static final native void _gtk_tree_view_get_background_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
@@ -24269,10 +21360,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_get_background_area(tree_view, path, column, rect);
-@@ -8658,8 +8658,8 @@
- lock.unlock();
+@@ -11447,8 +11447,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/ _gtk_tree_view_get_bin_window(int /*long*/ tree_view);
-public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_view) {
+public static final native long /*int*/ _gtk_tree_view_get_bin_window(long /*int*/ tree_view);
@@ -24280,10 +21371,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_bin_window(tree_view);
-@@ -8667,8 +8667,8 @@
- lock.unlock();
- }
- }
+@@ -11462,8 +11462,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param rect cast=(GdkRectangle *),flags=no_in
+ */
-public static final native void _gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);
-public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {
+public static final native void _gtk_tree_view_get_cell_area(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, GdkRectangle rect);
@@ -24291,10 +21382,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_get_cell_area(tree_view, path, column, rect);
-@@ -8676,8 +8676,8 @@
- lock.unlock();
+@@ -11472,8 +11472,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/_gtk_tree_view_get_expander_column(int /*long*/ tree_view);
-public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ tree_view) {
+public static final native long /*int*/_gtk_tree_view_get_expander_column(long /*int*/ tree_view);
@@ -24302,10 +21393,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_expander_column(tree_view);
-@@ -8685,8 +8685,8 @@
- lock.unlock();
- }
- }
+@@ -11485,8 +11485,8 @@
+ * @param tree_view cast=(GtkTreeView *)
+ * @param n cast=(gint)
+ */
-public static final native int /*long*/ _gtk_tree_view_get_column(int /*long*/ tree_view, int n);
-public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view, int n) {
+public static final native long /*int*/ _gtk_tree_view_get_column(long /*int*/ tree_view, int n);
@@ -24313,10 +21404,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_column(tree_view, n);
-@@ -8694,8 +8694,8 @@
- lock.unlock();
+@@ -11495,8 +11495,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/ _gtk_tree_view_get_columns(int /*long*/ tree_view);
-public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_view) {
+public static final native long /*int*/ _gtk_tree_view_get_columns(long /*int*/ tree_view);
@@ -24324,10 +21415,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_columns(tree_view);
-@@ -8703,8 +8703,8 @@
- lock.unlock();
- }
- }
+@@ -11509,8 +11509,8 @@
+ * @param path cast=(GtkTreePath **)
+ * @param focus_column cast=(GtkTreeViewColumn **)
+ */
-public static final native void _gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column);
-public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column) {
+public static final native void _gtk_tree_view_get_cursor(long /*int*/ tree_view, long /*int*/[] path, long /*int*/[] focus_column);
@@ -24335,10 +21426,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_get_cursor(tree_view, path, focus_column);
-@@ -8712,8 +8712,8 @@
- lock.unlock();
+@@ -11519,8 +11519,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native boolean _gtk_tree_view_get_headers_visible(int /*long*/ tree_view);
-public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_view) {
+public static final native boolean _gtk_tree_view_get_headers_visible(long /*int*/ tree_view);
@@ -24346,10 +21437,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_headers_visible(tree_view);
-@@ -8721,8 +8721,8 @@
- lock.unlock();
- }
- }
+@@ -11537,8 +11537,8 @@
+ * @param cell_x cast=(gint *)
+ * @param cell_y cast=(gint *)
+ */
-public static final native boolean _gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y);
-public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y) {
+public static final native boolean _gtk_tree_view_get_path_at_pos(long /*int*/ tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y);
@@ -24357,10 +21448,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
-@@ -8730,8 +8730,8 @@
- lock.unlock();
+@@ -11547,8 +11547,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native boolean _gtk_tree_view_get_rules_hint(int /*long*/ tree_view);
-public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view) {
+public static final native boolean _gtk_tree_view_get_rules_hint(long /*int*/ tree_view);
@@ -24368,10 +21459,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_rules_hint(tree_view);
-@@ -8739,8 +8739,8 @@
- lock.unlock();
+@@ -11557,8 +11557,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native int /*long*/ _gtk_tree_view_get_selection(int /*long*/ tree_view);
-public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_view) {
+public static final native long /*int*/ _gtk_tree_view_get_selection(long /*int*/ tree_view);
@@ -24379,10 +21470,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_get_selection(tree_view);
-@@ -8748,8 +8748,8 @@
- lock.unlock();
- }
- }
+@@ -11570,8 +11570,8 @@
+ * @param tree_view cast=(GtkTreeView *)
+ * @param visible_rect flags=no_in
+ */
-public static final native void _gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect);
-public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect) {
+public static final native void _gtk_tree_view_get_visible_rect(long /*int*/ tree_view, GdkRectangle visible_rect);
@@ -24390,10 +21481,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_get_visible_rect(tree_view, visible_rect);
-@@ -8757,8 +8757,8 @@
- lock.unlock();
- }
- }
+@@ -11584,8 +11584,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param position cast=(gint)
+ */
-public static final native int _gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position);
-public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position) {
+public static final native int _gtk_tree_view_insert_column(long /*int*/ tree_view, long /*int*/ column, int position);
@@ -24401,10 +21492,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_insert_column(tree_view, column, position);
-@@ -8766,8 +8766,8 @@
- lock.unlock();
- }
- }
+@@ -11598,8 +11598,8 @@
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param base_column cast=(GtkTreeViewColumn *)
+ */
-public static final native void _gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/ base_column);
-public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/base_column) {
+public static final native void _gtk_tree_view_move_column_after(long /*int*/ tree_view, long /*int*/ column, long /*int*/ base_column);
@@ -24412,10 +21503,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_move_column_after(tree_view, column, base_column);
-@@ -8775,8 +8775,8 @@
- lock.unlock();
+@@ -11608,8 +11608,8 @@
}
}
+ /** @param model cast=(GtkTreeModel *) */
-public static final native int /*long*/ _gtk_tree_view_new_with_model(int /*long*/ model);
-public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model) {
+public static final native long /*int*/ _gtk_tree_view_new_with_model(long /*int*/ model);
@@ -24423,10 +21514,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_new_with_model(model);
-@@ -8784,8 +8784,8 @@
- lock.unlock();
- }
- }
+@@ -11621,8 +11621,8 @@
+ * @param tree_view cast=(GtkTreeView *)
+ * @param column cast=(GtkTreeViewColumn *)
+ */
-public static final native void _gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column);
-public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column) {
+public static final native void _gtk_tree_view_remove_column(long /*int*/ tree_view, long /*int*/ column);
@@ -24434,10 +21525,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_remove_column(tree_view, column);
-@@ -8793,8 +8793,8 @@
- lock.unlock();
- }
- }
+@@ -11634,8 +11634,8 @@
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
-public static final native boolean _gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path);
-public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path) {
+public static final native boolean _gtk_tree_view_row_expanded(long /*int*/ view, long /*int*/ path);
@@ -24445,10 +21536,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_tree_view_row_expanded(view, path);
-@@ -8802,8 +8802,8 @@
- lock.unlock();
- }
- }
+@@ -11651,8 +11651,8 @@
+ * @param row_aligh cast=(gfloat)
+ * @param column_align cast=(gfloat)
+ */
-public static final native void _gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align);
-public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align) {
+public static final native void _gtk_tree_view_scroll_to_cell(long /*int*/ tree_view, long /*int*/ path, long /*int*/ column, boolean use_align, float row_aligh, float column_align);
@@ -24456,10 +21547,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_scroll_to_cell(tree_view, path, column, use_align, row_aligh, column_align);
-@@ -8811,8 +8811,8 @@
- lock.unlock();
- }
- }
+@@ -11665,8 +11665,8 @@
+ * @param tree_x cast=(gint)
+ * @param tree_y cast=(gint)
+ */
-public static final native void _gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y);
-public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y) {
+public static final native void _gtk_tree_view_scroll_to_point (long /*int*/ tree_view, int tree_x, int tree_y);
@@ -24467,10 +21558,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_scroll_to_point(tree_view, tree_x, tree_y);
-@@ -8820,8 +8820,8 @@
- lock.unlock();
- }
- }
+@@ -11679,8 +11679,8 @@
+ * @param path cast=(GtkTreePath *)
+ * @param focus_column cast=(GtkTreeViewColumn *)
+ */
-public static final native void _gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing);
-public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing) {
+public static final native void _gtk_tree_view_set_cursor(long /*int*/ tree_view, long /*int*/ path, long /*int*/ focus_column, boolean start_editing);
@@ -24478,10 +21569,21 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_cursor(tree_view, path, focus_column, start_editing);
-@@ -8829,8 +8829,8 @@
- lock.unlock();
- }
- }
+@@ -11692,8 +11692,8 @@
+ * @method flags=dynamic
+ * @param tree_view cast=(GtkTreeView*)
+ */
+-public static final native void _gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines);
+-public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines) {
++public static final native void _gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines);
++public static final void gtk_tree_view_set_grid_lines(long /*int*/ tree_view, int grid_lines) {
+ lock.lock();
+ try {
+ _gtk_tree_view_set_grid_lines(tree_view, grid_lines);
+@@ -11705,8 +11705,8 @@
+ * @param tree_view cast=(GtkTreeView *)
+ * @param visible cast=(gboolean)
+ */
-public static final native void _gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible);
-public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible) {
+public static final native void _gtk_tree_view_set_headers_visible(long /*int*/ tree_view, boolean visible);
@@ -24489,10 +21591,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_headers_visible(tree_view, visible);
-@@ -8838,8 +8838,8 @@
- lock.unlock();
- }
- }
+@@ -11718,8 +11718,8 @@
+ * @param tree_view cast=(GtkTreeView *)
+ * @param model cast=(GtkTreeModel *)
+ */
-public static final native void _gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model);
-public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model) {
+public static final native void _gtk_tree_view_set_model(long /*int*/ tree_view, long /*int*/ model);
@@ -24500,10 +21602,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_model(tree_view, model);
-@@ -8847,8 +8847,8 @@
- lock.unlock();
+@@ -11728,8 +11728,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting);
-public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting) {
+public static final native void _gtk_tree_view_set_rules_hint(long /*int*/ tree_view, boolean setting);
@@ -24511,10 +21613,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_rules_hint(tree_view, setting);
-@@ -8856,8 +8856,8 @@
- lock.unlock();
- }
- }
+@@ -11741,8 +11741,8 @@
+ * @param tree_view cast=(GtkTreeView *)
+ * @param column cast=(gint)
+ */
-public static final native void _gtk_tree_view_set_search_column(int /*long*/ tree_view, int column);
-public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view, int column) {
+public static final native void _gtk_tree_view_set_search_column(long /*int*/ tree_view, int column);
@@ -24522,10 +21624,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_set_search_column(tree_view, column);
-@@ -8865,8 +8865,8 @@
- lock.unlock();
- }
- }
+@@ -11757,8 +11757,8 @@
+ * @param wx cast=(gint *)
+ * @param wy cast=(gint *)
+ */
-public static final native void _gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy);
-public static final void gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy) {
+public static final native void _gtk_tree_view_tree_to_widget_coords(long /*int*/ tree_view, int tx, int ty, int[] wx, int[] wy);
@@ -24533,10 +21635,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_tree_to_widget_coords(tree_view, tx, ty, wx, wy);
-@@ -8874,8 +8874,8 @@
- lock.unlock();
+@@ -11767,8 +11767,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view);
-public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view) {
+public static final native void _gtk_tree_view_unset_rows_drag_dest(long /*int*/ tree_view);
@@ -24544,10 +21646,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_unset_rows_drag_dest(tree_view);
-@@ -8883,8 +8883,8 @@
- lock.unlock();
+@@ -11777,8 +11777,8 @@
}
}
+ /** @param tree_view cast=(GtkTreeView *) */
-public static final native void _gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);
-public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
+public static final native void _gtk_tree_view_widget_to_tree_coords(long /*int*/ tree_view, int wx, int wy, int[] tx, int[] ty);
@@ -24555,10 +21657,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_tree_view_widget_to_tree_coords(tree_view, wx, wy, tx, ty);
-@@ -8892,8 +8892,8 @@
- lock.unlock();
- }
- }
+@@ -11790,8 +11790,8 @@
+ * @param homogeneous cast=(gboolean)
+ * @param spacing cast=(gint)
+ */
-public static final native int /*long*/ _gtk_vbox_new(boolean homogeneous, int spacing);
-public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing) {
+public static final native long /*int*/ _gtk_vbox_new(boolean homogeneous, int spacing);
@@ -24566,10 +21668,32 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_vbox_new(homogeneous, spacing);
-@@ -8901,8 +8901,8 @@
- lock.unlock();
+@@ -11800,8 +11800,8 @@
+ }
+ }
+ /** @param viewport cast=(GtkViewport *) */
+-public static final native int _gtk_viewport_get_shadow_type(int /*long*/ viewport);
+-public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
++public static final native int _gtk_viewport_get_shadow_type(long /*int*/ viewport);
++public static final int gtk_viewport_get_shadow_type(long /*int*/ viewport) {
+ lock.lock();
+ try {
+ return _gtk_viewport_get_shadow_type(viewport);
+@@ -11813,8 +11813,8 @@
+ * @param viewport cast=(GtkViewport *)
+ * @param type cast=(GtkShadowType)
+ */
+-public static final native void _gtk_viewport_set_shadow_type(int /*long*/ viewport, int type);
+-public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int type) {
++public static final native void _gtk_viewport_set_shadow_type(long /*int*/ viewport, int type);
++public static final void gtk_viewport_set_shadow_type(long /*int*/ viewport, int type) {
+ lock.lock();
+ try {
+ _gtk_viewport_set_shadow_type(viewport, type);
+@@ -11823,8 +11823,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native int /*long*/ _gtk_vscale_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_vscale_new(long /*int*/ adjustment);
@@ -24577,10 +21701,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_vscale_new(adjustment);
-@@ -8910,8 +8910,8 @@
- lock.unlock();
+@@ -11833,8 +11833,8 @@
}
}
+ /** @param adjustment cast=(GtkAdjustment *) */
-public static final native int /*long*/ _gtk_vscrollbar_new(int /*long*/ adjustment);
-public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
+public static final native long /*int*/ _gtk_vscrollbar_new(long /*int*/ adjustment);
@@ -24588,7 +21712,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_vscrollbar_new(adjustment);
-@@ -8919,8 +8919,8 @@
+@@ -11842,8 +11842,8 @@
lock.unlock();
}
}
@@ -24599,10 +21723,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_vseparator_new();
-@@ -8928,8 +8928,8 @@
- lock.unlock();
- }
- }
+@@ -11858,8 +11858,8 @@
+ * @param accel_key cast=(guint)
+ * @param accel_mods cast=(GdkModifierType)
+ */
-public static final native void _gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags);
-public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags) {
+public static final native void _gtk_widget_add_accelerator(long /*int*/ widget, byte[] accel_signal, long /*int*/ accel_group, int accel_key, int accel_mods, int accel_flags);
@@ -24610,10 +21734,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_add_accelerator(widget, accel_signal, accel_group, accel_key, accel_mods, accel_flags);
-@@ -8937,8 +8937,8 @@
- lock.unlock();
- }
- }
+@@ -11871,8 +11871,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param events cast=(gint)
+ */
-public static final native void _gtk_widget_add_events(int /*long*/ widget, int events);
-public static final void gtk_widget_add_events(int /*long*/ widget, int events) {
+public static final native void _gtk_widget_add_events(long /*int*/ widget, int events);
@@ -24621,10 +21745,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_add_events(widget, events);
-@@ -8946,8 +8946,8 @@
- lock.unlock();
+@@ -11881,8 +11881,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_child_focus(int /*long*/ widget, int direction);
-public static final boolean gtk_widget_child_focus(int /*long*/ widget, int direction) {
+public static final native boolean _gtk_widget_child_focus(long /*int*/ widget, int direction);
@@ -24632,10 +21756,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_child_focus(widget, direction);
-@@ -8955,8 +8955,8 @@
- lock.unlock();
- }
- }
+@@ -11894,8 +11894,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param text cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text);
-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text) {
+public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, byte[] text);
@@ -24643,10 +21767,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -8964,8 +8964,8 @@
- lock.unlock();
- }
- }
+@@ -11907,8 +11907,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param text cast=(const gchar *)
+ */
-public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text);
-public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text) {
+public static final native long /*int*/ _gtk_widget_create_pango_layout(long /*int*/ widget, long /*int*/ text);
@@ -24654,10 +21778,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_create_pango_layout(widget, text);
-@@ -8973,8 +8973,8 @@
- lock.unlock();
+@@ -11917,8 +11917,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_destroy(int /*long*/ widget);
-public static final void gtk_widget_destroy(int /*long*/ widget) {
+public static final native void _gtk_widget_destroy(long /*int*/ widget);
@@ -24665,10 +21789,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_destroy(widget);
-@@ -8982,8 +8982,8 @@
- lock.unlock();
- }
- }
+@@ -11930,8 +11930,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param event cast=(GdkEvent *)
+ */
-public static final native boolean _gtk_widget_event(int /*long*/ widget, int /*long*/ event);
-public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ event) {
+public static final native boolean _gtk_widget_event(long /*int*/ widget, long /*int*/ event);
@@ -24676,10 +21800,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_event(widget, event);
-@@ -8991,8 +8991,8 @@
- lock.unlock();
+@@ -11940,8 +11940,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_accessible (int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_accessible (long /*int*/ widget);
@@ -24687,10 +21811,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_accessible(widget);
-@@ -9000,8 +9000,8 @@
- lock.unlock();
+@@ -11950,8 +11950,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_get_child_visible (int /*long*/ widget);
-public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) {
+public static final native boolean _gtk_widget_get_child_visible (long /*int*/ widget);
@@ -24698,7 +21822,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_child_visible(widget);
-@@ -9018,8 +9018,8 @@
+@@ -11968,8 +11968,8 @@
lock.unlock();
}
}
@@ -24709,10 +21833,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_default_style();
-@@ -9027,8 +9027,8 @@
- lock.unlock();
+@@ -11978,8 +11978,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int _gtk_widget_get_direction(int /*long*/ widget);
-public static final int gtk_widget_get_direction(int /*long*/ widget) {
+public static final native int _gtk_widget_get_direction(long /*int*/ widget);
@@ -24720,10 +21844,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_direction(widget);
-@@ -9036,8 +9036,8 @@
- lock.unlock();
+@@ -11988,8 +11988,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int _gtk_widget_get_events(int /*long*/ widget);
-public static final int gtk_widget_get_events(int /*long*/ widget) {
+public static final native int _gtk_widget_get_events(long /*int*/ widget);
@@ -24731,10 +21855,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_events(widget);
-@@ -9045,8 +9045,8 @@
- lock.unlock();
+@@ -11998,8 +11998,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_modifier_style(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_modifier_style(long /*int*/ widget);
@@ -24742,10 +21866,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_modifier_style(widget);
-@@ -9054,8 +9054,8 @@
- lock.unlock();
+@@ -12008,8 +12008,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_pango_context(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_pango_context(long /*int*/ widget);
@@ -24753,10 +21877,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_pango_context(widget);
-@@ -9063,8 +9063,8 @@
- lock.unlock();
+@@ -12018,8 +12018,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_parent(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_parent(long /*int*/ widget);
@@ -24764,10 +21888,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_parent(widget);
-@@ -9072,8 +9072,8 @@
- lock.unlock();
+@@ -12028,8 +12028,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_style(int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_style(long /*int*/ widget);
@@ -24775,10 +21899,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_style(widget);
-@@ -9081,8 +9081,8 @@
- lock.unlock();
- }
- }
+@@ -12042,8 +12042,8 @@
+ * @param width cast=(gint *)
+ * @param height cast=(gint *)
+ */
-public static final native void _gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height);
-public static final void gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height) {
+public static final native void _gtk_widget_get_size_request(long /*int*/ widget, int [] width, int [] height);
@@ -24786,10 +21910,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_get_size_request(widget, width, height);
-@@ -9090,8 +9090,8 @@
- lock.unlock();
+@@ -12052,8 +12052,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native int /*long*/ _gtk_widget_get_toplevel (int /*long*/ widget);
-public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
+public static final native long /*int*/ _gtk_widget_get_toplevel (long /*int*/ widget);
@@ -24797,10 +21921,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_get_toplevel(widget);
-@@ -9099,8 +9099,8 @@
- lock.unlock();
+@@ -12062,8 +12062,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_grab_focus(int /*long*/ widget);
-public static final void gtk_widget_grab_focus(int /*long*/ widget) {
+public static final native void _gtk_widget_grab_focus(long /*int*/ widget);
@@ -24808,10 +21932,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_grab_focus(widget);
-@@ -9108,8 +9108,8 @@
- lock.unlock();
+@@ -12072,8 +12072,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_hide(int /*long*/ widget);
-public static final void gtk_widget_hide(int /*long*/ widget) {
+public static final native void _gtk_widget_hide(long /*int*/ widget);
@@ -24819,10 +21943,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_hide(widget);
-@@ -9117,8 +9117,8 @@
- lock.unlock();
- }
- }
+@@ -12085,8 +12085,8 @@
+ * @method flags=dynamic
+ * @param widget cast=(GtkWidget *)
+ */
-public static final native boolean _gtk_widget_is_composited(int /*long*/ widget);
-public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
+public static final native boolean _gtk_widget_is_composited(long /*int*/ widget);
@@ -24830,10 +21954,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_is_composited(widget);
-@@ -9126,8 +9126,8 @@
- lock.unlock();
+@@ -12095,8 +12095,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native boolean _gtk_widget_is_focus(int /*long*/ widget);
-public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
+public static final native boolean _gtk_widget_is_focus(long /*int*/ widget);
@@ -24841,10 +21965,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_is_focus(widget);
-@@ -9135,8 +9135,8 @@
- lock.unlock();
+@@ -12105,8 +12105,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_map(int /*long*/ widget);
-public static final void gtk_widget_map(int /*long*/ widget) {
+public static final native void _gtk_widget_map(long /*int*/ widget);
@@ -24852,10 +21976,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_map(widget);
-@@ -9144,8 +9144,8 @@
- lock.unlock();
- }
- }
+@@ -12118,8 +12118,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param group_cycling cast=(gboolean)
+ */
-public static final native boolean _gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling);
-public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling) {
+public static final native boolean _gtk_widget_mnemonic_activate(long /*int*/ widget, boolean group_cycling);
@@ -24863,10 +21987,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_mnemonic_activate(widget, group_cycling);
-@@ -9153,8 +9153,8 @@
- lock.unlock();
- }
- }
+@@ -12132,8 +12132,8 @@
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color);
-public static final void gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color) {
+public static final native void _gtk_widget_modify_base(long /*int*/ widget, int state, GdkColor color);
@@ -24874,10 +21998,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_modify_base(widget, state, color);
-@@ -9162,8 +9162,8 @@
- lock.unlock();
- }
- }
+@@ -12146,8 +12146,8 @@
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color);
-public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color) {
+public static final native void _gtk_widget_modify_bg(long /*int*/ widget, int state, GdkColor color);
@@ -24885,10 +22009,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_modify_bg(widget, state, color);
-@@ -9171,8 +9171,8 @@
- lock.unlock();
- }
- }
+@@ -12160,8 +12160,8 @@
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color);
-public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color) {
+public static final native void _gtk_widget_modify_fg(long /*int*/ widget, int state, GdkColor color);
@@ -24896,10 +22020,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_modify_fg(widget, state, color);
-@@ -9180,8 +9180,8 @@
- lock.unlock();
- }
- }
+@@ -12173,8 +12173,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param pango_font_descr cast=(PangoFontDescription *)
+ */
-public static final native void _gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr);
-public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr) {
+public static final native void _gtk_widget_modify_font(long /*int*/ widget, long /*int*/ pango_font_descr);
@@ -24907,10 +22031,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_modify_font(widget, pango_font_descr);
-@@ -9189,8 +9189,8 @@
- lock.unlock();
- }
- }
+@@ -12186,8 +12186,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param style cast=(GtkRcStyle *)
+ */
-public static final native void _gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style);
-public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style) {
+public static final native void _gtk_widget_modify_style(long /*int*/ widget, long /*int*/ style);
@@ -24918,10 +22042,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_modify_style(widget, style);
-@@ -9198,8 +9198,8 @@
- lock.unlock();
- }
- }
+@@ -12200,8 +12200,8 @@
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
-public static final native void _gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color);
-public static final void gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color) {
+public static final native void _gtk_widget_modify_text(long /*int*/ widget, int state, GdkColor color);
@@ -24929,10 +22053,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_modify_text(widget, state, color);
-@@ -9207,8 +9207,8 @@
- lock.unlock();
+@@ -12210,8 +12210,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_queue_resize(int /*long*/ widget);
-public static final void gtk_widget_queue_resize(int /*long*/ widget) {
+public static final native void _gtk_widget_queue_resize(long /*int*/ widget);
@@ -24940,10 +22064,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_queue_resize(widget);
-@@ -9216,8 +9216,8 @@
- lock.unlock();
+@@ -12220,8 +12220,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_realize(int /*long*/ widget);
-public static final void gtk_widget_realize(int /*long*/ widget) {
+public static final native void _gtk_widget_realize(long /*int*/ widget);
@@ -24951,10 +22075,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_realize(widget);
-@@ -9225,8 +9225,8 @@
- lock.unlock();
- }
- }
+@@ -12235,8 +12235,8 @@
+ * @param accel_key cast=(guint)
+ * @param accel_mods cast=(GdkModifierType)
+ */
-public static final native void _gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods);
-public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods) {
+public static final native void _gtk_widget_remove_accelerator(long /*int*/ widget, long /*int*/ accel_group, int accel_key, int accel_mods);
@@ -24962,10 +22086,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_remove_accelerator(widget, accel_group, accel_key, accel_mods);
-@@ -9234,8 +9234,8 @@
- lock.unlock();
- }
- }
+@@ -12248,8 +12248,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param new_parent cast=(GtkWidget *)
+ */
-public static final native void _gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent);
-public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent) {
+public static final native void _gtk_widget_reparent(long /*int*/ widget, long /*int*/ new_parent);
@@ -24973,10 +22097,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_reparent(widget, new_parent);
-@@ -9243,8 +9243,8 @@
- lock.unlock();
- }
- }
+@@ -12261,8 +12261,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param event cast=(GdkEvent *)
+ */
-public static final native int _gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event);
-public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event) {
+public static final native int _gtk_widget_send_expose(long /*int*/ widget, long /*int*/ event);
@@ -24984,10 +22108,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_send_expose(widget, event);
-@@ -9252,8 +9252,8 @@
- lock.unlock();
+@@ -12271,8 +12271,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable);
-public static final void gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable) {
+public static final native void _gtk_widget_set_app_paintable(long /*int*/ widget, boolean app_paintable);
@@ -24995,10 +22119,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_app_paintable(widget, app_paintable);
-@@ -9270,8 +9270,8 @@
- lock.unlock();
- }
- }
+@@ -12294,8 +12294,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param dir cast=(GtkTextDirection)
+ */
-public static final native void _gtk_widget_set_direction(int /*long*/ widget, int dir);
-public static final void gtk_widget_set_direction(int /*long*/ widget, int dir) {
+public static final native void _gtk_widget_set_direction(long /*int*/ widget, int dir);
@@ -25006,10 +22130,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_direction(widget, dir);
-@@ -9279,8 +9279,8 @@
- lock.unlock();
- }
- }
+@@ -12307,8 +12307,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param double_buffered cast=(gboolean)
+ */
-public static final native void _gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered);
-public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered) {
+public static final native void _gtk_widget_set_double_buffered(long /*int*/ widget, boolean double_buffered);
@@ -25017,10 +22141,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_double_buffered(widget, double_buffered);
-@@ -9288,8 +9288,8 @@
- lock.unlock();
- }
- }
+@@ -12320,8 +12320,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param name cast=(const char *)
+ */
-public static final native void _gtk_widget_set_name(int /*long*/ widget, byte[] name);
-public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
+public static final native void _gtk_widget_set_name(long /*int*/ widget, byte[] name);
@@ -25028,10 +22152,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_name(widget, name);
-@@ -9297,8 +9297,8 @@
- lock.unlock();
- }
- }
+@@ -12333,8 +12333,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param redraw cast=(gboolean)
+ */
-public static final native void _gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw);
-public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw) {
+public static final native void _gtk_widget_set_redraw_on_allocate(long /*int*/ widget, boolean redraw);
@@ -25039,10 +22163,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_redraw_on_allocate(widget, redraw);
-@@ -9306,8 +9306,8 @@
- lock.unlock();
- }
- }
+@@ -12346,8 +12346,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param sensitive cast=(gboolean)
+ */
-public static final native void _gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive);
-public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive) {
+public static final native void _gtk_widget_set_sensitive(long /*int*/ widget, boolean sensitive);
@@ -25050,10 +22174,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_sensitive(widget, sensitive);
-@@ -9315,8 +9315,8 @@
- lock.unlock();
- }
- }
+@@ -12360,8 +12360,8 @@
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
-public static final native void _gtk_widget_set_size_request(int /*long*/ widget, int width, int height);
-public static final void gtk_widget_set_size_request(int /*long*/ widget, int width, int height) {
+public static final native void _gtk_widget_set_size_request(long /*int*/ widget, int width, int height);
@@ -25061,10 +22185,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_size_request(widget, width, height);
-@@ -9324,8 +9324,8 @@
- lock.unlock();
- }
- }
+@@ -12373,8 +12373,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param state cast=(GtkStateType)
+ */
-public static final native void _gtk_widget_set_state(int /*long*/ widget, int state);
-public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
+public static final native void _gtk_widget_set_state(long /*int*/ widget, int state);
@@ -25072,10 +22196,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_state(widget, state);
-@@ -9333,8 +9333,8 @@
- lock.unlock();
- }
- }
+@@ -12386,8 +12386,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param style cast=(GtkStyle *)
+ */
-public static final native void _gtk_widget_set_style(int /*long*/ widget, int /*long*/ style);
-public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/ style) {
+public static final native void _gtk_widget_set_style(long /*int*/ widget, long /*int*/ style);
@@ -25083,10 +22207,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_style(widget, style);
-@@ -9342,8 +9342,8 @@
- lock.unlock();
- }
- }
+@@ -12401,8 +12401,8 @@
+ * @param offset_x cast=(gint)
+ * @param offset_y cast=(gint)
+ */
-public static final native void _gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y);
-public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y) {
+public static final native void _gtk_widget_shape_combine_mask(long /*int*/ widget, long /*int*/ shape_mask, int offset_x, int offset_y);
@@ -25094,10 +22218,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_shape_combine_mask(widget, shape_mask, offset_x, offset_y);
-@@ -9351,8 +9351,8 @@
- lock.unlock();
+@@ -12411,8 +12411,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_show(int /*long*/ widget);
-public static final void gtk_widget_show(int /*long*/ widget) {
+public static final native void _gtk_widget_show(long /*int*/ widget);
@@ -25105,10 +22229,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_show(widget);
-@@ -9360,8 +9360,8 @@
- lock.unlock();
+@@ -12421,8 +12421,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_show_now(int /*long*/ widget);
-public static final void gtk_widget_show_now(int /*long*/ widget) {
+public static final native void _gtk_widget_show_now(long /*int*/ widget);
@@ -25116,10 +22240,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_show_now(widget);
-@@ -9369,8 +9369,8 @@
- lock.unlock();
- }
- }
+@@ -12434,8 +12434,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param allocation cast=(GtkAllocation *),flags=no_out
+ */
-public static final native void _gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation);
-public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation) {
+public static final native void _gtk_widget_size_allocate(long /*int*/ widget, GtkAllocation allocation);
@@ -25127,10 +22251,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_size_allocate(widget, allocation);
-@@ -9378,8 +9378,8 @@
- lock.unlock();
- }
- }
+@@ -12447,8 +12447,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param requisition cast=(GtkRequisition *),flags=no_in
+ */
-public static final native void _gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition);
-public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition) {
+public static final native void _gtk_widget_size_request(long /*int*/ widget, GtkRequisition requisition);
@@ -25138,10 +22262,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_size_request(widget, requisition);
-@@ -9387,8 +9387,8 @@
- lock.unlock();
- }
- }
+@@ -12461,8 +12461,8 @@
+ * @param property_name cast=(const gchar *)
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator);
-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator) {
+public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, int[] value, long /*int*/ terminator);
@@ -25149,10 +22273,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -9396,8 +9396,8 @@
- lock.unlock();
- }
- }
+@@ -12475,8 +12475,8 @@
+ * @param property_name cast=(const gchar *)
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
-public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator);
-public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator) {
+public static final native void _gtk_widget_style_get(long /*int*/ widget, byte[] property_name, long[] value, long /*int*/ terminator);
@@ -25160,10 +22284,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_style_get(widget, property_name, value, terminator);
-@@ -9405,8 +9405,8 @@
- lock.unlock();
- }
- }
+@@ -12488,8 +12488,8 @@
+ * @param src_widget cast=(GtkWidget *)
+ * @param dest_widget cast=(GtkWidget *)
+ */
-public static final native boolean _gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
-public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) {
+public static final native boolean _gtk_widget_translate_coordinates(long /*int*/ src_widget, long /*int*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
@@ -25171,10 +22295,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_widget_translate_coordinates(src_widget, dest_widget, src_x, src_y, dest_x, dest_y);
-@@ -9414,8 +9414,8 @@
- lock.unlock();
+@@ -12498,8 +12498,8 @@
}
}
+ /** @param widget cast=(GtkWidget *) */
-public static final native void _gtk_widget_unrealize(int /*long*/ widget);
-public static final void gtk_widget_unrealize(int /*long*/ widget) {
+public static final native void _gtk_widget_unrealize(long /*int*/ widget);
@@ -25182,10 +22306,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_unrealize(widget);
-@@ -9423,8 +9423,8 @@
- lock.unlock();
+@@ -12508,8 +12508,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native boolean _gtk_window_activate_default(int /*long*/ window);
-public static final boolean gtk_window_activate_default(int /*long*/ window) {
+public static final native boolean _gtk_window_activate_default(long /*int*/ window);
@@ -25193,10 +22317,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_activate_default(window);
-@@ -9432,8 +9432,8 @@
- lock.unlock();
- }
- }
+@@ -12521,8 +12521,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param accel_group cast=(GtkAccelGroup *)
+ */
-public static final native void _gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group);
-public static final void gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group) {
+public static final native void _gtk_window_add_accel_group(long /*int*/ window, long /*int*/ accel_group);
@@ -25204,10 +22328,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_add_accel_group(window, accel_group);
-@@ -9441,8 +9441,8 @@
- lock.unlock();
+@@ -12531,8 +12531,8 @@
}
}
+ /** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_deiconify(int /*long*/ handle);
-public static final void gtk_window_deiconify(int /*long*/ handle) {
+public static final native void _gtk_window_deiconify(long /*int*/ handle);
@@ -25215,10 +22339,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_deiconify(handle);
-@@ -9450,8 +9450,8 @@
- lock.unlock();
+@@ -12541,8 +12541,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native int /*long*/ _gtk_window_get_focus(int /*long*/ window);
-public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
+public static final native long /*int*/ _gtk_window_get_focus(long /*int*/ window);
@@ -25226,10 +22350,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_get_focus(window);
-@@ -9459,8 +9459,8 @@
- lock.unlock();
- }
- }
+@@ -12554,8 +12554,8 @@
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ */
-public static final native int /*long*/ _gtk_window_get_group(int /*long*/ window);
-public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
+public static final native long /*int*/ _gtk_window_get_group(long /*int*/ window);
@@ -25237,10 +22361,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_get_group(window);
-@@ -9468,8 +9468,8 @@
- lock.unlock();
+@@ -12564,8 +12564,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native int /*long*/ _gtk_window_get_icon_list(int /*long*/ window);
-public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
+public static final native long /*int*/ _gtk_window_get_icon_list(long /*int*/ window);
@@ -25248,10 +22372,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_get_icon_list(window);
-@@ -9477,8 +9477,8 @@
- lock.unlock();
+@@ -12574,8 +12574,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native boolean _gtk_window_get_modal(int /*long*/ window);
-public static final boolean gtk_window_get_modal(int /*long*/ window) {
+public static final native boolean _gtk_window_get_modal(long /*int*/ window);
@@ -25259,10 +22383,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_get_modal(window);
-@@ -9486,8 +9486,8 @@
- lock.unlock();
+@@ -12584,8 +12584,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native int _gtk_window_get_mnemonic_modifier(int /*long*/ window);
-public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
+public static final native int _gtk_window_get_mnemonic_modifier(long /*int*/ window);
@@ -25270,10 +22394,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_get_mnemonic_modifier(window);
-@@ -9495,8 +9495,8 @@
- lock.unlock();
- }
- }
+@@ -12597,8 +12597,8 @@
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ */
-public static final native double _gtk_window_get_opacity (int /*long*/ window);
-public static final double gtk_window_get_opacity (int /*long*/ window) {
+public static final native double _gtk_window_get_opacity (long /*int*/ window);
@@ -25281,10 +22405,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_get_opacity (window);
-@@ -9504,8 +9504,8 @@
- lock.unlock();
- }
- }
+@@ -12611,8 +12611,8 @@
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
-public static final native void _gtk_window_get_position(int /*long*/ handle, int[] x, int[] y);
-public static final void gtk_window_get_position(int /*long*/ handle, int[] x, int[] y) {
+public static final native void _gtk_window_get_position(long /*int*/ handle, int[] x, int[] y);
@@ -25292,10 +22416,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_get_position(handle, x, y);
-@@ -9513,8 +9513,8 @@
- lock.unlock();
- }
- }
+@@ -12625,8 +12625,8 @@
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
-public static final native void _gtk_window_get_size(int /*long*/ handle, int[] x, int[] y);
-public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[] y) {
+public static final native void _gtk_window_get_size(long /*int*/ handle, int[] x, int[] y);
@@ -25303,10 +22427,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_get_size(handle, x, y);
-@@ -9522,8 +9522,8 @@
- lock.unlock();
- }
- }
+@@ -12638,8 +12638,8 @@
+ * @param group cast=(GtkWindowGroup*)
+ * @param window cast=(GtkWindow*)
+ */
-public static final native void _gtk_window_group_add_window(int /*long*/ group, int /*long*/ window);
-public static final void gtk_window_group_add_window(int /*long*/ group, int /*long*/ window) {
+public static final native void _gtk_window_group_add_window(long /*int*/ group, long /*int*/ window);
@@ -25314,10 +22438,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_group_add_window(group, window);
-@@ -9531,8 +9531,8 @@
- lock.unlock();
- }
- }
+@@ -12651,8 +12651,8 @@
+ * @param group cast=(GtkWindowGroup*)
+ * @param window cast=(GtkWindow*)
+ */
-public static final native void _gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window);
-public static final void gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window) {
+public static final native void _gtk_window_group_remove_window(long /*int*/ group, long /*int*/ window);
@@ -25325,7 +22449,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_group_remove_window(group, window);
-@@ -9540,8 +9540,8 @@
+@@ -12660,8 +12660,8 @@
lock.unlock();
}
}
@@ -25336,10 +22460,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_group_new();
-@@ -9549,8 +9549,8 @@
- lock.unlock();
+@@ -12670,8 +12670,8 @@
}
}
+ /** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_iconify(int /*long*/ handle);
-public static final void gtk_window_iconify(int /*long*/ handle) {
+public static final native void _gtk_window_iconify(long /*int*/ handle);
@@ -25347,7 +22471,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_iconify(handle);
-@@ -9558,8 +9558,8 @@
+@@ -12679,8 +12679,8 @@
lock.unlock();
}
}
@@ -25358,10 +22482,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_list_toplevels ();
-@@ -9567,8 +9567,8 @@
- lock.unlock();
+@@ -12689,8 +12689,8 @@
}
}
+ /** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_maximize(int /*long*/ handle);
-public static final void gtk_window_maximize(int /*long*/ handle) {
+public static final native void _gtk_window_maximize(long /*int*/ handle);
@@ -25369,10 +22493,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_maximize(handle);
-@@ -9576,8 +9576,8 @@
- lock.unlock();
+@@ -12699,8 +12699,8 @@
}
}
+ /** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_fullscreen(int /*long*/ handle);
-public static final void gtk_window_fullscreen(int /*long*/ handle) {
+public static final native void _gtk_window_fullscreen(long /*int*/ handle);
@@ -25380,10 +22504,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_fullscreen(handle);
-@@ -9585,8 +9585,8 @@
- lock.unlock();
+@@ -12709,8 +12709,8 @@
}
}
+ /** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_unfullscreen(int /*long*/ handle);
-public static final void gtk_window_unfullscreen(int /*long*/ handle) {
+public static final native void _gtk_window_unfullscreen(long /*int*/ handle);
@@ -25391,10 +22515,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_unfullscreen(handle);
-@@ -9594,8 +9594,8 @@
- lock.unlock();
- }
- }
+@@ -12723,8 +12723,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native void _gtk_window_move(int /*long*/ handle, int x, int y);
-public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
+public static final native void _gtk_window_move(long /*int*/ handle, int x, int y);
@@ -25402,10 +22526,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_move(handle, x, y);
-@@ -9603,8 +9603,8 @@
- lock.unlock();
+@@ -12733,8 +12733,8 @@
}
}
+ /** @param type cast=(GtkWindowType) */
-public static final native int /*long*/ _gtk_window_new(int type);
-public static final int /*long*/ gtk_window_new(int type) {
+public static final native long /*int*/ _gtk_window_new(int type);
@@ -25413,10 +22537,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _gtk_window_new(type);
-@@ -9612,8 +9612,8 @@
- lock.unlock();
+@@ -12743,8 +12743,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native void _gtk_window_present(int /*long*/ window);
-public static final void gtk_window_present(int /*long*/ window) {
+public static final native void _gtk_window_present(long /*int*/ window);
@@ -25424,10 +22548,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_present(window);
-@@ -9621,8 +9621,8 @@
- lock.unlock();
- }
- }
+@@ -12756,8 +12756,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param accel_group cast=(GtkAccelGroup *)
+ */
-public static final native void _gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group);
-public static final void gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group) {
+public static final native void _gtk_window_remove_accel_group(long /*int*/ window, long /*int*/ accel_group);
@@ -25435,10 +22559,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_remove_accel_group(window, accel_group);
-@@ -9630,8 +9630,8 @@
- lock.unlock();
- }
- }
+@@ -12770,8 +12770,8 @@
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
-public static final native void _gtk_window_resize(int /*long*/ handle, int x, int y);
-public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
+public static final native void _gtk_window_resize(long /*int*/ handle, int x, int y);
@@ -25446,10 +22570,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_resize(handle, x, y);
-@@ -9639,8 +9639,8 @@
- lock.unlock();
- }
- }
+@@ -12783,8 +12783,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param widget cast=(GtkWidget *)
+ */
-public static final native void _gtk_window_set_default(int /*long*/ window, int /*long*/ widget);
-public static final void gtk_window_set_default(int /*long*/ window, int /*long*/ widget) {
+public static final native void _gtk_window_set_default(long /*int*/ window, long /*int*/ widget);
@@ -25457,10 +22581,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_default(window, widget);
-@@ -9648,8 +9648,8 @@
- lock.unlock();
- }
- }
+@@ -12796,8 +12796,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting);
-public static final void gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting) {
+public static final native void _gtk_window_set_destroy_with_parent(long /*int*/ window, boolean setting);
@@ -25468,10 +22592,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_destroy_with_parent(window, setting);
-@@ -9657,8 +9657,8 @@
- lock.unlock();
- }
- }
+@@ -12810,8 +12810,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _gtk_window_set_keep_below(int /*long*/ window, boolean setting);
-public static final void gtk_window_set_keep_below(int /*long*/ window, boolean setting) {
+public static final native void _gtk_window_set_keep_below(long /*int*/ window, boolean setting);
@@ -25479,10 +22603,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_keep_below(window, setting);
-@@ -9666,8 +9666,8 @@
- lock.unlock();
- }
- }
+@@ -12824,8 +12824,8 @@
+ * @param geometry_widget cast=(GtkWidget *)
+ * @param geometry flags=no_out
+ */
-public static final native void _gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask);
-public static final void gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask) {
+public static final native void _gtk_window_set_geometry_hints(long /*int*/ window, long /*int*/ geometry_widget, GdkGeometry geometry, int geom_mask);
@@ -25490,10 +22614,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_geometry_hints(window, geometry_widget, geometry, geom_mask);
-@@ -9675,8 +9675,8 @@
- lock.unlock();
- }
- }
+@@ -12837,8 +12837,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param list cast=(GList *)
+ */
-public static final native void _gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list);
-public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) {
+public static final native void _gtk_window_set_icon_list(long /*int*/ window, long /*int*/ list);
@@ -25501,10 +22625,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_icon_list(window, list);
-@@ -9684,8 +9684,8 @@
- lock.unlock();
- }
- }
+@@ -12850,8 +12850,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param modal cast=(gboolean)
+ */
-public static final native void _gtk_window_set_modal(int /*long*/ window, boolean modal);
-public static final void gtk_window_set_modal(int /*long*/ window, boolean modal) {
+public static final native void _gtk_window_set_modal(long /*int*/ window, boolean modal);
@@ -25512,10 +22636,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_modal(window, modal);
-@@ -9693,8 +9693,8 @@
- lock.unlock();
- }
- }
+@@ -12863,8 +12863,8 @@
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ */
-public static final native void _gtk_window_set_opacity(int /*long*/ window, double opacity);
-public static final void gtk_window_set_opacity(int /*long*/ window, double opacity) {
+public static final native void _gtk_window_set_opacity(long /*int*/ window, double opacity);
@@ -25523,10 +22647,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_opacity(window, opacity);
-@@ -9702,8 +9702,8 @@
- lock.unlock();
- }
- }
+@@ -12877,8 +12877,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param tip_text cast=(const gchar *)
+ */
-public static final native void _gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text);
-public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text) {
+public static final native void _gtk_widget_set_tooltip_text(long /*int*/ widget, byte[] tip_text);
@@ -25534,10 +22658,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_tooltip_text(widget, tip_text);
-@@ -9711,8 +9711,8 @@
- lock.unlock();
- }
- }
+@@ -12890,8 +12890,8 @@
+ * @param widget cast=(GtkWidget *)
+ * @param parent_window cast=(GdkWindow *)
+ */
-public static final native void _gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window);
-public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) {
+public static final native void _gtk_widget_set_parent_window(long /*int*/ widget, long /*int*/ parent_window);
@@ -25545,10 +22669,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_widget_set_parent_window(widget, parent_window);
-@@ -9720,8 +9720,8 @@
- lock.unlock();
- }
- }
+@@ -12903,8 +12903,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param resizable cast=(gboolean)
+ */
-public static final native void _gtk_window_set_resizable(int /*long*/ window, boolean resizable);
-public static final void gtk_window_set_resizable(int /*long*/ window, boolean resizable) {
+public static final native void _gtk_window_set_resizable(long /*int*/ window, boolean resizable);
@@ -25556,10 +22680,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_resizable(window, resizable);
-@@ -9729,8 +9729,8 @@
- lock.unlock();
- }
- }
+@@ -12916,8 +12916,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param title cast=(const gchar *)
+ */
-public static final native void _gtk_window_set_title(int /*long*/ window, byte[] title);
-public static final void gtk_window_set_title(int /*long*/ window, byte[] title) {
+public static final native void _gtk_window_set_title(long /*int*/ window, byte[] title);
@@ -25567,10 +22691,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_title(window, title);
-@@ -9738,8 +9738,8 @@
- lock.unlock();
- }
- }
+@@ -12930,8 +12930,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param skips_taskbar cast=(gboolean)
+ */
-public static final native void _gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar);
-public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar) {
+public static final native void _gtk_window_set_skip_taskbar_hint(long /*int*/ window, boolean skips_taskbar);
@@ -25578,10 +22702,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_skip_taskbar_hint(window, skips_taskbar);
-@@ -9747,8 +9747,8 @@
- lock.unlock();
+@@ -12940,8 +12940,8 @@
}
}
+ /** @param window cast=(GtkWindow *) */
-public static final native void _gtk_window_set_type_hint(int /*long*/ window, int hint);
-public static final void gtk_window_set_type_hint(int /*long*/ window, int hint) {
+public static final native void _gtk_window_set_type_hint(long /*int*/ window, int hint);
@@ -25589,10 +22713,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_type_hint(window, hint);
-@@ -9756,8 +9756,8 @@
- lock.unlock();
- }
- }
+@@ -12953,8 +12953,8 @@
+ * @param window cast=(GtkWindow *)
+ * @param parent cast=(GtkWindow *)
+ */
-public static final native void _gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent);
-public static final void gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent) {
+public static final native void _gtk_window_set_transient_for(long /*int*/ window, long /*int*/ parent);
@@ -25600,10 +22724,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_set_transient_for(window, parent);
-@@ -9765,8 +9765,8 @@
- lock.unlock();
+@@ -12963,8 +12963,8 @@
}
}
+ /** @param handle cast=(GtkWindow *) */
-public static final native void _gtk_window_unmaximize(int /*long*/ handle);
-public static final void gtk_window_unmaximize(int /*long*/ handle) {
+public static final native void _gtk_window_unmaximize(long /*int*/ handle);
@@ -25611,115 +22735,316 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_gtk_window_unmaximize(handle);
-@@ -9774,55 +9774,55 @@
- lock.unlock();
- }
- }
+@@ -12977,256 +12977,256 @@
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, GInterfaceInfo src, int size);
++public static final native void memmove(long /*int*/ dest, GInterfaceInfo src, int size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *),flags=no_out
+ */
-public static final native void memmove(int /*long*/ dest, GObjectClass src);
++public static final native void memmove(long /*int*/ dest, GObjectClass src);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, GTypeInfo src, int size);
++public static final native void memmove(long /*int*/ dest, GTypeInfo src, int size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, GtkTargetEntry src, int /*long*/ size);
++public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ */
-public static final native void memmove(int /*long*/ dest, GtkAdjustment src);
++public static final native void memmove(long /*int*/ dest, GtkAdjustment src);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, GdkEventButton src, int /*long*/ size);
++public static final native void memmove(long /*int*/ dest, GdkEventButton src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, GdkEventExpose src, int /*long*/ size);
++public static final native void memmove(long /*int*/ dest, GdkEventExpose src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, GdkEventMotion src, int /*long*/ size);
++public static final native void memmove(long /*int*/ dest, GdkEventMotion src, long /*int*/ size);
+ /** @param src flags=no_out */
-public static final native void memmove(int /*long*/ dest, GtkWidgetClass src);
++public static final native void memmove(long /*int*/ dest, GtkWidgetClass src);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(int /*long*/ dest, PangoAttribute src, int /*long*/ size);
++public static final native void memmove(long /*int*/ dest, PangoAttribute src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
-public static final native void memmove(GObjectClass dest, int /*long*/ src);
++public static final native void memmove(GObjectClass dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GTypeQuery dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
-public static final native void memmove(GtkColorSelectionDialog dest, int /*long*/ src);
++public static final native void memmove(GtkColorSelectionDialog dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
-public static final native void memmove(GtkFileSelection dest, int /*long*/ src);
++public static final native void memmove(GtkFileSelection dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkDragContext dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GtkSelectionData dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GtkSelectionData dest, long /*int*/ src, long /*int*/ size);
+ /** @param dest flags=no_in */
-public static final native void memmove(GtkWidgetClass dest, int /*long*/ src);
++public static final native void memmove(GtkWidgetClass dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GtkTargetPair dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GtkTargetPair dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
-public static final native void memmove(GtkCombo dest, int /*long*/ src);
++public static final native void memmove(GtkCombo dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
-public static final native void memmove(GtkAdjustment dest, int /*long*/ src);
++public static final native void memmove(GtkAdjustment dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GtkBorder dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GtkBorder dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkColor dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkColor dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEvent dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEvent dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventAny dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventAny dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventButton dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventButton dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventCrossing dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventCrossing dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventExpose dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventExpose dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventFocus dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventFocus dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventKey dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventKey dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventMotion dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventMotion dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventScroll dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventScroll dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventVisibility dest, int /*long*/ src, int /*long*/ size);
++public static final native void memmove(GdkEventVisibility dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(GdkEventWindowState dest, int /*long*/ src, int /*long*/ size);
-public static final native void memmove(int /*long*/ dest, GtkCellRendererClass src);
-public static final native void memmove(GtkCellRendererClass dest, int /*long*/ src);
--public static final native void memmove(GtkFixed dest, int /*long*/ src);
--public static final native void memmove(int /*long*/ dest, GtkFixed src);
--public static final native void memmove(GdkVisual dest, int /*long*/ src);
--public static final native void memmove(GdkImage dest, int /*long*/ src);
--public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoAttrColor dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoAttrInt dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoItem dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoLayoutLine dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size);
--public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size);
--public static final native int /*long*/ _pango_attr_background_new (short red, short green, short blue);
--public static final int /*long*/ pango_attr_background_new (short red, short green, short blue) {
-+public static final native void memmove(long /*int*/ dest, GInterfaceInfo src, int size);
-+public static final native void memmove(long /*int*/ dest, GObjectClass src);
-+public static final native void memmove(long /*int*/ dest, GTypeInfo src, int size);
-+public static final native void memmove(long /*int*/ dest, GtkTargetEntry src, long /*int*/ size);
-+public static final native void memmove(long /*int*/ dest, GtkAdjustment src);
-+public static final native void memmove(long /*int*/ dest, GdkEventButton src, long /*int*/ size);
-+public static final native void memmove(long /*int*/ dest, GdkEventExpose src, long /*int*/ size);
-+public static final native void memmove(long /*int*/ dest, GdkEventMotion src, long /*int*/ size);
-+public static final native void memmove(long /*int*/ dest, GtkWidgetClass src);
-+public static final native void memmove(long /*int*/ dest, PangoAttribute src, long /*int*/ size);
-+public static final native void memmove(GObjectClass dest, long /*int*/ src);
-+public static final native void memmove(GTypeQuery dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GtkColorSelectionDialog dest, long /*int*/ src);
-+public static final native void memmove(GtkFileSelection dest, long /*int*/ src);
-+public static final native void memmove(GdkDragContext dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GtkSelectionData dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GtkWidgetClass dest, long /*int*/ src);
-+public static final native void memmove(GtkTargetPair dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GtkCombo dest, long /*int*/ src);
-+public static final native void memmove(GtkAdjustment dest, long /*int*/ src);
-+public static final native void memmove(GtkBorder dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkColor dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEvent dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventAny dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventButton dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventCrossing dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventExpose dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventFocus dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventKey dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventMotion dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventScroll dest, long /*int*/ src, long /*int*/ size);
-+public static final native void memmove(GdkEventVisibility dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(GdkEventWindowState dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(long /*int*/ dest, GtkCellRendererClass src);
+public static final native void memmove(GtkCellRendererClass dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
+-public static final native void memmove(GtkFixed dest, int /*long*/ src);
+public static final native void memmove(GtkFixed dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *),flags=no_out
+ */
+-public static final native void memmove(int /*long*/ dest, GtkFixed src);
+public static final native void memmove(long /*int*/ dest, GtkFixed src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
+-public static final native void memmove(GdkVisual dest, int /*long*/ src);
+public static final native void memmove(GdkVisual dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
+-public static final native void memmove(GdkImage dest, int /*long*/ src);
+public static final native void memmove(GdkImage dest, long /*int*/ src);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(GdkRectangle dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoAttribute dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoAttrColor dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoAttrColor dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoAttrInt dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoAttrInt dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoItem dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoItem dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoLayoutLine dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoLayoutLine dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size);
+public static final native void memmove(PangoLayoutRun dest, long /*int*/ src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size);
+-public static final native int /*long*/ _pango_attr_background_new (short red, short green, short blue);
+-public static final int /*long*/ pango_attr_background_new (short red, short green, short blue) {
+public static final native void memmove(PangoLogAttr dest, long /*int*/ src, long /*int*/ size);
+public static final native long /*int*/ _pango_attr_background_new (short red, short green, short blue);
+public static final long /*int*/ pango_attr_background_new (short red, short green, short blue) {
lock.lock();
try {
return _pango_attr_background_new(red, green, blue);
-@@ -9830,8 +9830,8 @@
- lock.unlock();
+@@ -13235,8 +13235,8 @@
}
}
+ /** @param desc cast=(const PangoFontDescription *) */
-public static final native int /*long*/ _pango_attr_font_desc_new(int /*long*/ desc);
-public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
+public static final native long /*int*/ _pango_attr_font_desc_new(long /*int*/ desc);
@@ -25727,7 +23052,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_font_desc_new(desc);
-@@ -9839,8 +9839,8 @@
+@@ -13244,8 +13244,8 @@
lock.unlock();
}
}
@@ -25738,7 +23063,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_foreground_new(red, green, blue);
-@@ -9848,8 +9848,8 @@
+@@ -13253,8 +13253,8 @@
lock.unlock();
}
}
@@ -25749,10 +23074,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_rise_new(rise);
-@@ -9857,8 +9857,8 @@
- lock.unlock();
- }
- }
+@@ -13266,8 +13266,8 @@
+ * @param ink_rect flags=no_out
+ * @param logical_rect flags=no_out
+ */
-public static final native int /*long*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);
-public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) {
+public static final native long /*int*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);
@@ -25760,10 +23085,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_shape_new(ink_rect, logical_rect);
-@@ -9866,8 +9866,8 @@
- lock.unlock();
- }
- }
+@@ -13279,8 +13279,8 @@
+ * @param list cast=(PangoAttrList *)
+ * @param attr cast=(PangoAttribute *)
+ */
-public static final native void _pango_attr_list_insert(int /*long*/ list, int /*long*/ attr);
-public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/ attr) {
+public static final native void _pango_attr_list_insert(long /*int*/ list, long /*int*/ attr);
@@ -25771,10 +23096,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_attr_list_insert(list, attr);
-@@ -9875,8 +9875,8 @@
- lock.unlock();
- }
- }
+@@ -13292,8 +13292,8 @@
+ * @param list cast=(PangoAttrList *)
+ * @param attr cast=(PangoAttribute *)
+ */
-public static final native void _pango_attr_list_change(int /*long*/ list, int /*long*/ attr);
-public static final void pango_attr_list_change(int /*long*/ list, int /*long*/ attr) {
+public static final native void _pango_attr_list_change(long /*int*/ list, long /*int*/ attr);
@@ -25782,10 +23107,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_attr_list_change(list, attr);
-@@ -9884,8 +9884,8 @@
- lock.unlock();
+@@ -13302,8 +13302,8 @@
}
}
+ /** @param list cast=(PangoAttrList *) */
-public static final native int /*long*/ _pango_attr_list_get_iterator(int /*long*/ list);
-public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list) {
+public static final native long /*int*/ _pango_attr_list_get_iterator(long /*int*/ list);
@@ -25793,10 +23118,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_list_get_iterator(list);
-@@ -9893,8 +9893,8 @@
- lock.unlock();
+@@ -13312,8 +13312,8 @@
}
}
+ /** @param iterator cast=(PangoAttrIterator *) */
-public static final native boolean _pango_attr_iterator_next(int /*long*/ iterator);
-public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
+public static final native boolean _pango_attr_iterator_next(long /*int*/ iterator);
@@ -25804,10 +23129,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_iterator_next(iterator);
-@@ -9902,8 +9902,8 @@
- lock.unlock();
+@@ -13322,8 +13322,8 @@
}
}
+ /** @param iterator cast=(PangoAttrIterator *) */
-public static final native void _pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end);
-public static final void pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end) {
+public static final native void _pango_attr_iterator_range(long /*int*/ iterator, int[] start, int[] end);
@@ -25815,10 +23140,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_attr_iterator_range(iterator, start, end);
-@@ -9911,8 +9911,8 @@
- lock.unlock();
- }
- }
+@@ -13335,8 +13335,8 @@
+ * @param iterator cast=(PangoAttrIterator *)
+ * @param type cast=(PangoAttrType)
+ */
-public static final native int /*long*/ _pango_attr_iterator_get(int /*long*/ iterator, int type);
-public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator, int type) {
+public static final native long /*int*/ _pango_attr_iterator_get(long /*int*/ iterator, int type);
@@ -25826,10 +23151,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_iterator_get(iterator, type);
-@@ -9920,8 +9920,8 @@
- lock.unlock();
+@@ -13345,8 +13345,8 @@
}
}
+ /** @param iterator cast=(PangoAttrIterator *) */
-public static final native int /*long*/ _pango_attr_iterator_get_attrs(int /*long*/ iterator);
-public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iterator) {
+public static final native long /*int*/ _pango_attr_iterator_get_attrs(long /*int*/ iterator);
@@ -25837,10 +23162,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_iterator_get_attrs(iterator);
-@@ -9930,8 +9930,8 @@
- }
+@@ -13356,8 +13356,8 @@
}
+ /** @param iterator cast=(PangoAttrIterator *) */
-public static final native void _pango_attr_iterator_destroy(int /*long*/ iterator);
-public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
+public static final native void _pango_attr_iterator_destroy(long /*int*/ iterator);
@@ -25848,7 +23173,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_attr_iterator_destroy(iterator);
-@@ -9939,8 +9939,8 @@
+@@ -13365,8 +13365,8 @@
lock.unlock();
}
}
@@ -25859,10 +23184,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_list_new();
-@@ -9948,8 +9948,8 @@
- lock.unlock();
+@@ -13375,8 +13375,8 @@
}
}
+ /** @param list cast=(PangoAttrList *) */
-public static final native void _pango_attr_list_unref(int /*long*/ list);
-public static final void pango_attr_list_unref(int /*long*/ list) {
+public static final native void _pango_attr_list_unref(long /*int*/ list);
@@ -25870,10 +23195,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_attr_list_unref(list);
-@@ -9957,8 +9957,8 @@
- lock.unlock();
+@@ -13385,8 +13385,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);
-public static final int /*long*/ pango_attr_strikethrough_color_new(short red, short green, short blue) {
+public static final native long /*int*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);
@@ -25881,7 +23206,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_strikethrough_color_new(red, green, blue);
-@@ -9966,8 +9966,8 @@
+@@ -13394,8 +13394,8 @@
lock.unlock();
}
}
@@ -25892,10 +23217,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_strikethrough_new(strikethrough);
-@@ -9975,8 +9975,8 @@
- lock.unlock();
+@@ -13404,8 +13404,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _pango_attr_underline_color_new(short red, short green, short blue);
-public static final int /*long*/ pango_attr_underline_color_new(short red, short green, short blue) {
+public static final native long /*int*/ _pango_attr_underline_color_new(short red, short green, short blue);
@@ -25903,7 +23228,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_underline_color_new(red, green, blue);
-@@ -9984,8 +9984,8 @@
+@@ -13413,8 +13413,8 @@
lock.unlock();
}
}
@@ -25914,7 +23239,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_underline_new(underline);
-@@ -9993,8 +9993,8 @@
+@@ -13422,8 +13422,8 @@
lock.unlock();
}
}
@@ -25925,10 +23250,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_attr_weight_new(weight);
-@@ -10002,8 +10002,8 @@
- lock.unlock();
+@@ -13432,8 +13432,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_font_map_get_default();
-public static final int /*long*/ pango_cairo_font_map_get_default() {
+public static final native long /*int*/ _pango_cairo_font_map_get_default();
@@ -25936,10 +23261,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_cairo_font_map_get_default();
-@@ -10011,8 +10011,8 @@
- lock.unlock();
+@@ -13442,8 +13442,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_font_map_new();
-public static final int /*long*/ pango_cairo_font_map_new() {
+public static final native long /*int*/ _pango_cairo_font_map_new();
@@ -25947,10 +23272,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_cairo_font_map_new();
-@@ -10020,8 +10020,8 @@
- lock.unlock();
+@@ -13452,8 +13452,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_font_map_create_context(int /*long*/ fontmap);
-public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*/ fontmap) {
+public static final native long /*int*/ _pango_cairo_font_map_create_context(long /*int*/ fontmap);
@@ -25958,10 +23283,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_cairo_font_map_create_context(fontmap);
-@@ -10029,8 +10029,8 @@
- lock.unlock();
+@@ -13462,8 +13462,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int /*long*/ _pango_cairo_create_layout(int /*long*/ cairo);
-public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
+public static final native long /*int*/ _pango_cairo_create_layout(long /*int*/ cairo);
@@ -25969,10 +23294,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_cairo_create_layout(cairo);
-@@ -10038,8 +10038,8 @@
- lock.unlock();
- }
- }
+@@ -13475,8 +13475,8 @@
+ * @method flags=dynamic
+ * @param context cast=(PangoContext *)
+ */
-public static final native int /*long*/ _pango_cairo_context_get_font_options(int /*long*/ context);
-public static final int /*long*/ pango_cairo_context_get_font_options(int /*long*/ context) {
+public static final native long /*int*/ _pango_cairo_context_get_font_options(long /*int*/ context);
@@ -25980,10 +23305,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_cairo_context_get_font_options(context);
-@@ -10047,8 +10047,8 @@
- lock.unlock();
- }
- }
+@@ -13488,8 +13488,8 @@
+ * @method flags=dynamic
+ * @param context cast=(PangoContext *)
+ */
-public static final native void _pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options);
-public static final void pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options) {
+public static final native void _pango_cairo_context_set_font_options(long /*int*/ context, long /*int*/ options);
@@ -25991,10 +23316,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_cairo_context_set_font_options(context, options);
-@@ -10056,8 +10056,8 @@
- lock.unlock();
+@@ -13498,8 +13498,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi);
-public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi) {
+public static final native void _pango_cairo_font_map_set_resolution(long /*int*/ fontmap, double dpi);
@@ -26002,10 +23327,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_cairo_font_map_set_resolution(fontmap, dpi);
-@@ -10065,8 +10065,8 @@
- lock.unlock();
+@@ -13508,8 +13508,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout);
-public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout) {
+public static final native void _pango_cairo_layout_path(long /*int*/ cairo, long /*int*/ layout);
@@ -26013,10 +23338,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_cairo_layout_path(cairo, layout);
-@@ -10074,8 +10074,8 @@
- lock.unlock();
+@@ -13518,8 +13518,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout);
-public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout) {
+public static final native void _pango_cairo_show_layout(long /*int*/ cairo, long /*int*/ layout);
@@ -26024,10 +23349,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_cairo_show_layout(cairo, layout);
-@@ -10083,8 +10083,8 @@
- lock.unlock();
+@@ -13528,8 +13528,8 @@
}
}
+ /** @param context cast=(PangoContext *) */
-public static final native int _pango_context_get_base_dir(int /*long*/ context);
-public static final int pango_context_get_base_dir(int /*long*/ context) {
+public static final native int _pango_context_get_base_dir(long /*int*/ context);
@@ -26035,10 +23360,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_context_get_base_dir(context);
-@@ -10092,8 +10092,8 @@
- lock.unlock();
+@@ -13538,8 +13538,8 @@
}
}
+ /** @param context cast=(PangoContext *) */
-public static final native int /*long*/ _pango_context_get_language(int /*long*/ context);
-public static final int /*long*/ pango_context_get_language(int /*long*/ context) {
+public static final native long /*int*/ _pango_context_get_language(long /*int*/ context);
@@ -26046,10 +23371,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_context_get_language(context);
-@@ -10101,8 +10101,8 @@
- lock.unlock();
- }
- }
+@@ -13552,8 +13552,8 @@
+ * @param desc cast=(const PangoFontDescription *)
+ * @param language cast=(PangoLanguage *)
+ */
-public static final native int /*long*/ _pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language);
-public static final int /*long*/ pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language) {
+public static final native long /*int*/ _pango_context_get_metrics(long /*int*/ context, long /*int*/ desc, long /*int*/ language);
@@ -26057,10 +23382,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_context_get_metrics(context, desc, language);
-@@ -10110,8 +10110,8 @@
- lock.unlock();
- }
- }
+@@ -13566,8 +13566,8 @@
+ * @param families cast=(PangoFontFamily ***)
+ * @param n_families cast=(int *)
+ */
-public static final native void _pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families);
-public static final void pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families) {
+public static final native void _pango_context_list_families(long /*int*/ context, long /*int*/[] families, int[] n_families);
@@ -26068,10 +23393,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_context_list_families(context, families, n_families);
-@@ -10119,8 +10119,8 @@
- lock.unlock();
+@@ -13576,8 +13576,8 @@
}
}
+ /** @param context cast=(PangoContext *) */
-public static final native void _pango_context_set_base_dir(int /*long*/ context, int direction);
-public static final void pango_context_set_base_dir(int /*long*/ context, int direction) {
+public static final native void _pango_context_set_base_dir(long /*int*/ context, int direction);
@@ -26079,10 +23404,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_context_set_base_dir(context, direction);
-@@ -10128,8 +10128,8 @@
- lock.unlock();
- }
- }
+@@ -13589,8 +13589,8 @@
+ * @param context cast=(PangoContext *)
+ * @param language cast=(PangoLanguage *)
+ */
-public static final native void _pango_context_set_language(int /*long*/ context, int /*long*/ language);
-public static final void pango_context_set_language(int /*long*/ context, int /*long*/ language) {
+public static final native void _pango_context_set_language(long /*int*/ context, long /*int*/ language);
@@ -26090,10 +23415,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_context_set_language(context, language);
-@@ -10137,8 +10137,8 @@
- lock.unlock();
+@@ -13599,8 +13599,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native int /*long*/ _pango_font_description_copy(int /*long*/ desc);
-public static final int /*long*/ pango_font_description_copy(int /*long*/ desc) {
+public static final native long /*int*/ _pango_font_description_copy(long /*int*/ desc);
@@ -26101,10 +23426,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_copy(desc);
-@@ -10146,8 +10146,8 @@
- lock.unlock();
+@@ -13609,8 +13609,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native void _pango_font_description_free(int /*long*/ desc);
-public static final void pango_font_description_free(int /*long*/ desc) {
+public static final native void _pango_font_description_free(long /*int*/ desc);
@@ -26112,10 +23437,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_description_free(desc);
-@@ -10155,8 +10155,8 @@
- lock.unlock();
+@@ -13619,8 +13619,8 @@
}
}
+ /** @param str cast=(const char *),flags=no_out critical */
-public static final native int /*long*/ _pango_font_description_from_string(byte[] str);
-public static final int /*long*/ pango_font_description_from_string(byte[] str) {
+public static final native long /*int*/ _pango_font_description_from_string(byte[] str);
@@ -26123,10 +23448,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_from_string(str);
-@@ -10164,8 +10164,8 @@
- lock.unlock();
+@@ -13629,8 +13629,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native int /*long*/ _pango_font_description_get_family(int /*long*/ desc);
-public static final int /*long*/ pango_font_description_get_family(int /*long*/ desc) {
+public static final native long /*int*/ _pango_font_description_get_family(long /*int*/ desc);
@@ -26134,10 +23459,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_get_family(desc);
-@@ -10173,8 +10173,8 @@
- lock.unlock();
+@@ -13639,8 +13639,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_size(int /*long*/ desc);
-public static final int pango_font_description_get_size(int /*long*/ desc) {
+public static final native int _pango_font_description_get_size(long /*int*/ desc);
@@ -26145,10 +23470,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_get_size(desc);
-@@ -10182,8 +10182,8 @@
- lock.unlock();
+@@ -13649,8 +13649,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_style(int /*long*/ desc);
-public static final int pango_font_description_get_style(int /*long*/ desc) {
+public static final native int _pango_font_description_get_style(long /*int*/ desc);
@@ -26156,10 +23481,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_get_style(desc);
-@@ -10191,8 +10191,8 @@
- lock.unlock();
+@@ -13659,8 +13659,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native int _pango_font_description_get_weight(int /*long*/ desc);
-public static final int pango_font_description_get_weight(int /*long*/ desc) {
+public static final native int _pango_font_description_get_weight(long /*int*/ desc);
@@ -26167,7 +23492,7 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_get_weight(desc);
-@@ -10200,8 +10200,8 @@
+@@ -13668,8 +13668,8 @@
lock.unlock();
}
}
@@ -26178,10 +23503,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_new();
-@@ -10209,8 +10209,8 @@
- lock.unlock();
- }
- }
+@@ -13681,8 +13681,8 @@
+ * @param desc cast=(PangoFontDescription *)
+ * @param family cast=(const char *),flags=no_out critical
+ */
-public static final native void _pango_font_description_set_family(int /*long*/ desc, byte[] family);
-public static final void pango_font_description_set_family(int /*long*/ desc, byte[] family) {
+public static final native void _pango_font_description_set_family(long /*int*/ desc, byte[] family);
@@ -26189,10 +23514,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_description_set_family(desc, family);
-@@ -10218,8 +10218,8 @@
- lock.unlock();
- }
- }
+@@ -13694,8 +13694,8 @@
+ * @param desc cast=(PangoFontDescription *)
+ * @param size cast=(gint)
+ */
-public static final native void _pango_font_description_set_size(int /*long*/ desc, int size);
-public static final void pango_font_description_set_size(int /*long*/ desc, int size) {
+public static final native void _pango_font_description_set_size(long /*int*/ desc, int size);
@@ -26200,10 +23525,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_description_set_size(desc, size);
-@@ -10227,8 +10227,8 @@
- lock.unlock();
- }
- }
+@@ -13707,8 +13707,8 @@
+ * @param desc cast=(PangoFontDescription *)
+ * @param stretch cast=(PangoStretch)
+ */
-public static final native void _pango_font_description_set_stretch(int /*long*/ desc, int stretch);
-public static final void pango_font_description_set_stretch(int /*long*/ desc, int stretch) {
+public static final native void _pango_font_description_set_stretch(long /*int*/ desc, int stretch);
@@ -26211,10 +23536,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_description_set_stretch(desc, stretch);
-@@ -10236,8 +10236,8 @@
- lock.unlock();
- }
- }
+@@ -13720,8 +13720,8 @@
+ * @param desc cast=(PangoFontDescription *)
+ * @param weight cast=(PangoStyle)
+ */
-public static final native void _pango_font_description_set_style(int /*long*/ desc, int weight);
-public static final void pango_font_description_set_style(int /*long*/ desc, int weight) {
+public static final native void _pango_font_description_set_style(long /*int*/ desc, int weight);
@@ -26222,10 +23547,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_description_set_style(desc, weight);
-@@ -10245,8 +10245,8 @@
- lock.unlock();
- }
- }
+@@ -13733,8 +13733,8 @@
+ * @param desc cast=(PangoFontDescription *)
+ * @param weight cast=(PangoWeight)
+ */
-public static final native void _pango_font_description_set_weight(int /*long*/ desc, int weight);
-public static final void pango_font_description_set_weight(int /*long*/ desc, int weight) {
+public static final native void _pango_font_description_set_weight(long /*int*/ desc, int weight);
@@ -26233,10 +23558,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_description_set_weight(desc, weight);
-@@ -10254,8 +10254,8 @@
- lock.unlock();
+@@ -13743,8 +13743,8 @@
}
}
+ /** @param desc cast=(PangoFontDescription *) */
-public static final native int /*long*/ _pango_font_description_to_string(int /*long*/ desc);
-public static final int /*long*/ pango_font_description_to_string(int /*long*/ desc) {
+public static final native long /*int*/ _pango_font_description_to_string(long /*int*/ desc);
@@ -26244,10 +23569,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_description_to_string(desc);
-@@ -10263,8 +10263,8 @@
- lock.unlock();
+@@ -13753,8 +13753,8 @@
}
}
+ /** @param face cast=(PangoFontFace *) */
-public static final native int /*long*/ _pango_font_face_describe(int /*long*/ face);
-public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
+public static final native long /*int*/ _pango_font_face_describe(long /*int*/ face);
@@ -26255,10 +23580,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_face_describe(face);
-@@ -10272,8 +10272,8 @@
- lock.unlock();
+@@ -13763,8 +13763,8 @@
}
}
+ /** @param family cast=(PangoFontFamily *) */
-public static final native int /*long*/ _pango_font_family_get_name(int /*long*/ family);
-public static final int /*long*/ pango_font_family_get_name(int /*long*/ family) {
+public static final native long /*int*/ _pango_font_family_get_name(long /*int*/ family);
@@ -26266,10 +23591,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_family_get_name(family);
-@@ -10281,8 +10281,8 @@
- lock.unlock();
- }
- }
+@@ -13777,8 +13777,8 @@
+ * @param faces cast=(PangoFontFace ***)
+ * @param n_faces cast=(int *)
+ */
-public static final native void _pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces);
-public static final void pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces) {
+public static final native void _pango_font_family_list_faces(long /*int*/ family, long /*int*/[] faces, int[] n_faces);
@@ -26277,10 +23602,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_family_list_faces(family, faces, n_faces);
-@@ -10290,8 +10290,8 @@
- lock.unlock();
- }
- }
+@@ -13790,8 +13790,8 @@
+ * @param font cast=(PangoFont *)
+ * @param language cast=(PangoLanguage *)
+ */
-public static final native int /*long*/ _pango_font_get_metrics(int /*long*/ font, int /*long*/ language);
-public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /*long*/ language) {
+public static final native long /*int*/ _pango_font_get_metrics(long /*int*/ font, long /*int*/ language);
@@ -26288,10 +23613,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_get_metrics(font, language);
-@@ -10299,8 +10299,8 @@
- lock.unlock();
+@@ -13800,8 +13800,8 @@
}
}
+ /** @param metrics cast=(PangoFontMetrics *) */
-public static final native int _pango_font_metrics_get_approximate_char_width(int /*long*/ metrics);
-public static final int pango_font_metrics_get_approximate_char_width(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_approximate_char_width(long /*int*/ metrics);
@@ -26299,10 +23624,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_approximate_char_width(metrics);
-@@ -10308,8 +10308,8 @@
- lock.unlock();
+@@ -13810,8 +13810,8 @@
}
}
+ /** @param metrics cast=(PangoFontMetrics *) */
-public static final native int _pango_font_metrics_get_ascent(int /*long*/ metrics);
-public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_ascent(long /*int*/ metrics);
@@ -26310,10 +23635,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_ascent(metrics);
-@@ -10317,8 +10317,8 @@
- lock.unlock();
+@@ -13820,8 +13820,8 @@
}
}
+ /** @param metrics cast=(PangoFontMetrics *) */
-public static final native int _pango_font_metrics_get_descent(int /*long*/ metrics);
-public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_descent(long /*int*/ metrics);
@@ -26321,10 +23646,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_descent(metrics);
-@@ -10326,8 +10326,8 @@
- lock.unlock();
+@@ -13830,8 +13830,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_underline_thickness(int /*long*/ metrics);
-public static final int pango_font_metrics_get_underline_thickness(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_underline_thickness(long /*int*/ metrics);
@@ -26332,10 +23657,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_underline_thickness(metrics);
-@@ -10335,8 +10335,8 @@
- lock.unlock();
+@@ -13840,8 +13840,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_underline_position(int /*long*/ metrics);
-public static final int pango_font_metrics_get_underline_position(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_underline_position(long /*int*/ metrics);
@@ -26343,10 +23668,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_underline_position(metrics);
-@@ -10344,8 +10344,8 @@
- lock.unlock();
+@@ -13850,8 +13850,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics);
-public static final int pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_strikethrough_thickness(long /*int*/ metrics);
@@ -26354,10 +23679,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_thickness(metrics);
-@@ -10353,8 +10353,8 @@
- lock.unlock();
+@@ -13860,8 +13860,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native int _pango_font_metrics_get_strikethrough_position(int /*long*/ metrics);
-public static final int pango_font_metrics_get_strikethrough_position(int /*long*/ metrics) {
+public static final native int _pango_font_metrics_get_strikethrough_position(long /*int*/ metrics);
@@ -26365,10 +23690,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_font_metrics_get_strikethrough_position(metrics);
-@@ -10362,8 +10362,8 @@
- lock.unlock();
+@@ -13870,8 +13870,8 @@
}
}
+ /** @param metrics cast=(PangoFontMetrics *) */
-public static final native void _pango_font_metrics_unref(int /*long*/ metrics);
-public static final void pango_font_metrics_unref(int /*long*/ metrics) {
+public static final native void _pango_font_metrics_unref(long /*int*/ metrics);
@@ -26376,10 +23701,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_font_metrics_unref(metrics);
-@@ -10371,8 +10371,8 @@
- lock.unlock();
+@@ -13880,8 +13880,8 @@
}
}
+ /** @param language cast=(const char *),flags=no_out */
-public static final native int /*long*/ _pango_language_from_string(byte[] language);
-public static final int /*long*/ pango_language_from_string(byte[] language) {
+public static final native long /*int*/ _pango_language_from_string(byte[] language);
@@ -26387,10 +23712,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_language_from_string(language);
-@@ -10380,8 +10380,8 @@
- lock.unlock();
+@@ -13890,8 +13890,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_context_changed(int /*long*/ layout);
-public static final void pango_layout_context_changed(int /*long*/ layout) {
+public static final native void _pango_layout_context_changed(long /*int*/ layout);
@@ -26398,10 +23723,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_context_changed(layout);
-@@ -10389,8 +10389,8 @@
- lock.unlock();
+@@ -13900,8 +13900,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_alignment(int /*long*/ layout);
-public static final int pango_layout_get_alignment(int /*long*/ layout) {
+public static final native int _pango_layout_get_alignment(long /*int*/ layout);
@@ -26409,10 +23734,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_alignment(layout);
-@@ -10398,8 +10398,8 @@
- lock.unlock();
+@@ -13910,8 +13910,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_context(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_context(long /*int*/ layout);
@@ -26420,10 +23745,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_context(layout);
-@@ -10407,8 +10407,8 @@
- lock.unlock();
+@@ -13920,8 +13920,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_attributes(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_attributes(long /*int*/ layout);
@@ -26431,10 +23756,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_attributes(layout);
-@@ -10416,8 +10416,8 @@
- lock.unlock();
+@@ -13930,8 +13930,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_indent(int /*long*/ layout);
-public static final int pango_layout_get_indent(int /*long*/ layout) {
+public static final native int _pango_layout_get_indent(long /*int*/ layout);
@@ -26442,10 +23767,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_indent(layout);
-@@ -10425,8 +10425,8 @@
- lock.unlock();
+@@ -13940,8 +13940,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native int /*long*/ _pango_layout_get_iter(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_iter(long /*int*/ layout);
@@ -26453,10 +23778,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_iter(layout);
-@@ -10434,8 +10434,8 @@
- lock.unlock();
+@@ -13950,8 +13950,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native boolean _pango_layout_get_justify(int /*long*/ layout);
-public static final boolean pango_layout_get_justify(int /*long*/ layout) {
+public static final native boolean _pango_layout_get_justify(long /*int*/ layout);
@@ -26464,10 +23789,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_justify(layout);
-@@ -10443,8 +10443,8 @@
- lock.unlock();
+@@ -13960,8 +13960,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_line(int /*long*/ layout, int line);
-public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int line) {
+public static final native long /*int*/ _pango_layout_get_line(long /*int*/ layout, int line);
@@ -26475,10 +23800,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_line(layout, line);
-@@ -10452,8 +10452,8 @@
- lock.unlock();
+@@ -13970,8 +13970,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_line_count(int /*long*/ layout);
-public static final int pango_layout_get_line_count(int /*long*/ layout) {
+public static final native int _pango_layout_get_line_count(long /*int*/ layout);
@@ -26486,10 +23811,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_line_count(layout);
-@@ -10461,8 +10461,8 @@
- lock.unlock();
- }
- }
+@@ -13984,8 +13984,8 @@
+ * @param attrs cast=(PangoLogAttr **)
+ * @param n_attrs cast=(int *)
+ */
-public static final native void _pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs);
-public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs) {
+public static final native void _pango_layout_get_log_attrs(long /*int*/ layout, long /*int*/[] attrs, int[] n_attrs);
@@ -26497,10 +23822,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_get_log_attrs(layout, attrs, n_attrs);
-@@ -10470,8 +10470,8 @@
- lock.unlock();
- }
- }
+@@ -13998,8 +13998,8 @@
+ * @param width cast=(int *)
+ * @param height cast=(int *)
+ */
-public static final native void _pango_layout_get_size(int /*long*/ layout, int[] width, int[] height);
-public static final void pango_layout_get_size(int /*long*/ layout, int[] width, int[] height) {
+public static final native void _pango_layout_get_size(long /*int*/ layout, int[] width, int[] height);
@@ -26508,10 +23833,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_get_size(layout, width, height);
-@@ -10479,8 +10479,8 @@
- lock.unlock();
+@@ -14008,8 +14008,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native int _pango_layout_get_spacing(int /*long*/ layout);
-public static final int pango_layout_get_spacing(int /*long*/ layout) {
+public static final native int _pango_layout_get_spacing(long /*int*/ layout);
@@ -26519,10 +23844,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_spacing(layout);
-@@ -10488,8 +10488,8 @@
- lock.unlock();
+@@ -14018,8 +14018,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native int /*long*/ _pango_layout_get_tabs(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_tabs(long /*int*/ layout);
@@ -26530,10 +23855,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_tabs(layout);
-@@ -10497,8 +10497,8 @@
- lock.unlock();
+@@ -14028,8 +14028,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native int /*long*/ _pango_layout_get_text(int /*long*/ layout);
-public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
+public static final native long /*int*/ _pango_layout_get_text(long /*int*/ layout);
@@ -26541,10 +23866,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_text(layout);
-@@ -10506,8 +10506,8 @@
- lock.unlock();
+@@ -14038,8 +14038,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native int _pango_layout_get_width(int /*long*/ layout);
-public static final int pango_layout_get_width(int /*long*/ layout) {
+public static final native int _pango_layout_get_width(long /*int*/ layout);
@@ -26552,10 +23877,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_get_width(layout);
-@@ -10515,8 +10515,8 @@
- lock.unlock();
- }
- }
+@@ -14051,8 +14051,8 @@
+ * @param layout cast=(PangoLayout*)
+ * @param pos flags=no_in
+ */
-public static final native void _pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos);
-public static final void pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos) {
+public static final native void _pango_layout_index_to_pos(long /*int*/ layout, int index, PangoRectangle pos);
@@ -26563,10 +23888,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_index_to_pos(layout, index, pos);
-@@ -10524,8 +10524,8 @@
- lock.unlock();
+@@ -14061,8 +14061,8 @@
}
}
+ /** @param iter cast=(PangoLayoutIter*) */
-public static final native void _pango_layout_iter_free(int /*long*/ iter);
-public static final void pango_layout_iter_free(int /*long*/ iter) {
+public static final native void _pango_layout_iter_free(long /*int*/ iter);
@@ -26574,10 +23899,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_iter_free(iter);
-@@ -10533,8 +10533,8 @@
- lock.unlock();
- }
- }
+@@ -14075,8 +14075,8 @@
+ * @param ink_rect flags=no_in
+ * @param logical_rect flags=no_in
+ */
-public static final native void _pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);
-public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) {
+public static final native void _pango_layout_iter_get_line_extents(long /*int*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);
@@ -26585,10 +23910,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_iter_get_line_extents(iter, ink_rect, logical_rect);
-@@ -10542,8 +10542,8 @@
- lock.unlock();
+@@ -14085,8 +14085,8 @@
}
}
+ /** @param iter cast=(PangoLayoutIter*) */
-public static final native int _pango_layout_iter_get_index(int /*long*/ iter);
-public static final int pango_layout_iter_get_index(int /*long*/ iter) {
+public static final native int _pango_layout_iter_get_index(long /*int*/ iter);
@@ -26596,10 +23921,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_iter_get_index(iter);
-@@ -10551,8 +10551,8 @@
- lock.unlock();
+@@ -14095,8 +14095,8 @@
}
}
+ /** @param iter cast=(PangoLayoutIter*) */
-public static final native int /*long*/ _pango_layout_iter_get_run(int /*long*/ iter);
-public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
+public static final native long /*int*/ _pango_layout_iter_get_run(long /*int*/ iter);
@@ -26607,10 +23932,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_iter_get_run(iter);
-@@ -10560,8 +10560,8 @@
- lock.unlock();
+@@ -14105,8 +14105,8 @@
}
}
+ /** @param iter cast=(PangoLayoutIter*) */
-public static final native boolean _pango_layout_iter_next_line(int /*long*/ iter);
-public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
+public static final native boolean _pango_layout_iter_next_line(long /*int*/ iter);
@@ -26618,10 +23943,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_iter_next_line(iter);
-@@ -10569,8 +10569,8 @@
- lock.unlock();
+@@ -14115,8 +14115,8 @@
}
}
+ /** @param iter cast=(PangoLayoutIter*) */
-public static final native boolean _pango_layout_iter_next_run(int /*long*/ iter);
-public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
+public static final native boolean _pango_layout_iter_next_run(long /*int*/ iter);
@@ -26629,10 +23954,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_iter_next_run(iter);
-@@ -10578,8 +10578,8 @@
- lock.unlock();
- }
- }
+@@ -14129,8 +14129,8 @@
+ * @param ink_rect cast=(PangoRectangle *),flags=no_in
+ * @param logical_rect cast=(PangoRectangle *),flags=no_in
+ */
-public static final native void _pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);
-public static final void pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) {
+public static final native void _pango_layout_line_get_extents(long /*int*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);
@@ -26640,10 +23965,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_line_get_extents(line, ink_rect, logical_rect);
-@@ -10587,8 +10587,8 @@
- lock.unlock();
- }
- }
+@@ -14143,8 +14143,8 @@
+ * @param index_ cast=(int *)
+ * @param trailing cast=(int *)
+ */
-public static final native boolean _pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing);
-public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing) {
+public static final native boolean _pango_layout_line_x_to_index(long /*int*/ line, int x_pos, int[] index_, int[] trailing);
@@ -26651,21 +23976,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_line_x_to_index(line, x_pos, index_, trailing);
-@@ -10596,8 +10596,8 @@
- lock.unlock();
+@@ -14153,8 +14153,8 @@
}
}
--public static final native int _pango_layout_line_get_resolved_dir(int /*long*/ line);
--public static final int pango_layout_line_get_resolved_dir(int /*long*/ line) {
-+public static final native int _pango_layout_line_get_resolved_dir(long /*int*/ line);
-+public static final int pango_layout_line_get_resolved_dir(long /*int*/ line) {
- lock.lock();
- try {
- return _pango_layout_line_get_resolved_dir(line);
-@@ -10606,8 +10606,8 @@
- }
- }
-
+ /** @param context cast=(PangoContext *) */
-public static final native int /*long*/ _pango_layout_new(int /*long*/ context);
-public static final int /*long*/ pango_layout_new(int /*long*/ context) {
+public static final native long /*int*/ _pango_layout_new(long /*int*/ context);
@@ -26673,10 +23987,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_new(context);
-@@ -10615,8 +10615,8 @@
- lock.unlock();
+@@ -14163,8 +14163,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_alignment (int /*long*/ layout, int alignment);
-public static final void pango_layout_set_alignment (int /*long*/ layout, int alignment) {
+public static final native void _pango_layout_set_alignment (long /*int*/ layout, int alignment);
@@ -26684,10 +23998,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_alignment(layout, alignment);
-@@ -10624,8 +10624,8 @@
- lock.unlock();
- }
- }
+@@ -14176,8 +14176,8 @@
+ * @param layout cast=(PangoLayout *)
+ * @param attrs cast=(PangoAttrList *)
+ */
-public static final native void _pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs);
-public static final void pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs) {
+public static final native void _pango_layout_set_attributes(long /*int*/ layout, long /*int*/ attrs);
@@ -26695,10 +24009,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_attributes(layout, attrs);
-@@ -10633,8 +10633,8 @@
- lock.unlock();
+@@ -14186,8 +14186,8 @@
}
}
+ /** @method flags=dynamic */
-public static final native void _pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir);
-public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir) {
+public static final native void _pango_layout_set_auto_dir(long /*int*/ layout, boolean auto_dir);
@@ -26706,10 +24020,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_auto_dir(layout, auto_dir);
-@@ -10642,8 +10642,8 @@
- lock.unlock();
- }
- }
+@@ -14199,8 +14199,8 @@
+ * @param context cast=(PangoLayout *)
+ * @param descr cast=(PangoFontDescription *)
+ */
-public static final native void _pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr);
-public static final void pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr) {
+public static final native void _pango_layout_set_font_description(long /*int*/ context, long /*int*/ descr);
@@ -26717,10 +24031,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_font_description(context, descr);
-@@ -10651,8 +10651,8 @@
- lock.unlock();
+@@ -14209,8 +14209,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native void _pango_layout_set_indent(int /*long*/ layout, int indent);
-public static final void pango_layout_set_indent(int /*long*/ layout, int indent) {
+public static final native void _pango_layout_set_indent(long /*int*/ layout, int indent);
@@ -26728,10 +24042,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_indent(layout, indent);
-@@ -10660,8 +10660,8 @@
- lock.unlock();
+@@ -14219,8 +14219,8 @@
}
}
+ /** @param layout cast=(PangoLayout*) */
-public static final native void _pango_layout_set_justify(int /*long*/ layout, boolean justify);
-public static final void pango_layout_set_justify(int /*long*/ layout, boolean justify) {
+public static final native void _pango_layout_set_justify(long /*int*/ layout, boolean justify);
@@ -26739,10 +24053,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_justify(layout, justify);
-@@ -10669,8 +10669,8 @@
- lock.unlock();
- }
- }
+@@ -14232,8 +14232,8 @@
+ * @param context cast=(PangoLayout *)
+ * @param setting cast=(gboolean)
+ */
-public static final native void _pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting);
-public static final void pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting) {
+public static final native void _pango_layout_set_single_paragraph_mode(long /*int*/ context, boolean setting);
@@ -26750,10 +24064,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_single_paragraph_mode(context, setting);
-@@ -10678,8 +10678,8 @@
- lock.unlock();
+@@ -14242,8 +14242,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_spacing(int /*long*/ layout, int spacing);
-public static final void pango_layout_set_spacing(int /*long*/ layout, int spacing) {
+public static final native void _pango_layout_set_spacing(long /*int*/ layout, int spacing);
@@ -26761,10 +24075,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_spacing(layout, spacing);
-@@ -10687,8 +10687,8 @@
- lock.unlock();
- }
- }
+@@ -14255,8 +14255,8 @@
+ * @param layout cast=(PangoLayout *)
+ * @param tabs cast=(PangoTabArray *)
+ */
-public static final native void _pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs);
-public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs) {
+public static final native void _pango_layout_set_tabs(long /*int*/ layout, long /*int*/ tabs);
@@ -26772,10 +24086,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_tabs(layout, tabs);
-@@ -10696,8 +10696,8 @@
- lock.unlock();
- }
- }
+@@ -14269,8 +14269,8 @@
+ * @param text cast=(const char *),flags=no_out critical
+ * @param length cast=(int)
+ */
-public static final native void _pango_layout_set_text(int /*long*/ layout, byte[] text, int length);
-public static final void pango_layout_set_text(int /*long*/ layout, byte[] text, int length) {
+public static final native void _pango_layout_set_text(long /*int*/ layout, byte[] text, int length);
@@ -26783,10 +24097,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_text(layout, text, length);
-@@ -10705,8 +10705,8 @@
- lock.unlock();
+@@ -14279,8 +14279,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_width(int /*long*/ layout, int width);
-public static final void pango_layout_set_width(int /*long*/ layout, int width) {
+public static final native void _pango_layout_set_width(long /*int*/ layout, int width);
@@ -26794,10 +24108,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_width(layout, width);
-@@ -10714,8 +10714,8 @@
- lock.unlock();
+@@ -14289,8 +14289,8 @@
}
}
+ /** @param layout cast=(PangoLayout *) */
-public static final native void _pango_layout_set_wrap (int /*long*/ layout, int wrap);
-public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
+public static final native void _pango_layout_set_wrap (long /*int*/ layout, int wrap);
@@ -26805,10 +24119,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_layout_set_wrap(layout, wrap);
-@@ -10723,8 +10723,8 @@
- lock.unlock();
- }
- }
+@@ -14303,8 +14303,8 @@
+ * @param index cast=(int *)
+ * @param trailing cast=(int *)
+ */
-public static final native boolean _pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing);
-public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing) {
+public static final native boolean _pango_layout_xy_to_index(long /*int*/ layout, int x, int y, int[] index, int[] trailing);
@@ -26816,10 +24130,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_layout_xy_to_index(layout, x, y, index, trailing);
-@@ -10732,8 +10732,8 @@
- lock.unlock();
+@@ -14313,8 +14313,8 @@
}
}
+ /** @param tab_array cast=(PangoTabArray *) */
-public static final native int _pango_tab_array_get_size(int /*long*/ tab_array);
-public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
+public static final native int _pango_tab_array_get_size(long /*int*/ tab_array);
@@ -26827,10 +24141,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_tab_array_get_size(tab_array);
-@@ -10741,8 +10741,8 @@
- lock.unlock();
- }
- }
+@@ -14327,8 +14327,8 @@
+ * @param alignments cast=(PangoTabAlign **)
+ * @param locations cast=(int **)
+ */
-public static final native void _pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations);
-public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations) {
+public static final native void _pango_tab_array_get_tabs(long /*int*/ tab_array, long /*int*/[] alignments, long /*int*/[] locations);
@@ -26838,10 +24152,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_tab_array_get_tabs(tab_array, alignments, locations);
-@@ -10750,8 +10750,8 @@
- lock.unlock();
+@@ -14337,8 +14337,8 @@
}
}
+ /** @param tab_array cast=(PangoTabArray *) */
-public static final native void _pango_tab_array_free(int /*long*/ tab_array);
-public static final void pango_tab_array_free(int /*long*/ tab_array) {
+public static final native void _pango_tab_array_free(long /*int*/ tab_array);
@@ -26849,10 +24163,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_tab_array_free(tab_array);
-@@ -10759,8 +10759,8 @@
- lock.unlock();
- }
- }
+@@ -14350,8 +14350,8 @@
+ * @param initial_size cast=(gint)
+ * @param positions_in_pixels cast=(gboolean)
+ */
-public static final native int /*long*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);
-public static final int /*long*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) {
+public static final native long /*int*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);
@@ -26860,10 +24174,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _pango_tab_array_new(initial_size, positions_in_pixels);
-@@ -10768,8 +10768,8 @@
- lock.unlock();
- }
- }
+@@ -14365,8 +14365,8 @@
+ * @param alignment cast=(PangoTabAlign)
+ * @param location cast=(gint)
+ */
-public static final native void _pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location);
-public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location) {
+public static final native void _pango_tab_array_set_tab(long /*int*/ tab_array, int tab_index, long /*int*/ alignment, int location);
@@ -26871,10 +24185,10 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
_pango_tab_array_set_tab(tab_array, tab_index, alignment, location);
-@@ -10777,8 +10777,8 @@
- lock.unlock();
- }
- }
+@@ -14380,8 +14380,8 @@
+ * @param relationship cast=(AtkRelationType)
+ * @param target cast=(AtkObject *)
+ */
-public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target);
-public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) {
+public static final native boolean _atk_object_add_relationship (long /*int*/ object, int relationship, long /*int*/ target);
@@ -26882,121 +24196,135 @@ diff -ur x86/org/eclipse/swt/internal/gtk/OS.java x86_64/org/eclipse/swt/interna
lock.lock();
try {
return _atk_object_add_relationship(object, relationship, target);
-diff -ur x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java
---- x86/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/PangoAttribute.java x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java
+--- x86/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/PangoAttribute.java 2009-09-17 08:48:24.000000000 -0400
+@@ -17,7 +17,7 @@
public class PangoAttribute {
+ /** @field cast=(const PangoAttrClass *) */
- public int /*long*/ klass;
+ public long /*int*/ klass;
public int start_index;
public int end_index;
public static final int sizeof = OS.PangoAttribute_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt/internal/gtk/PangoItem.java
---- x86/org/eclipse/swt/internal/gtk/PangoItem.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoItem.java 2009-02-11 17:43:48.000000000 -0500
-@@ -18,11 +18,11 @@
- public int offset;
+diff -urN x86/org/eclipse/swt/internal/gtk/PangoItem.java x86_64/org/eclipse/swt/internal/gtk/PangoItem.java
+--- x86/org/eclipse/swt/internal/gtk/PangoItem.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/PangoItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -19,16 +19,16 @@
public int length;
public int num_chars;
+ /** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */
- public int /*long*/ analysis_shape_engine;
-- public int /*long*/ analysis_lang_engine;
-- public int /*long*/ analysis_font;
+ public long /*int*/ analysis_shape_engine;
+ /** @field accessor=analysis.lang_engine,cast=(PangoEngineLang *) */
+- public int /*long*/ analysis_lang_engine;
+ public long /*int*/ analysis_lang_engine;
+ /** @field accessor=analysis.font,cast=(PangoFont *) */
+- public int /*long*/ analysis_font;
+ public long /*int*/ analysis_font;
+ /** @field accessor=analysis.level */
public byte analysis_level;
+ /** @field accessor=analysis.language,cast=(PangoLanguage *) */
- public int /*long*/ analysis_language;
-- public int /*long*/ analysis_extra_attrs;
+ public long /*int*/ analysis_language;
+ /** @field accessor=analysis.extra_attrs,cast=(GSList *) */
+- public int /*long*/ analysis_extra_attrs;
+ public long /*int*/ analysis_extra_attrs;
public static final int sizeof = OS.PangoItem_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
---- x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2009-02-11 17:43:48.000000000 -0500
-@@ -15,10 +15,10 @@
- package org.eclipse.swt.internal.gtk;
+diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+--- x86/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2008-09-10 18:29:30.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutLine.java 2009-09-17 08:48:24.000000000 -0400
+@@ -16,11 +16,11 @@
public class PangoLayoutLine {
+ /** @field cast=(PangoLayout *) */
- public int /*long*/ layout;
+ public long /*int*/ layout;
public int start_index;
public int length;
+ /** @field cast=(GSList *) */
- public int /*long*/ runs;
+ public long /*int*/ runs;
// public boolean is_paragraph_start;
// public byte resolved_dir;
public static final int sizeof = OS.PangoLayoutLine_sizeof();
-diff -ur x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
---- x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-02-11 17:43:48.000000000 -0500
-@@ -15,7 +15,7 @@
- package org.eclipse.swt.internal.gtk;
+diff -urN x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+--- x86/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/PangoLayoutRun.java 2009-09-17 08:48:24.000000000 -0400
+@@ -16,8 +16,8 @@
public class PangoLayoutRun {
+ /** @field cast=(PangoItem *) */
- public int /*long*/ item;
-- public int /*long*/ glyphs;
+ public long /*int*/ item;
+ /** @field cast=(PangoGlyphString *) */
+- public int /*long*/ glyphs;
+ public long /*int*/ glyphs;
public static final int sizeof = OS.PangoLayoutRun_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java
---- x86/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-02-11 17:43:48.000000000 -0500
-@@ -12,9 +12,9 @@
+diff -urN x86/org/eclipse/swt/internal/gtk/XAnyEvent.java x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java
+--- x86/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/XAnyEvent.java 2009-09-17 08:48:24.000000000 -0400
+@@ -12,11 +12,11 @@
public abstract class XAnyEvent extends XEvent {
- public int /*long*/ serial;
+ public long /*int*/ serial;
public int send_event;
+ /** @field cast=(Display *) */
- public int /*long*/ display;
-- public int /*long*/ window;
+ public long /*int*/ display;
+ /** @field cast=(Window) */
+- public int /*long*/ window;
+ public long /*int*/ window;
public static final int sizeof = OS.XAnyEvent_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
---- x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-02-11 17:43:48.000000000 -0500
-@@ -13,12 +13,12 @@
+diff -urN x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+--- x86/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-05-29 17:30:10.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/XClientMessageEvent.java 2009-09-17 08:48:24.000000000 -0400
+@@ -13,16 +13,16 @@
public class XClientMessageEvent {
public int type;
- public int /*long*/ serial;
+ public long /*int*/ serial;
public boolean send_event;
+ /** @field cast=(Display *) */
- public int /*long*/ display;
-- public int /*long*/ window;
-- public int /*long*/ message_type;
+ public long /*int*/ display;
+ /** @field cast=(Window) */
+- public int /*long*/ window;
+ public long /*int*/ window;
+ /** @field cast=(Atom) */
+- public int /*long*/ message_type;
+ public long /*int*/ message_type;
public int format;
+ /** @field accessor=data.l,cast=(long *) */
- public int /*long*/[] data = new int /*long*/[5];
+ public long /*int*/[] data = new long /*int*/[5];
public static final int sizeof = OS.XClientMessageEvent_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java
---- x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-02-11 17:43:48.000000000 -0500
-@@ -12,8 +12,8 @@
-
+diff -urN x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+--- x86/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/XCrossingEvent.java 2009-09-17 08:48:24.000000000 -0400
+@@ -13,9 +13,9 @@
public class XCrossingEvent extends XAnyEvent {
+ /** @field cast=(Window) */
- public int /*long*/ root;
-- public int /*long*/ subwindow;
+ public long /*int*/ root;
+ /** @field cast=(Window) */
+- public int /*long*/ subwindow;
+ public long /*int*/ subwindow;
+ /** @field cast=(Time) */
public int time;
public int x;
- public int y;
-diff -ur x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
---- x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
+--- x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2006-05-09 15:46:50.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java 2009-09-17 08:48:24.000000000 -0400
@@ -13,17 +13,17 @@
public class XRenderPictureAttributes {
@@ -27018,9 +24346,9 @@ diff -ur x86/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java x86_64/o
public boolean component_alpha;
public static final int sizeof = OS.XRenderPictureAttributes_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java
---- x86/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java
+--- x86/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-05-29 17:30:08.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/gtk/XWindowChanges.java 2009-09-17 08:48:24.000000000 -0400
@@ -17,7 +17,7 @@
public int width;
public int height;
@@ -27030,30 +24358,24 @@ diff -ur x86/org/eclipse/swt/internal/gtk/XWindowChanges.java x86_64/org/eclipse
public int stack_mode;
public static final int sizeof = OS.XWindowChanges_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/Library.java x86_64/org/eclipse/swt/internal/Library.java
---- x86/org/eclipse/swt/internal/Library.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/Library.java 2009-02-11 17:43:48.000000000 -0500
-@@ -168,12 +168,12 @@
- if (prop == null) prop = System.getProperty ("com.ibm.vm.bitmode"); //$NON-NLS-1$
- if (prop != null) {
- if ("32".equals (prop)) { //$NON-NLS-1$
-- if (0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL) {
-+ if (0x1FFFFFFFFL == (long /*int*/)0x1FFFFFFFFL) {
- throw new UnsatisfiedLinkError ("Cannot load 64-bit SWT libraries on 32-bit JVM"); //$NON-NLS-1$
- }
- }
- if ("64".equals (prop)) { //$NON-NLS-1$
-- if (0x1FFFFFFFFL != (int /*long*/)0x1FFFFFFFFL) {
-+ if (0x1FFFFFFFFL != (long /*int*/)0x1FFFFFFFFL) {
- throw new UnsatisfiedLinkError ("Cannot load 32-bit SWT libraries on 64-bit JVM"); //$NON-NLS-1$
- }
- }
-diff -ur x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal/LONG.java
---- x86/org/eclipse/swt/internal/LONG.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/LONG.java 2009-02-11 17:43:48.000000000 -0500
-@@ -11,9 +11,9 @@
- package org.eclipse.swt.internal;
+diff -urN x86/org/eclipse/swt/internal/Library.java x86_64/org/eclipse/swt/internal/Library.java
+--- x86/org/eclipse/swt/internal/Library.java 2009-09-09 15:57:44.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/Library.java 2009-09-17 08:48:24.000000000 -0400
+@@ -39,7 +39,7 @@
+ static final String SEPARATOR;
+
+ /* 64-bit support */
+- static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL;
++ static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (long /*int*/)0x1FFFFFFFFL;
+ static final String SUFFIX_64 = "-64"; //$NON-NLS-1$
+ static final String SWTDIR_32 = "swtlib-32"; //$NON-NLS-1$
+ static final String SWTDIR_64 = "swtlib-64"; //$NON-NLS-1$
+diff -urN x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal/LONG.java
+--- x86/org/eclipse/swt/internal/LONG.java 2009-05-29 17:30:14.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/LONG.java 2009-09-17 08:48:24.000000000 -0400
+@@ -12,9 +12,9 @@
+ /** @jniclass flags=no_gen */
public class LONG {
- public int /*long*/ value;
+ public long /*int*/ value;
@@ -27063,24 +24385,52 @@ diff -ur x86/org/eclipse/swt/internal/LONG.java x86_64/org/eclipse/swt/internal/
this.value = value;
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/GREVersionRange.java x86_64/org/eclipse/swt/internal/mozilla/GREVersionRange.java
---- x86/org/eclipse/swt/internal/mozilla/GREVersionRange.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/GREVersionRange.java 2009-02-11 17:43:48.000000000 -0500
-@@ -11,9 +11,9 @@
- package org.eclipse.swt.internal.mozilla;
-
+diff -urN x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
+--- x86/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2009-05-29 17:30:32.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java 2009-09-17 08:48:20.000000000 -0400
+@@ -13,10 +13,10 @@
+ /** @jniclass flags=cpp */
public class GREVersionRange {
-- public int /*long*/ lower;
-+ public long /*int*/ lower;
+ /** @field cast=(const char *) */
+- public int /*long*/ lower;
++ public long /*int*/ lower;
public boolean lowerInclusive;
-- public int /*long*/ upper;
-+ public long /*int*/ upper;
+ /** @field cast=(const char *) */
+- public int /*long*/ upper;
++ public long /*int*/ upper;
public boolean upperInclusive;
public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java
---- x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
+--- x86/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2008-09-10 18:29:32.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java 2009-09-17 08:48:20.000000000 -0400
+@@ -40,8 +40,8 @@
+ * @param properties cast=(const GREProperty *)
+ * @param buffer cast=(char *)
+ */
+-public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
+-public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen) {
++public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen);
++public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen) {
+ lock.lock();
+ try {
+ return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+--- x86/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2009-04-01 14:55:54.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java 2009-09-17 08:48:20.000000000 -0400
+@@ -12,7 +12,7 @@
+
+ public class nsDynamicFunctionLoad {
+ /** @field cast=(const char *) */
+- public int /*long*/ functionName;
++ public long /*int*/ functionName;
+ /** @field cast=(NSFuncPtr *) */
+- public int /*long*/ function;
++ public long /*int*/ function;
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+--- x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsEmbedString.java 2009-09-17 08:48:20.000000000 -0400
@@ -28,7 +28,7 @@
package org.eclipse.swt.internal.mozilla;
@@ -27107,45 +24457,45 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsEmbedString.java x86_64/org/ecli
char[] dest = new char[length];
XPCOM.memmove(dest, buffer, length * 2);
return new String(dest);
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java
---- x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2008-10-22 16:19:54.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIAppShell.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IAPPSHELL_IID =
- new nsID(NS_IAPPSHELL_IID_STR);
-
-- public nsIAppShell(int /*long*/ address) {
-+ public nsIAppShell(long /*int*/ address) {
- super(address);
- }
-
-- public int Create(int /*long*/ argc, int /*long*/[] argv) {
-+ public int Create(long /*int*/ argc, long /*int*/[] argv) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
- }
-
+ public static final nsID NS_IAPPSHELL_IID =
+ new nsID(NS_IAPPSHELL_IID_STR);
+
+- public nsIAppShell(int /*long*/ address) {
++ public nsIAppShell(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Create(int /*long*/ argc, int /*long*/[] argv) {
++ public int Create(long /*int*/ argc, long /*int*/[] argv) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
+ }
+
@@ -57,15 +57,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
- }
-
-- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
-+ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
- }
-
-- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
-+ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
- }
-
-- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
-+ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
---- x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+ }
+
+- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
++ public int ListenToEventQueue(long /*int*/ aQueue, int aListen) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
+ }
+
+- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
++ public int GetNativeEvent(long /*int*/ aRealEvent, long /*int*/[] aEvent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
+ }
+
+- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
++ public int DispatchNativeEvent(int aRealEvent, long /*int*/ aEvent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2008-03-04 12:13:06.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IAUTHINFORMATION_IID =
new nsID(NS_IAUTHINFORMATION_IID_STR);
@@ -27199,68 +24549,86 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java x86_64/org
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2009-08-19 16:24:48.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IBASEWINDOW_IID =
- new nsID(NS_IBASEWINDOW_IID_STR);
-
-- public nsIBaseWindow(int /*long*/ address) {
-+ public nsIBaseWindow(long /*int*/ address) {
- super(address);
- }
-
-- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
-+ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
- }
-
+ public static final nsID NS_IBADCERTLISTENER2_IID =
+ new nsID(NS_IBADCERTLISTENER2_IID_STR);
+
+- public nsIBadCertListener2(int /*long*/ address) {
++ public nsIBadCertListener2(long /*int*/ address) {
+ super(address);
+ }
+
+- public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
++ public int NotifyCertProblem(long /*int*/ socketInfo, long /*int*/ status, long /*int*/ targetSite, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2008-10-22 16:19:54.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,11 +37,11 @@
+ public static final nsID NS_IBASEWINDOW_IID =
+ new nsID(NS_IBASEWINDOW_IID_STR);
+
+- public nsIBaseWindow(int /*long*/ address) {
++ public nsIBaseWindow(long /*int*/ address) {
+ super(address);
+ }
+
+- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
++ public int InitWindow(long /*int*/ parentNativeWindow, long /*int*/ parentWidget, int x, int y, int cx, int cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
+ }
+
@@ -81,19 +81,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
- }
-
-- public int GetParentWidget(int /*long*/[] aParentWidget) {
-+ public int GetParentWidget(long /*int*/[] aParentWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
- }
-
-- public int SetParentWidget(int /*long*/ aParentWidget) {
-+ public int SetParentWidget(long /*int*/ aParentWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
- }
-
-- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
-+ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
- }
-
-- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
-+ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
+ }
+
+- public int GetParentWidget(int /*long*/[] aParentWidget) {
++ public int GetParentWidget(long /*int*/[] aParentWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
+ }
+
+- public int SetParentWidget(int /*long*/ aParentWidget) {
++ public int SetParentWidget(long /*int*/ aParentWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
+ }
+
+- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
++ public int GetParentNativeWindow(long /*int*/[] aParentNativeWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
+ }
+
+- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
++ public int SetParentNativeWindow(long /*int*/ aParentNativeWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
+ }
+
@@ -121,7 +121,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
- }
-
-- public int GetMainWidget(int /*long*/[] aMainWidget) {
-+ public int GetMainWidget(long /*int*/[] aMainWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
+ }
+
+- public int GetMainWidget(int /*long*/[] aMainWidget) {
++ public int GetMainWidget(long /*int*/[] aMainWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
+ }
+
@@ -129,7 +129,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
- }
-
-- public int GetTitle(int /*long*/[] aTitle) {
-+ public int GetTitle(long /*int*/[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java
---- x86/org/eclipse/swt/internal/mozilla/nsICancelable.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
+ }
+
+- public int GetTitle(int /*long*/[] aTitle) {
++ public int GetTitle(long /*int*/[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICancelable.java 2006-10-26 11:24:38.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICancelable.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_ICANCELABLE_IID =
new nsID(NS_ICANCELABLE_IID_STR);
@@ -27270,46 +24638,135 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsICancelable.java x86_64/org/ecli
super(address);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2008-10-22 16:19:54.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICategoryManager.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,15 +37,15 @@
- public static final nsID NS_ICATEGORYMANAGER_IID =
- new nsID(NS_ICATEGORYMANAGER_IID_STR);
-
-- public nsICategoryManager(int /*long*/ address) {
-+ public nsICategoryManager(long /*int*/ address) {
- super(address);
- }
-
-- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
-+ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
- }
-
-- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
-+ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
- }
-
+ public static final nsID NS_ICATEGORYMANAGER_IID =
+ new nsID(NS_ICATEGORYMANAGER_IID_STR);
+
+- public nsICategoryManager(int /*long*/ address) {
++ public nsICategoryManager(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
++ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
+ }
+
+- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
++ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
+ }
+
@@ -57,11 +57,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
- }
-
-- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
-+ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
- }
-
-- public int EnumerateCategories(int /*long*/[] _retval) {
-+ public int EnumerateCategories(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
+ }
+
+- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
++ public int EnumerateCategory(byte[] aCategory, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
+ }
+
+- public int EnumerateCategories(int /*long*/[] _retval) {
++ public int EnumerateCategories(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2009-08-19 16:24:48.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,31 +37,31 @@
+ public static final nsID NS_ICERTIFICATEDIALOGS_IID =
+ new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
+
+- public nsICertificateDialogs(int /*long*/ address) {
++ public nsICertificateDialogs(long /*int*/ address) {
+ super(address);
+ }
+
+- public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
++ public int ConfirmDownloadCACert(long /*int*/ ctx, long /*int*/ cert, int[] trust, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
+ }
+
+- public int NotifyCACertExists(int /*long*/ ctx) {
++ public int NotifyCACertExists(long /*int*/ ctx) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
+ }
+
+- public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
++ public int SetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
+ }
+
+- public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
++ public int GetPKCS12FilePassword(long /*int*/ ctx, long /*int*/ password, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
+ }
+
+- public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
++ public int ViewCert(long /*int*/ ctx, long /*int*/ cert) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
+ }
+
+- public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
++ public int CrlImportStatusDialog(long /*int*/ ctx, long /*int*/ crl) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2009-08-19 16:24:46.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_ICERTOVERRIDESERVICE_IID =
+ new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
+
+- public nsICertOverrideService(int /*long*/ address) {
++ public nsICertOverrideService(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -47,27 +47,27 @@
+
+ public static final int ERROR_TIME = 4;
+
+- public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
++ public int RememberValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int aOverrideBits, int aTemporary) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
+ }
+
+- public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
++ public int HasMatchingOverride(long /*int*/ aHostName, int aPort, long /*int*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
+ }
+
+- public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
++ public int GetValidityOverride(long /*int*/ aHostName, int aPort, long /*int*/ aHashAlg, long /*int*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
+ }
+
+- public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
++ public int ClearValidityOverride(long /*int*/ aHostName, int aPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
+ }
+
+- public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
++ public int GetAllOverrideHostsWithPorts(int[] aCount, long /*int*/[] aHostsWithPortsArray) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
+ }
+
+- public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
++ public int IsCertUsedForOverrides(long /*int*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
+ }
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java
---- x86/org/eclipse/swt/internal/mozilla/nsIChannel.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIChannel.java 2008-03-04 12:13:06.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIChannel.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,55 +37,55 @@
public static final nsID NS_ICHANNEL_IID =
new nsID(NS_ICHANNEL_IID_STR);
@@ -27393,9 +24850,55 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIChannel.java x86_64/org/eclipse
return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2008-12-02 11:18:44.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIClassInfo.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,27 +37,27 @@
+ public static final nsID NS_ICLASSINFO_IID =
+ new nsID(NS_ICLASSINFO_IID_STR);
+
+- public nsIClassInfo(int /*long*/ address) {
++ public nsIClassInfo(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetInterfaces(int[] count, int /*long*/[] array) {
++ public int GetInterfaces(int[] count, long /*int*/[] array) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
+ }
+
+- public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
++ public int GetHelperForLanguage(int language, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
+ }
+
+- public int GetContractID(int /*long*/[] aContractID) {
++ public int GetContractID(long /*int*/[] aContractID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
+ }
+
+- public int GetClassDescription(int /*long*/[] aClassDescription) {
++ public int GetClassDescription(long /*int*/[] aClassDescription) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
+ }
+
+- public int GetClassID(int /*long*/ aClassID) {
++ public int GetClassID(long /*int*/ aClassID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
+ }
+
+@@ -85,7 +85,7 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
+ }
+
+- public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
++ public int GetClassIDNoAlloc(long /*int*/ aClassIDNoAlloc) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentManager.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,23 +37,23 @@
public static final nsID NS_ICOMPONENTMANAGER_IID =
new nsID(NS_ICOMPONENTMANAGER_IID_STR);
@@ -27426,76 +24929,75 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIComponentManager.java x86_64/or
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
---- x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2008-10-22 16:19:54.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,31 +37,31 @@
- public static final nsID NS_ICOMPONENTREGISTRAR_IID =
- new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
-
-- public nsIComponentRegistrar(int /*long*/ address) {
-+ public nsIComponentRegistrar(long /*int*/ address) {
- super(address);
- }
-
-- public int AutoRegister(int /*long*/ aSpec) {
-+ public int AutoRegister(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
-- public int AutoUnregister(int /*long*/ aSpec) {
-+ public int AutoUnregister(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
-- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
-+ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
- }
-
-- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
-+ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
- }
-
-- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
-+ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
- }
-
-- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
-+ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
- }
-
+ public static final nsID NS_ICOMPONENTREGISTRAR_IID =
+ new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
+
+- public nsIComponentRegistrar(int /*long*/ address) {
++ public nsIComponentRegistrar(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AutoRegister(int /*long*/ aSpec) {
++ public int AutoRegister(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+ }
+
+- public int AutoUnregister(int /*long*/ aSpec) {
++ public int AutoUnregister(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+ }
+
+- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
++ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFactory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
+ }
+
+- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
++ public int UnregisterFactory(nsID aClass, long /*int*/ aFactory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
+ }
+
+- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
++ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, long /*int*/ aFile, byte[] aLoaderStr, byte[] aType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
+ }
+
+- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
++ public int UnregisterFactoryLocation(nsID aClass, long /*int*/ aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
+ }
+
@@ -73,19 +73,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
- }
-
-- public int EnumerateCIDs(int /*long*/[] _retval) {
-+ public int EnumerateCIDs(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
- }
-
-- public int EnumerateContractIDs(int /*long*/[] _retval) {
-+ public int EnumerateContractIDs(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
- }
-
-- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
-+ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
- }
-
-- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
-+ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
+ }
+
+- public int EnumerateCIDs(int /*long*/[] _retval) {
++ public int EnumerateCIDs(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+- public int EnumerateContractIDs(int /*long*/[] _retval) {
++ public int EnumerateContractIDs(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
++ public int CIDToContractID(nsID aClass, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
+ }
+
+- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
++ public int ContractIDToCID(byte[] aContractID, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_ICONTEXTMENULISTENER_IID =
new nsID(NS_ICONTEXTMENULISTENER_IID_STR);
@@ -27515,118 +25017,191 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java x86_64
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookie.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookie.java x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICookie.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICookie.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,15 +37,15 @@
- public static final nsID NS_ICOOKIE_IID =
- new nsID(NS_ICOOKIE_IID_STR);
+ public static final nsID NS_ICOOKIE_IID =
+ new nsID(NS_ICOOKIE_IID_STR);
+
+- public nsICookie(int /*long*/ address) {
++ public nsICookie(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetName(int /*long*/ aName) {
++ public int GetName(long /*int*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+ }
+
+- public int GetValue(int /*long*/ aValue) {
++ public int GetValue(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
+ }
+
+@@ -53,11 +53,11 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
+ }
+
+- public int GetHost(int /*long*/ aHost) {
++ public int GetHost(long /*int*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
+ }
+
+- public int GetPath(int /*long*/ aPath) {
++ public int GetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
+ }
+
+@@ -79,7 +79,7 @@
+
+ public static final int STATUS_REJECTED = 4;
+
+- public int GetStatus(int /*long*/ aStatus) {
++ public int GetStatus(long /*int*/ aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
+ }
+
+@@ -95,7 +95,7 @@
+
+ public static final int POLICY_NO_II = 5;
+
+- public int GetPolicy(int /*long*/ aPolicy) {
++ public int GetPolicy(long /*int*/ aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_ICOOKIEMANAGER_IID =
+ new nsID(NS_ICOOKIEMANAGER_IID_STR);
+
+- public nsICookieManager(int /*long*/ address) {
++ public nsICookieManager(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+- public int GetEnumerator(int /*long*/[] aEnumerator) {
++ public int GetEnumerator(long /*int*/[] aEnumerator) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
+ }
+
+- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
++ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2009-02-27 16:59:42.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,23 +37,23 @@
+ public static final nsID NS_ICOOKIESERVICE_IID =
+ new nsID(NS_ICOOKIESERVICE_IID_STR);
-- public nsICookie(int /*long*/ address) {
-+ public nsICookie(long /*int*/ address) {
+- public nsICookieService_1_9(int /*long*/ address) {
++ public nsICookieService_1_9(long /*int*/ address) {
super(address);
}
-- public int GetName(int /*long*/ aName) {
-+ public int GetName(long /*int*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
- }
-
-- public int GetValue(int /*long*/ aValue) {
-+ public int GetValue(long /*int*/ aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
+- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
}
-@@ -53,11 +53,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
+- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
}
-- public int GetHost(int /*long*/ aHost) {
-+ public int GetHost(long /*int*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
+- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
++ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
}
-- public int GetPath(int /*long*/ aPath) {
-+ public int GetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
+- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
++ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsICookieService.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsICookieService.java 2009-02-27 16:59:42.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieService.java 2009-09-17 08:48:20.000000000 -0400
+@@ -38,23 +38,23 @@
+ public static final nsID NS_ICOOKIESERVICE_IID =
+ new nsID(NS_ICOOKIESERVICE_IID_STR);
-@@ -79,7 +79,7 @@
-
- public static final int STATUS_REJECTED = 4;
-
-- public int GetStatus(int /*long*/ aStatus) {
-+ public int GetStatus(long /*int*/ aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
- }
-
-@@ -95,7 +95,7 @@
-
- public static final int POLICY_NO_II = 5;
-
-- public int GetPolicy(int /*long*/ aPolicy) {
-+ public int GetPolicy(long /*int*/ aPolicy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
- }
- }
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsICookieManager.java 2009-02-11 17:43:48.000000000 -0500
-@@ -37,7 +37,7 @@
- public static final nsID NS_ICOOKIEMANAGER_IID =
- new nsID(NS_ICOOKIEMANAGER_IID_STR);
-
-- public nsICookieManager(int /*long*/ address) {
-+ public nsICookieManager(long /*int*/ address) {
+- public nsICookieService(int /*long*/ address) {
++ public nsICookieService(long /*int*/ address) {
super(address);
}
-@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+- public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieString(long /*int*/ aURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
}
-- public int GetEnumerator(int /*long*/[] aEnumerator) {
-+ public int GetEnumerator(long /*int*/[] aEnumerator) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
+- public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
}
-- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
-+ public int Remove(long /*int*/ aDomain, long /*int*/ aName, long /*int*/ aPath, int aBlocked) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
+- public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
++ public int SetCookieString(long /*int*/ aURI, long /*int*/ aPrompt, byte[] aCookie, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
}
- }
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2009-02-11 17:43:48.000000000 -0500
-@@ -37,7 +37,7 @@
- public static final nsID NS_IDIRECTORYSERVICE_IID =
- new nsID(NS_IDIRECTORYSERVICE_IID_STR);
-- public nsIDirectoryService(int /*long*/ address) {
-+ public nsIDirectoryService(long /*int*/ address) {
- super(address);
+- public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
++ public int SetCookieStringFromHttp(long /*int*/ aURI, long /*int*/ aFirstURI, long /*int*/ aPrompt, byte[] aCookie, byte[] aServerTime, long /*int*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDataType.java x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDataType.java 2008-12-02 11:18:44.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDataType.java 2009-09-17 08:48:20.000000000 -0400
+@@ -11,7 +11,7 @@
+ public static final nsID NS_IDATATYPE_IID =
+ new nsID(NS_IDATATYPE_IID_STR);
+
+- public nsIDataType(int /*long*/ address) {
++ public nsIDataType(long /*int*/ address) {
+ super(address);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java 2009-09-17 08:48:20.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_IDIRECTORYSERVICE_IID =
+ new nsID(NS_IDIRECTORYSERVICE_IID_STR);
+
+- public nsIDirectoryService(int /*long*/ address) {
++ public nsIDirectoryService(long /*int*/ address) {
+ super(address);
+ }
+
@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
-- public int RegisterProvider(int /*long*/ prov) {
-+ public int RegisterProvider(long /*int*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
- }
-
-- public int UnregisterProvider(int /*long*/ prov) {
-+ public int UnregisterProvider(long /*int*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+- public int RegisterProvider(int /*long*/ prov) {
++ public int RegisterProvider(long /*int*/ prov) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
+ }
+
+- public int UnregisterProvider(int /*long*/ prov) {
++ public int UnregisterProvider(long /*int*/ prov) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2007-03-02 11:13:26.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IDIRECTORYSERVICEPROVIDER2_IID =
new nsID(NS_IDIRECTORYSERVICEPROVIDER2_IID_STRING);
@@ -27642,576 +25217,417 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
- new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
-
-- public nsIDirectoryServiceProvider(int /*long*/ address) {
-+ public nsIDirectoryServiceProvider(long /*int*/ address) {
- super(address);
- }
-
-- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
-+ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
- }
+ public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
+ new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
+
+- public nsIDirectoryServiceProvider(int /*long*/ address) {
++ public nsIDirectoryServiceProvider(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
++ public int GetFile(byte[] prop, int[] persistent, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsID.java x86_64/org/eclipse/swt/internal/mozilla/nsID.java
---- x86/org/eclipse/swt/internal/mozilla/nsID.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsID.java 2009-02-11 17:43:48.000000000 -0500
-@@ -43,9 +43,9 @@
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsID.java x86_64/org/eclipse/swt/internal/mozilla/nsID.java
+--- x86/org/eclipse/swt/internal/mozilla/nsID.java 2008-09-10 18:29:30.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsID.java 2009-09-17 08:48:20.000000000 -0400
+@@ -44,9 +44,9 @@
}
public boolean Equals(nsID other) {
-- int /*long*/ ptr = XPCOM.nsID_new();
-+ long /*int*/ ptr = XPCOM.nsID_new();
- XPCOM.memmove(ptr, this, nsID.sizeof);
-- int /*long*/ otherPtr = XPCOM.nsID_new();
-+ long /*int*/ otherPtr = XPCOM.nsID_new();
- XPCOM.memmove(otherPtr, other, nsID.sizeof);
- boolean result = XPCOM.nsID_Equals(ptr, otherPtr) != 0;
- XPCOM.nsID_delete(ptr);
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2009-02-11 17:43:48.000000000 -0500
+- int /*long*/ ptr = XPCOM.nsID_new ();
++ long /*int*/ ptr = XPCOM.nsID_new ();
+ XPCOM.memmove (ptr, this, nsID.sizeof);
+- int /*long*/ otherPtr = XPCOM.nsID_new ();
++ long /*int*/ otherPtr = XPCOM.nsID_new ();
+ XPCOM.memmove (otherPtr, other, nsID.sizeof);
+ boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
+ XPCOM.nsID_delete (ptr);
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,15 +37,15 @@
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
-- public nsIDocShell_1_8(int /*long*/ address) {
-+ public nsIDocShell_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
-+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
-- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
-+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
+ public static final nsID NS_IDOCSHELL_IID =
+ new nsID(NS_IDOCSHELL_IID_STR);
+
+- public nsIDocShell_1_8(int /*long*/ address) {
++ public nsIDocShell_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
++ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+ }
+
+- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
++ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+ }
+
@@ -55,11 +55,11 @@
-
- public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
-
-- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
-+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
-- public int CreateLoadInfo(int /*long*/[] loadInfo) {
-+ public int CreateLoadInfo(long /*int*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
+
+ public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
+
+- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
++ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+ }
+
+- public int CreateLoadInfo(int /*long*/[] loadInfo) {
++ public int CreateLoadInfo(long /*int*/[] loadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+ }
+
@@ -67,7 +67,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
-- public int SetCurrentURI(int /*long*/ aURI) {
-+ public int SetCurrentURI(long /*int*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+- public int SetCurrentURI(int /*long*/ aURI) {
++ public int SetCurrentURI(long /*int*/ aURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+ }
+
@@ -75,35 +75,35 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
- }
-
-- public int GetPresContext(int /*long*/[] aPresContext) {
-+ public int GetPresContext(long /*int*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
-- public int GetPresShell(int /*long*/[] aPresShell) {
-+ public int GetPresShell(long /*int*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
-- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
-+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
-- public int GetContentViewer(int /*long*/[] aContentViewer) {
-+ public int GetContentViewer(long /*int*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
-- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
-+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
-- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
-+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
-- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
-+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
- }
-
-- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
-+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
+ }
+
+- public int GetPresContext(int /*long*/[] aPresContext) {
++ public int GetPresContext(long /*int*/[] aPresContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+ }
+
+- public int GetPresShell(int /*long*/[] aPresShell) {
++ public int GetPresShell(long /*int*/[] aPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+ }
+
+- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
++ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+ }
+
+- public int GetContentViewer(int /*long*/[] aContentViewer) {
++ public int GetContentViewer(long /*int*/[] aContentViewer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+ }
+
+- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
++ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+ }
+
+- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
++ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+ }
+
+- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
++ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
+ }
+
+- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
++ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
+ }
+
@@ -151,7 +151,7 @@
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
-- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
-+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
- }
-
+
+ public static final int ENUMERATE_BACKWARDS = 1;
+
+- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
++ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
+ }
+
@@ -255,11 +255,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
- }
-
-- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
-+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
- }
-
-- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
-+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
+ }
+
+- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
++ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
+ }
+
+- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
++ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
+ }
+
@@ -267,11 +267,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
- }
-
-- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
-+ public int GetSecurityUI(long /*int*/[] aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
- }
-
-- public int SetSecurityUI(int /*long*/ aSecurityUI) {
-+ public int SetSecurityUI(long /*int*/ aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
+ }
+
+- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
++ public int GetSecurityUI(long /*int*/[] aSecurityUI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
+ }
+
+- public int SetSecurityUI(int /*long*/ aSecurityUI) {
++ public int SetSecurityUI(long /*int*/ aSecurityUI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
+ }
+
@@ -283,7 +283,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
- }
-
-- public int BeginRestore(int /*long*/ viewer, int top) {
-+ public int BeginRestore(long /*int*/ viewer, int top) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java 2009-02-11 17:43:48.000000000 -0500
-@@ -37,15 +37,15 @@
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
-- public nsIDocShell_1_9(int /*long*/ address) {
-+ public nsIDocShell_1_9(long /*int*/ address) {
- super(address);
- }
-
-- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
-+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
-- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
-+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
-@@ -61,11 +61,11 @@
-
- public static final int INTERNAL_LOAD_FLAGS_BYPASS_CLASSIFIER = 16;
-
-- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
-+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
-- public int CreateLoadInfo(int /*long*/[] loadInfo) {
-+ public int CreateLoadInfo(long /*int*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
-@@ -73,7 +73,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
-- public int SetCurrentURI(int /*long*/ aURI) {
-+ public int SetCurrentURI(long /*int*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
-@@ -81,35 +81,35 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
- }
-
-- public int GetPresContext(int /*long*/[] aPresContext) {
-+ public int GetPresContext(long /*int*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
-- public int GetPresShell(int /*long*/[] aPresShell) {
-+ public int GetPresShell(long /*int*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
-- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
-+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
-- public int GetContentViewer(int /*long*/[] aContentViewer) {
-+ public int GetContentViewer(long /*int*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
-- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
-+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
-- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
-+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
-- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
-+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
- }
-
-- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
-+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
- }
-
-@@ -157,7 +157,7 @@
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
-- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
-+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
- }
-
-@@ -261,11 +261,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
- }
-
-- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
-+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
- }
-
-- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
-+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
- }
-
-@@ -273,11 +273,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
- }
-
-- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
-+ public int GetSecurityUI(long /*int*/[] aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
- }
-
-- public int SetSecurityUI(int /*long*/ aSecurityUI) {
-+ public int SetSecurityUI(long /*int*/ aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
- }
-
-@@ -289,7 +289,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
- }
-
-- public int BeginRestore(int /*long*/ viewer, int top) {
-+ public int BeginRestore(long /*int*/ viewer, int top) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
- }
-
-@@ -321,15 +321,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);
- }
-
-- public int GetSessionStorageForURI(int /*long*/ uri, int /*long*/[] _retval) {
-+ public int GetSessionStorageForURI(long /*int*/ uri, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 62, getAddress(), uri, _retval);
- }
-
-- public int AddSessionStorage(int /*long*/ aDomain, int /*long*/ storage) {
-+ public int AddSessionStorage(long /*int*/ aDomain, long /*int*/ storage) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 63, getAddress(), aDomain, storage);
- }
-
-- public int GetCurrentDocumentChannel(int /*long*/[] aCurrentDocumentChannel) {
-+ public int GetCurrentDocumentChannel(long /*int*/[] aCurrentDocumentChannel) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 64, getAddress(), aCurrentDocumentChannel);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
+ }
+
+- public int BeginRestore(int /*long*/ viewer, int top) {
++ public int BeginRestore(long /*int*/ viewer, int top) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDocShell.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,23 +37,23 @@
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
-- public nsIDocShell(int /*long*/ address) {
-+ public nsIDocShell(long /*int*/ address) {
- super(address);
- }
-
-- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
-+ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
-- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
-+ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
-- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
-+ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
-- public int CreateLoadInfo(int /*long*/[] loadInfo) {
-+ public int CreateLoadInfo(long /*int*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
+ public static final nsID NS_IDOCSHELL_IID =
+ new nsID(NS_IDOCSHELL_IID_STR);
+
+- public nsIDocShell(int /*long*/ address) {
++ public nsIDocShell(long /*int*/ address) {
+ super(address);
+ }
+
+- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
++ public int LoadURI(long /*int*/ uri, long /*int*/ loadInfo, int aLoadFlags, int firstParty) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+ }
+
+- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
++ public int LoadStream(long /*int*/ aStream, long /*int*/ aURI, long /*int*/ aContentType, long /*int*/ aContentCharset, long /*int*/ aLoadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+ }
+
+- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
++ public int InternalLoad(long /*int*/ aURI, long /*int*/ aReferrer, long /*int*/ aOwner, int aInheritOwner, char[] aWindowTarget, long /*int*/ aPostDataStream, long /*int*/ aHeadersStream, int aLoadFlags, long /*int*/ aSHEntry, int firstParty, long /*int*/[] aDocShell, long /*int*/[] aRequest) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+ }
+
+- public int CreateLoadInfo(int /*long*/[] loadInfo) {
++ public int CreateLoadInfo(long /*int*/[] loadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+ }
+
@@ -61,7 +61,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
-- public int SetCurrentURI(int /*long*/ aURI) {
-+ public int SetCurrentURI(long /*int*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+- public int SetCurrentURI(int /*long*/ aURI) {
++ public int SetCurrentURI(long /*int*/ aURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+ }
+
@@ -69,43 +69,43 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
- }
-
-- public int GetPresContext(int /*long*/[] aPresContext) {
-+ public int GetPresContext(long /*int*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
-- public int GetPresShell(int /*long*/[] aPresShell) {
-+ public int GetPresShell(long /*int*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
-- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
-+ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
-- public int GetContentViewer(int /*long*/[] aContentViewer) {
-+ public int GetContentViewer(long /*int*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
-- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
-+ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
-- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
-+ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
-- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
-+ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
- }
-
-- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
-+ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
- }
-
-- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
-+ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
- }
-
-- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
-+ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
+ }
+
+- public int GetPresContext(int /*long*/[] aPresContext) {
++ public int GetPresContext(long /*int*/[] aPresContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+ }
+
+- public int GetPresShell(int /*long*/[] aPresShell) {
++ public int GetPresShell(long /*int*/[] aPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+ }
+
+- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
++ public int GetEldestPresShell(long /*int*/[] aEldestPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+ }
+
+- public int GetContentViewer(int /*long*/[] aContentViewer) {
++ public int GetContentViewer(long /*int*/[] aContentViewer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+ }
+
+- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
++ public int GetChromeEventHandler(long /*int*/[] aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+ }
+
+- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
++ public int SetChromeEventHandler(long /*int*/ aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+ }
+
+- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
++ public int GetParentURIContentListener(long /*int*/[] aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
+ }
+
+- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
++ public int SetParentURIContentListener(long /*int*/ aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
+ }
+
+- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
++ public int GetDocumentCharsetInfo(long /*int*/[] aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
+ }
+
+- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
++ public int SetDocumentCharsetInfo(long /*int*/ aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
+ }
+
@@ -153,7 +153,7 @@
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
-- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
-+ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
- }
-
+
+ public static final int ENUMERATE_BACKWARDS = 1;
+
+- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
++ public int GetDocShellEnumerator(int aItemType, int aDirection, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
+ }
+
@@ -255,11 +255,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
- }
-
-- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
-+ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
- }
-
-- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
-+ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
+ }
+
+- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
++ public int GetLayoutHistoryState(long /*int*/[] aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
+ }
+
+- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
++ public int SetLayoutHistoryState(long /*int*/ aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMEVENT_IID =
- new nsID(NS_IDOMEVENT_IID_STR);
-
-- public nsIDOMEvent(int /*long*/ address) {
-+ public nsIDOMEvent(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IDOMEVENT_IID =
+ new nsID(NS_IDOMEVENT_IID_STR);
+
+- public nsIDOMEvent(int /*long*/ address) {
++ public nsIDOMEvent(long /*int*/ address) {
+ super(address);
+ }
+
@@ -47,15 +47,15 @@
-
- public static final int BUBBLING_PHASE = 3;
-
-- public int GetType(int /*long*/ aType) {
-+ public int GetType(long /*int*/ aType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
- }
-
-- public int GetTarget(int /*long*/[] aTarget) {
-+ public int GetTarget(long /*int*/[] aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
- }
-
-- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
-+ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
- }
-
+
+ public static final int BUBBLING_PHASE = 3;
+
+- public int GetType(int /*long*/ aType) {
++ public int GetType(long /*int*/ aType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
+ }
+
+- public int GetTarget(int /*long*/[] aTarget) {
++ public int GetTarget(long /*int*/[] aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
+ }
+
+- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
++ public int GetCurrentTarget(long /*int*/[] aCurrentTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
+ }
+
@@ -71,7 +71,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
+ }
+
- public int GetTimeStamp(int /*long*/[] aTimeStamp) {
+ public int GetTimeStamp(long /*int*/[] aTimeStamp) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
+ }
+
@@ -83,7 +83,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
- }
-
-- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
-+ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
+ }
+
+- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
++ public int InitEvent(long /*int*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,19 +37,19 @@
- public static final nsID NS_IDOMEVENTTARGET_IID =
- new nsID(NS_IDOMEVENTTARGET_IID_STR);
-
-- public nsIDOMEventTarget(int /*long*/ address) {
-+ public nsIDOMEventTarget(long /*int*/ address) {
- super(address);
- }
-
-- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
-+ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
- }
-
-- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
-+ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
- }
-
-- public int DispatchEvent(int /*long*/ evt, int[] _retval) {
-+ public int DispatchEvent(long /*int*/ evt, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
- }
+ public static final nsID NS_IDOMEVENTTARGET_IID =
+ new nsID(NS_IDOMEVENTTARGET_IID_STR);
+
+- public nsIDOMEventTarget(int /*long*/ address) {
++ public nsIDOMEventTarget(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
++ public int AddEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
+ }
+
+- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
++ public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
+ }
+
+- public int DispatchEvent(int /*long*/ evt, int[] _retval) {
++ public int DispatchEvent(long /*int*/ evt, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMKEYEVENT_IID =
- new nsID(NS_IDOMKEYEVENT_IID_STR);
-
-- public nsIDOMKeyEvent(int /*long*/ address) {
-+ public nsIDOMKeyEvent(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IDOMKEYEVENT_IID =
+ new nsID(NS_IDOMKEYEVENT_IID_STR);
+
+- public nsIDOMKeyEvent(int /*long*/ address) {
++ public nsIDOMKeyEvent(long /*int*/ address) {
+ super(address);
+ }
+
@@ -293,7 +293,7 @@
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
- }
-
-- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
-+ public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
- }
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
+ }
+
+- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
++ public int InitKeyEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMMOUSEEVENT_IID =
- new nsID(NS_IDOMMOUSEEVENT_IID_STR);
-
-- public nsIDOMMouseEvent(int /*long*/ address) {
-+ public nsIDOMMouseEvent(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IDOMMOUSEEVENT_IID =
+ new nsID(NS_IDOMMOUSEEVENT_IID_STR);
+
+- public nsIDOMMouseEvent(int /*long*/ address) {
++ public nsIDOMMouseEvent(long /*int*/ address) {
+ super(address);
+ }
+
@@ -77,11 +77,11 @@
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
- }
-
-- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
-+ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
- }
-
-- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
-+ public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
- }
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
+ }
+
+- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
++ public int GetRelatedTarget(long /*int*/[] aRelatedTarget) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
+ }
+
+- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
++ public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2007-08-23 15:58:58.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,15 +37,15 @@
public static final nsID NS_IDOMSERIALIZER_IID =
new nsID(NS_IDOMSERIALIZER_IID_STR);
@@ -28231,9 +25647,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java x86_64/o
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2007-08-23 15:58:58.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,15 +37,15 @@
public static final nsID NS_IDOMSERIALIZER_IID =
new nsID(NS_IDOMSERIALIZER_IID_STR);
@@ -28253,63 +25669,61 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java x86_64/org/e
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), root, stream, charset);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IDOMUIEVENT_IID =
- new nsID(NS_IDOMUIEVENT_IID_STR);
-
-- public nsIDOMUIEvent(int /*long*/ address) {
-+ public nsIDOMUIEvent(long /*int*/ address) {
- super(address);
- }
-
-- public int GetView(int /*long*/[] aView) {
-+ public int GetView(long /*int*/[] aView) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
- }
-
+ public static final nsID NS_IDOMUIEVENT_IID =
+ new nsID(NS_IDOMUIEVENT_IID_STR);
+
+- public nsIDOMUIEvent(int /*long*/ address) {
++ public nsIDOMUIEvent(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetView(int /*long*/[] aView) {
++ public int GetView(long /*int*/[] aView) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
+ }
+
@@ -49,7 +49,7 @@
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
- }
-
-- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
-+ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
- }
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
+ }
+
+- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
++ public int InitUIEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
- new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
-
-- public nsIDOMWindowCollection(int /*long*/ address) {
-+ public nsIDOMWindowCollection(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
+ new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
+
+- public nsIDOMWindowCollection(int /*long*/ address) {
++ public nsIDOMWindowCollection(long /*int*/ address) {
+ super(address);
+ }
+
@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
- }
-
-- public int Item(int index, int /*long*/[] _retval) {
-+ public int Item(int index, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
- }
-
-- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
-+ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
+ }
+
+- public int Item(int index, int /*long*/[] _retval) {
++ public int Item(int index, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
+ }
+
+- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
++ public int NamedItem(long /*int*/ name, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,35 +37,35 @@
public static final nsID NS_IDOMWINDOW_IID =
new nsID(NS_IDOMWINDOW_IID_STR);
@@ -28363,9 +25777,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java x86_64/org/eclip
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2006-10-26 11:24:38.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IDOWNLOAD_IID =
new nsID(NS_IDOWNLOAD_IID_STR);
@@ -28423,9 +25837,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java x86_64/org/ec
return XPCOM.VtblCall(nsITransfer.LAST_METHOD_ID + 10, getAddress(), aMIMEInfo);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java
---- x86/org/eclipse/swt/internal/mozilla/nsIDownload.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIDownload.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIDownload.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,23 +37,23 @@
public static final nsID NS_IDOWNLOAD_IID =
new nsID(NS_IDOWNLOAD_IID_STR);
@@ -28494,276 +25908,273 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIDownload.java x86_64/org/eclips
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
---- x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
- new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
-
-- public nsIEmbeddingSiteWindow(int /*long*/ address) {
-+ public nsIEmbeddingSiteWindow(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
+ new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
+
+- public nsIEmbeddingSiteWindow(int /*long*/ address) {
++ public nsIEmbeddingSiteWindow(long /*int*/ address) {
+ super(address);
+ }
+
@@ -67,7 +67,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
- }
-
-- public int GetTitle(int /*long*/[] aTitle) {
-+ public int GetTitle(long /*int*/[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
+ }
+
+- public int GetTitle(int /*long*/[] aTitle) {
++ public int GetTitle(long /*int*/[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
+ }
+
@@ -75,7 +75,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
- }
-
-- public int GetSiteWindow(int /*long*/[] aSiteWindow) {
-+ public int GetSiteWindow(long /*int*/[] aSiteWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
+ }
+
+- public int GetSiteWindow(int /*long*/[] aSiteWindow) {
++ public int GetSiteWindow(long /*int*/[] aSiteWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIFactory.java x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFactory.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFactory.java x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIFactory.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIFactory.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IFACTORY_IID =
- new nsID(NS_IFACTORY_IID_STR);
-
-- public nsIFactory(int /*long*/ address) {
-+ public nsIFactory(long /*int*/ address) {
- super(address);
- }
-
-- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
-+ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFile.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java 2009-02-11 17:43:48.000000000 -0500
+ public static final nsID NS_IFACTORY_IID =
+ new nsID(NS_IFACTORY_IID_STR);
+
+- public nsIFactory(int /*long*/ address) {
++ public nsIFactory(long /*int*/ address) {
+ super(address);
+ }
+
+- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
++ public int CreateInstance(long /*int*/ aOuter, nsID iid, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFile.java x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIFile.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIFile.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IFILE_IID =
- new nsID(NS_IFILE_IID_STR);
-
-- public nsIFile(int /*long*/ address) {
-+ public nsIFile(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IFILE_IID =
+ new nsID(NS_IFILE_IID_STR);
+
+- public nsIFile(int /*long*/ address) {
++ public nsIFile(long /*int*/ address) {
+ super(address);
+ }
+
@@ -45,11 +45,11 @@
-
- public static final int DIRECTORY_TYPE = 1;
-
-- public int Append(int /*long*/ node) {
-+ public int Append(long /*int*/ node) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
- }
-
-- public int AppendNative(int /*long*/ node) {
-+ public int AppendNative(long /*int*/ node) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
- }
-
+
+ public static final int DIRECTORY_TYPE = 1;
+
+- public int Append(int /*long*/ node) {
++ public int Append(long /*int*/ node) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
+ }
+
+- public int AppendNative(int /*long*/ node) {
++ public int AppendNative(long /*int*/ node) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
+ }
+
@@ -61,43 +61,43 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
- }
-
-- public int GetLeafName(int /*long*/ aLeafName) {
-+ public int GetLeafName(long /*int*/ aLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
- }
-
-- public int SetLeafName(int /*long*/ aLeafName) {
-+ public int SetLeafName(long /*int*/ aLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
- }
-
-- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
-+ public int GetNativeLeafName(long /*int*/ aNativeLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
- }
-
-- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
-+ public int SetNativeLeafName(long /*int*/ aNativeLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
- }
-
-- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
- }
-
-- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
- }
-
-- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
- }
-
-- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
- }
-
-- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
- }
-
-- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
-+ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
+ }
+
+- public int GetLeafName(int /*long*/ aLeafName) {
++ public int GetLeafName(long /*int*/ aLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
+ }
+
+- public int SetLeafName(int /*long*/ aLeafName) {
++ public int SetLeafName(long /*int*/ aLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
+ }
+
+- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
++ public int GetNativeLeafName(long /*int*/ aNativeLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
+ }
+
+- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
++ public int SetNativeLeafName(long /*int*/ aNativeLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
+ }
+
+- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyTo(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
+ }
+
+- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyToNative(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
+ }
+
+- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyToFollowingLinks(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
+ }
+
+- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int CopyToFollowingLinksNative(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
+ }
+
+- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int MoveTo(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
+ }
+
+- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
++ public int MoveToNative(long /*int*/ newParentDir, long /*int*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
+ }
+
@@ -149,19 +149,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
- }
-
-- public int GetTarget(int /*long*/ aTarget) {
-+ public int GetTarget(long /*int*/ aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
- }
-
-- public int GetNativeTarget(int /*long*/ aNativeTarget) {
-+ public int GetNativeTarget(long /*int*/ aNativeTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
- }
-
-- public int GetPath(int /*long*/ aPath) {
-+ public int GetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
- }
-
-- public int GetNativePath(int /*long*/ aNativePath) {
-+ public int GetNativePath(long /*int*/ aNativePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
+ }
+
+- public int GetTarget(int /*long*/ aTarget) {
++ public int GetTarget(long /*int*/ aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
+ }
+
+- public int GetNativeTarget(int /*long*/ aNativeTarget) {
++ public int GetNativeTarget(long /*int*/ aNativeTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
+ }
+
+- public int GetPath(int /*long*/ aPath) {
++ public int GetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
+ }
+
+- public int GetNativePath(int /*long*/ aNativePath) {
++ public int GetNativePath(long /*int*/ aNativePath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
+ }
+
@@ -205,23 +205,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
- }
-
-- public int Clone(int /*long*/[] _retval) {
-+ public int Clone(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
- }
-
-- public int Equals(int /*long*/ inFile, int[] _retval) {
-+ public int Equals(long /*int*/ inFile, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
- }
-
-- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
-+ public int Contains(long /*int*/ inFile, int recur, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
- }
-
-- public int GetParent(int /*long*/[] aParent) {
-+ public int GetParent(long /*int*/[] aParent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
- }
-
-- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
-+ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
+ }
+
+- public int Clone(int /*long*/[] _retval) {
++ public int Clone(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
+ }
+
+- public int Equals(int /*long*/ inFile, int[] _retval) {
++ public int Equals(long /*int*/ inFile, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
+ }
+
+- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
++ public int Contains(long /*int*/ inFile, int recur, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
+ }
+
+- public int GetParent(int /*long*/[] aParent) {
++ public int GetParent(long /*int*/[] aParent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
+ }
+
+- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
++ public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IFILEPICKER_IID =
- new nsID(NS_IFILEPICKER_IID_STR);
-
-- public nsIFilePicker_1_8(int /*long*/ address) {
-+ public nsIFilePicker_1_8(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IFILEPICKER_IID =
+ new nsID(NS_IFILEPICKER_IID_STR);
+
+- public nsIFilePicker_1_8(int /*long*/ address) {
++ public nsIFilePicker_1_8(long /*int*/ address) {
+ super(address);
+ }
+
@@ -56,7 +56,7 @@
- public static final int filterXUL = 32;
- public static final int filterApps = 64;
-
-- public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
-+ public int Init(long /*int*/ parent, long /*int*/ title, int mode) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
- }
-
+ public static final int filterXUL = 32;
+ public static final int filterApps = 64;
+
+- public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
++ public int Init(long /*int*/ parent, long /*int*/ title, int mode) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
+ }
+
@@ -64,23 +64,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
- }
-
-- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
-+ public int AppendFilter(long /*int*/ title, long /*int*/ filter) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
- }
-
-- public int GetDefaultString(int /*long*/ aDefaultString) {
-+ public int GetDefaultString(long /*int*/ aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
- }
-
-- public int SetDefaultString(int /*long*/ aDefaultString) {
-+ public int SetDefaultString(long /*int*/ aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
- }
-
-- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
-+ public int GetDefaultExtension(long /*int*/ aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
- }
-
-- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
-+ public int SetDefaultExtension(long /*int*/ aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
+ }
+
+- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
++ public int AppendFilter(long /*int*/ title, long /*int*/ filter) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
+ }
+
+- public int GetDefaultString(int /*long*/ aDefaultString) {
++ public int GetDefaultString(long /*int*/ aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
+ }
+
+- public int SetDefaultString(int /*long*/ aDefaultString) {
++ public int SetDefaultString(long /*int*/ aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
+ }
+
+- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
++ public int GetDefaultExtension(long /*int*/ aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
+ }
+
+- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
++ public int SetDefaultExtension(long /*int*/ aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
+ }
+
@@ -92,27 +92,27 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
- }
-
-- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
-+ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
- }
-
-- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
-+ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
- }
-
-- public int GetFile(int /*long*/[] aFile) {
-+ public int GetFile(long /*int*/[] aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
- }
-
-- public int GetFileURL(int /*long*/[] aFileURL) {
-+ public int GetFileURL(long /*int*/[] aFileURL) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
- }
-
-- public int GetFiles(int /*long*/[] aFiles) {
-+ public int GetFiles(long /*int*/[] aFiles) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
- }
-
-- public int Show(int /*long*/ _retval) {
-+ public int Show(long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
+ }
+
+- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
++ public int GetDisplayDirectory(long /*int*/[] aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
+ }
+
+- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
++ public int SetDisplayDirectory(long /*int*/ aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
+ }
+
+- public int GetFile(int /*long*/[] aFile) {
++ public int GetFile(long /*int*/[] aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
+ }
+
+- public int GetFileURL(int /*long*/[] aFileURL) {
++ public int GetFileURL(long /*int*/[] aFileURL) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
+ }
+
+- public int GetFiles(int /*long*/[] aFiles) {
++ public int GetFiles(long /*int*/[] aFiles) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
+ }
+
+- public int Show(int /*long*/ _retval) {
++ public int Show(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
---- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIFilePicker.java 2009-09-17 08:48:20.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IFILEPICKER_IID =
new nsID(NS_IFILEPICKER_IID_STR);
@@ -28834,127 +26245,125 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIFilePicker.java x86_64/org/ecli
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,31 +37,31 @@
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher_1_8(int /*long*/ address) {
-+ public nsIHelperAppLauncher_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
-+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
-- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
-- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
-- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
- }
-
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher_1_8(int /*long*/ address) {
++ public nsIHelperAppLauncher_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
++ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+ }
+
@@ -69,11 +69,11 @@
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
- }
-
-- public int GetTargetFile(int /*long*/[] aTargetFile) {
-+ public int GetTargetFile(long /*int*/[] aTargetFile) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
- }
-
-- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
-+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
- }
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+ }
+
+- public int GetTargetFile(int /*long*/[] aTargetFile) {
++ public int GetTargetFile(long /*int*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+ }
+
+- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
++ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,31 +37,31 @@
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher_1_9(int /*long*/ address) {
-+ public nsIHelperAppLauncher_1_9(long /*int*/ address) {
- super(address);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
-+ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
-- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
-- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
-- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
- }
-
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher_1_9(int /*long*/ address) {
++ public nsIHelperAppLauncher_1_9(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
++ public int GetSuggestedFileName(long /*int*/ aSuggestedFileName) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+ }
+
@@ -69,7 +69,7 @@
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
- }
-
-- public int GetTargetFile(int /*long*/[] aTargetFile) {
-+ public int GetTargetFile(long /*int*/[] aTargetFile) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
- }
-
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+ }
+
+- public int GetTargetFile(int /*long*/[] aTargetFile) {
++ public int GetTargetFile(long /*int*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+ }
+
@@ -77,7 +77,7 @@
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
- }
-
-- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
-+ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
- }
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
+ }
+
+- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
++ public int GetTimeDownloadStarted(long /*int*/ aTimeDownloadStarted) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2008-08-20 15:56:28.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
@@ -28978,9 +26387,10 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.jav
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2009-02-11 17:43:48.000000000 -0500
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2007-03-02 11:13:26.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,19 +37,19 @@
public static final nsID NS_IHELPERAPPLAUNCHERDIALOG_IID =
new nsID(NS_IHELPERAPPLAUNCHERDIALOG_IID_STR);
@@ -29006,86 +26416,85 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java x8
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
---- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,27 +37,27 @@
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
-- public nsIHelperAppLauncher(int /*long*/ address) {
-+ public nsIHelperAppLauncher(long /*int*/ address) {
- super(address);
- }
-
-- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
-+ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
-- public int GetSource(int /*long*/[] aSource) {
-+ public int GetSource(long /*int*/[] aSource) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
-- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
-+ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
-- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
-+ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
-- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
-+ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+- public nsIHelperAppLauncher(int /*long*/ address) {
++ public nsIHelperAppLauncher(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
++ public int GetMIMEInfo(long /*int*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+- public int GetSource(int /*long*/[] aSource) {
++ public int GetSource(long /*int*/[] aSource) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
++ public int GetSuggestedFileName(long /*int*/[] aSuggestedFileName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
++ public int SaveToDisk(long /*int*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
++ public int LaunchWithApplication(long /*int*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
@@ -65,7 +65,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
-- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
-+ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
++ public int SetWebProgressListener(long /*int*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
+ }
+
@@ -73,7 +73,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
-
-- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
-+ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+ }
+
+- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
++ public int GetDownloadInfo(long /*int*/[] aSourceUrl, long[] aTimeDownloadStarted, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java
---- x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIInputStream.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IINPUTSTREAM_IID =
- new nsID(NS_IINPUTSTREAM_IID_STR);
-
-- public nsIInputStream(int /*long*/ address) {
-+ public nsIInputStream(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IINPUTSTREAM_IID =
+ new nsID(NS_IINPUTSTREAM_IID_STR);
+
+- public nsIInputStream(int /*long*/ address) {
++ public nsIInputStream(long /*int*/ address) {
+ super(address);
+ }
+
@@ -53,7 +53,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
- }
-
-- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
-+ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
---- x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
+ }
+
+- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
++ public int ReadSegments(long /*int*/ aWriter, long /*int*/ aClosure, int aCount, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IINTERFACEREQUESTOR_IID =
new nsID(NS_IINTERFACEREQUESTOR_IID_STR);
@@ -29101,289 +26510,286 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java x86_64/
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIIOService.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIIOService.java x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIIOService.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIIOService.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IIOSERVICE_IID =
- new nsID(NS_IIOSERVICE_IID_STR);
-
-- public nsIIOService(int /*long*/ address) {
-+ public nsIIOService(long /*int*/ address) {
- super(address);
- }
-
-- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
-+ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
- }
-
+ public static final nsID NS_IIOSERVICE_IID =
+ new nsID(NS_IIOSERVICE_IID_STR);
+
+- public nsIIOService(int /*long*/ address) {
++ public nsIIOService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
++ public int GetProtocolHandler(byte[] aScheme, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
+ }
+
@@ -49,19 +49,19 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
- }
-
-- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
-+ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
- }
-
-- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
-+ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
- }
-
-- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
-+ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
- }
-
-- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
-+ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
+ }
+
+- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
++ public int NewURI(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+ }
+
+- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
++ public int NewFileURI(long /*int*/ aFile, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
+ }
+
+- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
++ public int NewChannelFromURI(long /*int*/ aURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
+ }
+
+- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
++ public int NewChannel(long /*int*/ aSpec, byte[] aOriginCharset, long /*int*/ aBaseURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+ }
+
@@ -77,7 +77,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
- }
-
-- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
-+ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
+ }
+
+- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
++ public int ExtractScheme(long /*int*/ urlString, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
---- x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IJSCONTEXTSTACK_IID =
- new nsID(NS_IJSCONTEXTSTACK_IID_STR);
-
-- public nsIJSContextStack(int /*long*/ address) {
-+ public nsIJSContextStack(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IJSCONTEXTSTACK_IID =
+ new nsID(NS_IJSCONTEXTSTACK_IID_STR);
+
+- public nsIJSContextStack(int /*long*/ address) {
++ public nsIJSContextStack(long /*int*/ address) {
+ super(address);
+ }
+
@@ -45,15 +45,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
- }
-
-- public int Peek(int /*long*/[] _retval) {
-+ public int Peek(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
-- public int Pop(int /*long*/[] _retval) {
-+ public int Pop(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
- }
-
-- public int Push(int /*long*/ cx) {
-+ public int Push(long /*int*/ cx) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
+ }
+
+- public int Peek(int /*long*/[] _retval) {
++ public int Peek(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+- public int Pop(int /*long*/[] _retval) {
++ public int Pop(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+- public int Push(int /*long*/ cx) {
++ public int Push(long /*int*/ cx) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java
---- x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+--- x86/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsILocalFile.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,19 +37,19 @@
- public static final nsID NS_ILOCALFILE_IID =
- new nsID(NS_ILOCALFILE_IID_STR);
-
-- public nsILocalFile(int /*long*/ address) {
-+ public nsILocalFile(long /*int*/ address) {
- super(address);
- }
-
-- public int InitWithPath(int /*long*/ filePath) {
-+ public int InitWithPath(long /*int*/ filePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
- }
-
-- public int InitWithNativePath(int /*long*/ filePath) {
-+ public int InitWithNativePath(long /*int*/ filePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
- }
-
-- public int InitWithFile(int /*long*/ aFile) {
-+ public int InitWithFile(long /*int*/ aFile) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
- }
-
+ public static final nsID NS_ILOCALFILE_IID =
+ new nsID(NS_ILOCALFILE_IID_STR);
+
+- public nsILocalFile(int /*long*/ address) {
++ public nsILocalFile(long /*int*/ address) {
+ super(address);
+ }
+
+- public int InitWithPath(int /*long*/ filePath) {
++ public int InitWithPath(long /*int*/ filePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
+ }
+
+- public int InitWithNativePath(int /*long*/ filePath) {
++ public int InitWithNativePath(long /*int*/ filePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
+ }
+
+- public int InitWithFile(int /*long*/ aFile) {
++ public int InitWithFile(long /*int*/ aFile) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
+ }
+
@@ -61,15 +61,15 @@
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
- }
-
-- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
-+ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
- }
-
-- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
-+ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
- }
-
-- public int Load(int /*long*/[] _retval) {
-+ public int Load(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
- }
-
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
+ }
+
+- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
++ public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
+ }
+
+- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
++ public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
+ }
+
+- public int Load(int /*long*/[] _retval) {
++ public int Load(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
+ }
+
@@ -77,19 +77,19 @@
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
- }
-
-- public int AppendRelativePath(int /*long*/ relativeFilePath) {
-+ public int AppendRelativePath(long /*int*/ relativeFilePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
- }
-
-- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
-+ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
- }
-
-- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
-+ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
- }
-
-- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
-+ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
- }
-
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
+ }
+
+- public int AppendRelativePath(int /*long*/ relativeFilePath) {
++ public int AppendRelativePath(long /*int*/ relativeFilePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
+ }
+
+- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
++ public int AppendRelativeNativePath(long /*int*/ relativeFilePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
+ }
+
+- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
++ public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
+ }
+
+- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
++ public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
+ }
+
@@ -101,11 +101,11 @@
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
- }
-
-- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
-+ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
- }
-
-- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
-+ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
- }
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
+ }
+
+- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
++ public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
+ }
+
+- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
++ public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIMemory.java x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java
---- x86/org/eclipse/swt/internal/mozilla/nsIMemory.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java 2009-02-11 17:43:48.000000000 -0500
-@@ -37,7 +37,7 @@
- public static final nsID NS_IMEMORY_IID =
- new nsID(NS_IMEMORY_IID_STR);
-
-- public nsIMemory(int /*long*/ address) {
-+ public nsIMemory(long /*int*/ address) {
- super(address);
- }
-
-@@ -45,11 +45,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), size);
- }
-
-- public int Realloc(int /*long*/ ptr, int newSize) {
-+ public int Realloc(long /*int*/ ptr, int newSize) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ptr, newSize);
- }
-
-- public int Free(int /*long*/ ptr) {
-+ public int Free(long /*int*/ ptr) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIMemory.java x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIMemory.java 2008-12-15 10:17:00.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIMemory.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,19 +37,19 @@
+ public static final nsID NS_IMEMORY_IID =
+ new nsID(NS_IMEMORY_IID_STR);
+
+- public nsIMemory(int /*long*/ address) {
++ public nsIMemory(long /*int*/ address) {
+ super(address);
+ }
+
+- public int /*long*/ Alloc(int size) {
++ public long /*int*/ Alloc(int size) {
+ return XPCOM.nsIMemory_Alloc(getAddress(), size);
+ }
+
+- public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
++ public long /*int*/ Realloc(long /*int*/ ptr, int newSize) {
+ return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
+ }
+
+- public int Free(int /*long*/ ptr) {
++ public int Free(long /*int*/ ptr) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIObserverService.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,23 +37,23 @@
- public static final nsID NS_IOBSERVERSERVICE_IID =
- new nsID(NS_IOBSERVERSERVICE_IID_STR);
-
-- public nsIObserverService(int /*long*/ address) {
-+ public nsIObserverService(long /*int*/ address) {
- super(address);
- }
-
-- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
-+ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
- }
-
-- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
-+ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
- }
-
-- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
-+ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
- }
-
-- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
-+ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
- }
+ public static final nsID NS_IOBSERVERSERVICE_IID =
+ new nsID(NS_IOBSERVERSERVICE_IID_STR);
+
+- public nsIObserverService(int /*long*/ address) {
++ public nsIObserverService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
++ public int AddObserver(long /*int*/ anObserver, byte[] aTopic, int ownsWeak) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
+ }
+
+- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
++ public int RemoveObserver(long /*int*/ anObserver, byte[] aTopic) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
+ }
+
+- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
++ public int NotifyObservers(long /*int*/ aSubject, byte[] aTopic, char[] someData) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
+ }
+
+- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
++ public int EnumerateObservers(byte[] aTopic, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IPREFBRANCH_IID =
- new nsID(NS_IPREFBRANCH_IID_STR);
-
-- public nsIPrefBranch(int /*long*/ address) {
-+ public nsIPrefBranch(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IPREFBRANCH_IID =
+ new nsID(NS_IPREFBRANCH_IID_STR);
+
+- public nsIPrefBranch(int /*long*/ address) {
++ public nsIPrefBranch(long /*int*/ address) {
+ super(address);
+ }
+
@@ -49,7 +49,7 @@
-
- public static final int PREF_BOOL = 128;
-
-- public int GetRoot(int /*long*/[] aRoot) {
-+ public int GetRoot(long /*int*/[] aRoot) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
- }
-
+
+ public static final int PREF_BOOL = 128;
+
+- public int GetRoot(int /*long*/[] aRoot) {
++ public int GetRoot(long /*int*/[] aRoot) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
+ }
+
@@ -65,7 +65,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
- }
-
-- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
-+ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
+ }
+
+- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
++ public int GetCharPref(byte[] aPrefName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
+ }
+
@@ -81,11 +81,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
- }
-
-- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
-+ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
- }
-
-- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
-+ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
+ }
+
+- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
++ public int GetComplexValue(byte[] aPrefName, nsID aType, long /*int*/[] aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
+ }
+
+- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
++ public int SetComplexValue(byte[] aPrefName, nsID aType, long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
+ }
+
@@ -113,7 +113,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
+ }
+
- public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
+ public int GetChildList(byte[] aStartingAt, int[] aCount, long /*int*/[] aChildArray) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2009-02-11 17:43:48.000000000 -0500
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IPREFLOCALIZEDSTRING_IID =
new nsID(NS_IPREFLOCALIZEDSTRING_IID_STR);
@@ -29407,9 +26813,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java x86_64
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrefService.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IPREFSERVICE_IID =
new nsID(NS_IPREFSERVICE_IID_STR);
@@ -29443,290 +26849,750 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPrefService.java x86_64/org/ecl
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2009-04-08 14:54:52.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIPrincipal.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_IPRINCIPAL_IID =
+ new nsID(NS_IPRINCIPAL_IID_STR);
+
+- public nsIPrincipal(int /*long*/ address) {
++ public nsIPrincipal(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -49,11 +49,11 @@
+
+ public static final int ENABLE_GRANTED = 4;
+
+- public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
++ public int GetPreferences(long /*int*/[] prefBranch, long /*int*/[] id, long /*int*/[] subjectName, long /*int*/[] grantedList, long /*int*/[] deniedList, int[] isTrusted) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
+ }
+
+- public int Equals(int /*long*/ other, int[] _retval) {
++ public int Equals(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
+ }
+
+@@ -61,19 +61,19 @@
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);
+ }
+
+- public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
++ public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval);
+ }
+
+- public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
++ public int GetSecurityPolicy(long /*int*/[] aSecurityPolicy) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy);
+ }
+
+- public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
++ public int SetSecurityPolicy(long /*int*/ aSecurityPolicy) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);
+ }
+
+- public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
++ public int CanEnableCapability(byte[] capability, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);
+ }
+
+@@ -81,35 +81,35 @@
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);
+ }
+
+- public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
++ public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval);
+ }
+
+- public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
++ public int EnableCapability(byte[] capability, long /*int*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation);
+ }
+
+- public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
++ public int RevertCapability(byte[] capability, long /*int*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);
+ }
+
+- public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
++ public int DisableCapability(byte[] capability, long /*int*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);
+ }
+
+- public int GetURI(int /*long*/[] aURI) {
++ public int GetURI(long /*int*/[] aURI) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI);
+ }
+
+- public int GetDomain(int /*long*/[] aDomain) {
++ public int GetDomain(long /*int*/[] aDomain) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain);
+ }
+
+- public int SetDomain(int /*long*/ aDomain) {
++ public int SetDomain(long /*int*/ aDomain) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);
+ }
+
+- public int GetOrigin(int /*long*/[] aOrigin) {
++ public int GetOrigin(long /*int*/[] aOrigin) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);
+ }
+
+@@ -117,27 +117,27 @@
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);
+ }
+
+- public int GetFingerprint(int /*long*/ aFingerprint) {
++ public int GetFingerprint(long /*int*/ aFingerprint) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint);
+ }
+
+- public int GetPrettyName(int /*long*/ aPrettyName) {
++ public int GetPrettyName(long /*int*/ aPrettyName) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName);
+ }
+
+- public int Subsumes(int /*long*/ other, int[] _retval) {
++ public int Subsumes(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+ }
+
+- public int CheckMayLoad(int /*long*/ uri, int report) {
++ public int CheckMayLoad(long /*int*/ uri, int report) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report);
+ }
+
+- public int GetSubjectName(int /*long*/ aSubjectName) {
++ public int GetSubjectName(long /*int*/ aSubjectName) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName);
+ }
+
+- public int GetCertificate(int /*long*/[] aCertificate) {
++ public int GetCertificate(long /*int*/[] aCertificate) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IPROGRESSDIALOG_IID =
- new nsID(NS_IPROGRESSDIALOG_IID_STR);
-
-- public nsIProgressDialog_1_8(int /*long*/ address) {
-+ public nsIProgressDialog_1_8(long /*int*/ address) {
- super(address);
- }
-
-- public int Open(int /*long*/ aParent) {
-+ public int Open(long /*int*/ aParent) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
- }
-
+ public static final nsID NS_IPROGRESSDIALOG_IID =
+ new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+- public nsIProgressDialog_1_8(int /*long*/ address) {
++ public nsIProgressDialog_1_8(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Open(int /*long*/ aParent) {
++ public int Open(long /*int*/ aParent) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
+ }
+
@@ -53,19 +53,19 @@
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
- }
-
-- public int GetObserver(int /*long*/[] aObserver) {
-+ public int GetObserver(long /*int*/[] aObserver) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
- }
-
-- public int SetObserver(int /*long*/ aObserver) {
-+ public int SetObserver(long /*int*/ aObserver) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
- }
-
-- public int GetDialog(int /*long*/[] aDialog) {
-+ public int GetDialog(long /*int*/[] aDialog) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
- }
-
-- public int SetDialog(int /*long*/ aDialog) {
-+ public int SetDialog(long /*int*/ aDialog) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
- }
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+ }
+
+- public int GetObserver(int /*long*/[] aObserver) {
++ public int GetObserver(long /*int*/[] aObserver) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
+ }
+
+- public int SetObserver(int /*long*/ aObserver) {
++ public int SetObserver(long /*int*/ aObserver) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
+ }
+
+- public int GetDialog(int /*long*/[] aDialog) {
++ public int GetDialog(long /*int*/[] aDialog) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
+ }
+
+- public int SetDialog(int /*long*/ aDialog) {
++ public int SetDialog(long /*int*/ aDialog) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IPROGRESSDIALOG_IID =
- new nsID(NS_IPROGRESSDIALOG_IID_STR);
-
-- public nsIProgressDialog(int /*long*/ address) {
-+ public nsIProgressDialog(long /*int*/ address) {
- super(address);
- }
-
-- public int Open(int /*long*/ aParent) {
-+ public int Open(long /*int*/ aParent) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
- }
-
+ public static final nsID NS_IPROGRESSDIALOG_IID =
+ new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+- public nsIProgressDialog(int /*long*/ address) {
++ public nsIProgressDialog(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Open(int /*long*/ aParent) {
++ public int Open(long /*int*/ aParent) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
+ }
+
@@ -53,11 +53,11 @@
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
- }
-
-- public int GetDialog(int /*long*/[] aDialog) {
-+ public int GetDialog(long /*int*/[] aDialog) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
- }
-
-- public int SetDialog(int /*long*/ aDialog) {
-+ public int SetDialog(long /*int*/ aDialog) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
- }
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+ }
+
+- public int GetDialog(int /*long*/[] aDialog) {
++ public int GetDialog(long /*int*/[] aDialog) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
+ }
+
+- public int SetDialog(int /*long*/ aDialog) {
++ public int SetDialog(long /*int*/ aDialog) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService2.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,15 +37,15 @@
- public static final nsID NS_IPROMPTSERVICE2_IID =
- new nsID(NS_IPROMPTSERVICE2_IID_STR);
-
-- public nsIPromptService2(int /*long*/ address) {
-+ public nsIPromptService2(long /*int*/ address) {
- super(address);
- }
-
-- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
-+ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
- return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
- }
-
-- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
-+ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
- }
+ public static final nsID NS_IPROMPTSERVICE2_IID =
+ new nsID(NS_IPROMPTSERVICE2_IID_STR);
+
+- public nsIPromptService2(int /*long*/ address) {
++ public nsIPromptService2(long /*int*/ address) {
+ super(address);
+ }
+
+- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
++ public int PromptAuth(long /*int*/ aParent, long /*int*/ aChannel, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+ return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
+ }
+
+- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
++ public int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, char[] checkboxLabel, int[] checkValue, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java
---- x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIPromptService.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,23 +37,23 @@
- public static final nsID NS_IPROMPTSERVICE_IID =
- new nsID(NS_IPROMPTSERVICE_IID_STR);
-
-- public nsIPromptService(int /*long*/ address) {
-+ public nsIPromptService(long /*int*/ address) {
- super(address);
- }
-
-- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
-+ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
- }
-
-- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
-+ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
- }
-
-- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
-+ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
- }
-
-- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
- }
-
+ public static final nsID NS_IPROMPTSERVICE_IID =
+ new nsID(NS_IPROMPTSERVICE_IID_STR);
+
+- public nsIPromptService(int /*long*/ address) {
++ public nsIPromptService(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
++ public int Alert(long /*int*/ aParent, char[] aDialogTitle, char[] aText) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
+ }
+
+- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
++ public int AlertCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
+ }
+
+- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
++ public int Confirm(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
+ }
+
+- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int ConfirmCheck(long /*int*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
+ }
+
@@ -91,23 +91,23 @@
-
- public static final int STD_YES_NO_BUTTONS = 1027;
-
-- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
- }
-
-- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
- }
-
-- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
- }
-
-- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
-+ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
- }
-
-- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
-+ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
- }
+
+ public static final int STD_YES_NO_BUTTONS = 1027;
+
+- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int ConfirmEx(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int Prompt(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int PromptUsernameAndPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aUsername, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
++ public int PromptPassword(long /*int*/ aParent, char[] aDialogTitle, char[] aText, long /*int*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
+ }
+
+- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
++ public int Select(long /*int*/ aParent, char[] aDialogTitle, char[] aText, int aCount, long /*int*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java
---- x86/org/eclipse/swt/internal/mozilla/nsIProperties.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIProperties.java x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIProperties.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIProperties.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,15 +37,15 @@
- public static final nsID NS_IPROPERTIES_IID =
- new nsID(NS_IPROPERTIES_IID_STR);
-
-- public nsIProperties(int /*long*/ address) {
-+ public nsIProperties(long /*int*/ address) {
- super(address);
- }
-
-- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
-+ public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
- }
-
-- public int Set(byte[] prop, int /*long*/ value) {
-+ public int Set(byte[] prop, long /*int*/ value) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
- }
-
+ public static final nsID NS_IPROPERTIES_IID =
+ new nsID(NS_IPROPERTIES_IID_STR);
+
+- public nsIProperties(int /*long*/ address) {
++ public nsIProperties(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
++ public int Get(byte[] prop, nsID iid, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
+ }
+
+- public int Set(byte[] prop, int /*long*/ value) {
++ public int Set(byte[] prop, long /*int*/ value) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
+ }
+
@@ -57,7 +57,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
+ }
+
- public int GetKeys(int[] count, int /*long*/[] keys) {
+ public int GetKeys(int[] count, long /*int*/[] keys) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
- }
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java
---- x86/org/eclipse/swt/internal/mozilla/nsIRequest.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIRequest.java x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIRequest.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIRequest.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
- public static final nsID NS_IREQUEST_IID =
- new nsID(NS_IREQUEST_IID_STR);
-
-- public nsIRequest(int /*long*/ address) {
-+ public nsIRequest(long /*int*/ address) {
- super(address);
- }
-
-- public int GetName(int /*long*/ aName) {
-+ public int GetName(long /*int*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
- }
-
+ public static final nsID NS_IREQUEST_IID =
+ new nsID(NS_IREQUEST_IID_STR);
+
+- public nsIRequest(int /*long*/ address) {
++ public nsIRequest(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetName(int /*long*/ aName) {
++ public int GetName(long /*int*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+ }
+
@@ -49,7 +49,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
-- public int GetStatus(int /*long*/[] aStatus) {
-+ public int GetStatus(long /*int*/[] aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+- public int GetStatus(int /*long*/[] aStatus) {
++ public int GetStatus(long /*int*/[] aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
+ }
+
@@ -65,15 +65,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
-- public int GetLoadGroup(int /*long*/[] aLoadGroup) {
-+ public int GetLoadGroup(long /*int*/[] aLoadGroup) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
- }
-
-- public int SetLoadGroup(int /*long*/ aLoadGroup) {
-+ public int SetLoadGroup(long /*int*/ aLoadGroup) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
- }
-
-- public int GetLoadFlags(int /*long*/[] aLoadFlags) {
-+ public int GetLoadFlags(long /*int*/[] aLoadFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
---- x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+- public int GetLoadGroup(int /*long*/[] aLoadGroup) {
++ public int GetLoadGroup(long /*int*/[] aLoadGroup) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
+ }
+
+- public int SetLoadGroup(int /*long*/ aLoadGroup) {
++ public int SetLoadGroup(long /*int*/ aLoadGroup) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
+ }
+
+- public int GetLoadFlags(int /*long*/[] aLoadFlags) {
++ public int GetLoadFlags(long /*int*/[] aLoadFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2009-04-08 14:54:52.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,19 +37,19 @@
+ public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+ new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+- public nsIScriptSecurityManager_1_9_1(int /*long*/ address) {
++ public nsIScriptSecurityManager_1_9_1(long /*int*/ address) {
+ super(address);
+ }
+
+-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
++// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+ // }
+
+- public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
++ public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+ }
+
+- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
++ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+ }
+
+@@ -65,47 +65,47 @@
+
+ public static final int DISALLOW_SCRIPT = 8;
+
+- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+ }
+
+- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+ }
+
+- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
++ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+ }
+
+-// public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) {
++// public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM);
+ // }
+
+-// public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetSubjectPrincipal(long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM);
+ // }
+
+- public int GetSystemPrincipal(int /*long*/[] _retval) {
++ public int GetSystemPrincipal(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM);
+ // }
+
+-// public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM);
+ // }
+
+-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) {
++// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);
+ // }
+
+@@ -125,11 +125,11 @@
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+ }
+
+-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
++// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+ // }
+
+-// public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);
+ // }
+
+@@ -137,23 +137,23 @@
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);
+ // }
+
+- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
++ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+ }
+
+- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
++ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+ }
+
+-// public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM);
+ // }
+
+-// public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) {
++// public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM);
+ // }
+
+-// public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) {
++// public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval NS_OUTPARAM) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM);
+ // }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2009-04-08 14:54:52.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,19 +37,19 @@
+ public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+ new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+- public nsIScriptSecurityManager_1_9(int /*long*/ address) {
++ public nsIScriptSecurityManager_1_9(long /*int*/ address) {
+ super(address);
+ }
+
+-// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
++// public int CheckPropertyAccess(long /*int*/ aJSContext, long /*int*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+ // }
+
+-// public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
++// public int CheckConnect(long /*int*/ aJSContext, long /*int*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+ // }
+
+- public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
++ public int CheckLoadURIFromScript(long /*int*/ cx, long /*int*/ uri) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+ }
+
+@@ -65,47 +65,47 @@
+
+ public static final int DISALLOW_SCRIPT = 8;
+
+- public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+ }
+
+- public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+ }
+
+- public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
++ public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+ }
+
+- public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
++ public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+ }
+
+- public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
++ public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval);
+ }
+
+- public int GetSubjectPrincipal(int /*long*/[] _retval) {
++ public int GetSubjectPrincipal(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+- public int GetSystemPrincipal(int /*long*/[] _retval) {
++ public int GetSystemPrincipal(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+-// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
++// public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
+ // }
+
+- public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
++ public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval);
+ }
+
+-// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
++// public int RequestCapability(long /*int*/ principal, byte[] capability, long /*int*/ _retval) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);
+ // }
+
+@@ -125,11 +125,11 @@
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+ }
+
+-// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
++// public int SetCanEnableCapability(long /*int*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+ // return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+ // }
+
+- public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
++ public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);
+ }
+
+@@ -137,23 +137,23 @@
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+- public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
++ public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+ }
+
+- public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
++ public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+ }
+
+- public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
++ public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval);
+ }
+
+- public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
++ public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval);
+ }
+
+- public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
++ public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
+--- x86/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2008-12-02 11:18:44.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java 2009-09-17 08:48:22.000000000 -0400
+@@ -11,23 +11,23 @@
+ public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
+ new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
+
+- public nsISecurityCheckedComponent(int /*long*/ address) {
++ public nsISecurityCheckedComponent(long /*int*/ address) {
+ super(address);
+ }
+
+- public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {
++ public int CanCreateWrapper(long /*int*/ iid, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);
+ }
+
+- public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {
++ public int CanCallMethod(long /*int*/ iid, char[] methodName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);
+ }
+
+- public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
++ public int CanGetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);
+ }
+
+- public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
++ public int CanSetProperty(long /*int*/ iid, char[] propertyName, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsISerializable.java x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java
+--- x86/org/eclipse/swt/internal/mozilla/nsISerializable.java 2009-04-08 14:54:52.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsISerializable.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,15 +37,15 @@
- public static final nsID NS_ISERVICEMANAGER_IID =
- new nsID(NS_ISERVICEMANAGER_IID_STR);
-
-- public nsIServiceManager(int /*long*/ address) {
-+ public nsIServiceManager(long /*int*/ address) {
- super(address);
- }
-
-- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
-+ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
- }
-
-- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
-+ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
---- x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2009-02-11 17:43:48.000000000 -0500
+ public static final nsID NS_ISERIALIZABLE_IID =
+ new nsID(NS_ISERIALIZABLE_IID_STR);
+
+- public nsISerializable(int /*long*/ address) {
++ public nsISerializable(long /*int*/ address) {
+ super(address);
+ }
+
+- public int Read(int /*long*/ aInputStream) {
++ public int Read(long /*int*/ aInputStream) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
+ }
+
+- public int Write(int /*long*/ aOutputStream) {
++ public int Write(long /*int*/ aOutputStream) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIServiceManager.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,15 +37,15 @@
+ public static final nsID NS_ISERVICEMANAGER_IID =
+ new nsID(NS_ISERVICEMANAGER_IID_STR);
+
+- public nsIServiceManager(int /*long*/ address) {
++ public nsIServiceManager(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
++ public int GetService(nsID aClass, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+ }
+
+- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
++ public int GetServiceByContractID(byte[] aContractID, nsID aIID, long /*int*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+--- x86/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2008-10-22 16:17:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_ISIMPLEENUMERATOR_IID =
- new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
-
-- public nsISimpleEnumerator(int /*long*/ address) {
-+ public nsISimpleEnumerator(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_ISIMPLEENUMERATOR_IID =
+ new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
+
+- public nsISimpleEnumerator(int /*long*/ address) {
++ public nsISimpleEnumerator(long /*int*/ address) {
+ super(address);
+ }
+
@@ -45,7 +45,7 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
- }
-
-- public int GetNext(int /*long*/[] _retval) {
-+ public int GetNext(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
+ }
+
+- public int GetNext(int /*long*/[] _retval) {
++ public int GetNext(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java
---- x86/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-02-11 17:43:48.000000000 -0500
-@@ -37,17 +37,17 @@
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+--- x86/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2009-08-19 16:24:48.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsISSLStatus.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,15 +37,15 @@
+ public static final nsID NS_ISSLSTATUS_IID =
+ new nsID(NS_ISSLSTATUS_IID_STR);
+
+- public nsISSLStatus(int /*long*/ address) {
++ public nsISSLStatus(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetServerCert(int /*long*/[] aServerCert) {
++ public int GetServerCert(long /*int*/[] aServerCert) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
+ }
+
+- public int GetCipherName(int /*long*/[] aCipherName) {
++ public int GetCipherName(long /*int*/[] aCipherName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java
+--- x86/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-04-22 15:12:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsISupports.java 2009-09-17 08:48:22.000000000 -0400
+@@ -44,17 +44,17 @@
public static final nsID NS_ISUPPORTS_IID =
new nsID(NS_ISUPPORTS_IID_STR);
@@ -29745,12 +27611,12 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsISupports.java x86_64/org/eclips
- public int QueryInterface(nsID uuid, int /*long*/[] result) {
+ public int QueryInterface(nsID uuid, long /*int*/[] result) {
- return XPCOM.VtblCall(0, getAddress(), uuid, result);
+ return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
---- x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+--- x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_ISUPPORTSWEAKREFERENCE_IID =
new nsID(NS_ISUPPORTSWEAKREFERENCE_IID_STR);
@@ -29766,9 +27632,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java x86_
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+--- x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsITooltipListener.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_ITOOLTIPLISTENER_IID =
new nsID(NS_ITOOLTIPLISTENER_IID_STR);
@@ -29778,9 +27644,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsITooltipListener.java x86_64/org
super(address);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java
---- x86/org/eclipse/swt/internal/mozilla/nsITransfer.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java
+--- x86/org/eclipse/swt/internal/mozilla/nsITransfer.java 2006-10-26 11:24:36.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsITransfer.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_ITRANSFER_IID =
new nsID(NS_ITRANSFER_IID_STR);
@@ -29795,198 +27661,313 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsITransfer.java x86_64/org/eclips
return XPCOM.VtblCall(nsIWebProgressListener2.LAST_METHOD_ID + 1, getAddress(), aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,39 +37,39 @@
- public static final nsID NS_IURICONTENTLISTENER_IID =
- new nsID(NS_IURICONTENTLISTENER_IID_STR);
-
-- public nsIURIContentListener(int /*long*/ address) {
-+ public nsIURIContentListener(long /*int*/ address) {
- super(address);
- }
-
-- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
-+ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
- }
-
-- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
-+ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
- }
-
-- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
-+ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
- }
-
-- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
-+ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
- }
-
-- public int GetLoadCookie(int /*long*/[] aLoadCookie) {
-+ public int GetLoadCookie(long /*int*/[] aLoadCookie) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
- }
-
-- public int SetLoadCookie(int /*long*/ aLoadCookie) {
-+ public int SetLoadCookie(long /*int*/ aLoadCookie) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
- }
-
-- public int GetParentContentListener(int /*long*/[] aParentContentListener) {
-+ public int GetParentContentListener(long /*int*/[] aParentContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
- }
-
-- public int SetParentContentListener(int /*long*/ aParentContentListener) {
-+ public int SetParentContentListener(long /*int*/ aParentContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
- }
+ public static final nsID NS_IURICONTENTLISTENER_IID =
+ new nsID(NS_IURICONTENTLISTENER_IID_STR);
+
+- public nsIURIContentListener(int /*long*/ address) {
++ public nsIURIContentListener(long /*int*/ address) {
+ super(address);
+ }
+
+- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
++ public int OnStartURIOpen(long /*int*/ aURI, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
+ }
+
+- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
++ public int DoContent(byte[] aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/[] aContentHandler, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
+ }
+
+- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
++ public int IsPreferred(byte[] aContentType, long /*int*/[] aDesiredContentType, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
+ }
+
+- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
++ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, long /*int*/[] aDesiredContentType, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
+ }
+
+- public int GetLoadCookie(int /*long*/[] aLoadCookie) {
++ public int GetLoadCookie(long /*int*/[] aLoadCookie) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
+ }
+
+- public int SetLoadCookie(int /*long*/ aLoadCookie) {
++ public int SetLoadCookie(long /*int*/ aLoadCookie) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
+ }
+
+- public int GetParentContentListener(int /*long*/[] aParentContentListener) {
++ public int GetParentContentListener(long /*int*/[] aParentContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
+ }
+
+- public int SetParentContentListener(int /*long*/ aParentContentListener) {
++ public int SetParentContentListener(long /*int*/ aParentContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java
---- x86/org/eclipse/swt/internal/mozilla/nsIURI.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIURI.java x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIURI.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIURI.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,67 +37,67 @@
- public static final nsID NS_IURI_IID =
- new nsID(NS_IURI_IID_STR);
-
-- public nsIURI(int /*long*/ address) {
-+ public nsIURI(long /*int*/ address) {
- super(address);
- }
-
-- public int GetSpec(int /*long*/ aSpec) {
-+ public int GetSpec(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
-- public int SetSpec(int /*long*/ aSpec) {
-+ public int SetSpec(long /*int*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
-- public int GetPrePath(int /*long*/ aPrePath) {
-+ public int GetPrePath(long /*int*/ aPrePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
- }
-
-- public int GetScheme(int /*long*/ aScheme) {
-+ public int GetScheme(long /*int*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
- }
-
-- public int SetScheme(int /*long*/ aScheme) {
-+ public int SetScheme(long /*int*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
- }
-
-- public int GetUserPass(int /*long*/ aUserPass) {
-+ public int GetUserPass(long /*int*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
- }
-
-- public int SetUserPass(int /*long*/ aUserPass) {
-+ public int SetUserPass(long /*int*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
- }
-
-- public int GetUsername(int /*long*/ aUsername) {
-+ public int GetUsername(long /*int*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
- }
-
-- public int SetUsername(int /*long*/ aUsername) {
-+ public int SetUsername(long /*int*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
- }
-
-- public int GetPassword(int /*long*/ aPassword) {
-+ public int GetPassword(long /*int*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
- }
-
-- public int SetPassword(int /*long*/ aPassword) {
-+ public int SetPassword(long /*int*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
- }
-
-- public int GetHostPort(int /*long*/ aHostPort) {
-+ public int GetHostPort(long /*int*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
- }
-
-- public int SetHostPort(int /*long*/ aHostPort) {
-+ public int SetHostPort(long /*int*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
- }
-
-- public int GetHost(int /*long*/ aHost) {
-+ public int GetHost(long /*int*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
- }
-
-- public int SetHost(int /*long*/ aHost) {
-+ public int SetHost(long /*int*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
- }
-
+ public static final nsID NS_IURI_IID =
+ new nsID(NS_IURI_IID_STR);
+
+- public nsIURI(int /*long*/ address) {
++ public nsIURI(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetSpec(int /*long*/ aSpec) {
++ public int GetSpec(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+ }
+
+- public int SetSpec(int /*long*/ aSpec) {
++ public int SetSpec(long /*int*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+ }
+
+- public int GetPrePath(int /*long*/ aPrePath) {
++ public int GetPrePath(long /*int*/ aPrePath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
+ }
+
+- public int GetScheme(int /*long*/ aScheme) {
++ public int GetScheme(long /*int*/ aScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
+ }
+
+- public int SetScheme(int /*long*/ aScheme) {
++ public int SetScheme(long /*int*/ aScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
+ }
+
+- public int GetUserPass(int /*long*/ aUserPass) {
++ public int GetUserPass(long /*int*/ aUserPass) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
+ }
+
+- public int SetUserPass(int /*long*/ aUserPass) {
++ public int SetUserPass(long /*int*/ aUserPass) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
+ }
+
+- public int GetUsername(int /*long*/ aUsername) {
++ public int GetUsername(long /*int*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
+ }
+
+- public int SetUsername(int /*long*/ aUsername) {
++ public int SetUsername(long /*int*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
+ }
+
+- public int GetPassword(int /*long*/ aPassword) {
++ public int GetPassword(long /*int*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
+ }
+
+- public int SetPassword(int /*long*/ aPassword) {
++ public int SetPassword(long /*int*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
+ }
+
+- public int GetHostPort(int /*long*/ aHostPort) {
++ public int GetHostPort(long /*int*/ aHostPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
+ }
+
+- public int SetHostPort(int /*long*/ aHostPort) {
++ public int SetHostPort(long /*int*/ aHostPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
+ }
+
+- public int GetHost(int /*long*/ aHost) {
++ public int GetHost(long /*int*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
+ }
+
+- public int SetHost(int /*long*/ aHost) {
++ public int SetHost(long /*int*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
+ }
+
@@ -109,15 +109,15 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
- }
-
-- public int GetPath(int /*long*/ aPath) {
-+ public int GetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
- }
-
-- public int SetPath(int /*long*/ aPath) {
-+ public int SetPath(long /*int*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
- }
-
-- public int Equals(int /*long*/ other, int[] _retval) {
-+ public int Equals(long /*int*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
- }
-
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
+ }
+
+- public int GetPath(int /*long*/ aPath) {
++ public int GetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
+ }
+
+- public int SetPath(int /*long*/ aPath) {
++ public int SetPath(long /*int*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
+ }
+
+- public int Equals(int /*long*/ other, int[] _retval) {
++ public int Equals(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+ }
+
@@ -125,23 +125,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
- }
-
-- public int Clone(int /*long*/[] _retval) {
-+ public int Clone(long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
- }
-
-- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
-+ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
- }
-
-- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
-+ public int GetAsciiSpec(long /*int*/ aAsciiSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
- }
-
-- public int GetAsciiHost(int /*long*/ aAsciiHost) {
-+ public int GetAsciiHost(long /*int*/ aAsciiHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
- }
-
-- public int GetOriginCharset(int /*long*/ aOriginCharset) {
-+ public int GetOriginCharset(long /*int*/ aOriginCharset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
+ }
+
+- public int Clone(int /*long*/[] _retval) {
++ public int Clone(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+ }
+
+- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
++ public int Resolve(long /*int*/ relativePath, long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
+ }
+
+- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
++ public int GetAsciiSpec(long /*int*/ aAsciiSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
+ }
+
+- public int GetAsciiHost(int /*long*/ aAsciiHost) {
++ public int GetAsciiHost(long /*int*/ aAsciiHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
+ }
+
+- public int GetOriginCharset(int /*long*/ aOriginCharset) {
++ public int GetOriginCharset(long /*int*/ aOriginCharset) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIVariant.java 2008-12-02 11:18:44.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIVariant.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_IVARIANT_IID =
+ new nsID(NS_IVARIANT_IID_STR);
+
+- public nsIVariant(int /*long*/ address) {
++ public nsIVariant(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -45,11 +45,11 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
+ }
+
+- public int GetAsInt8(int /*long*/ _retval) {
++ public int GetAsInt8(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+- public int GetAsInt16(int /*long*/ _retval) {
++ public int GetAsInt16(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+@@ -61,7 +61,7 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+ }
+
+- public int GetAsUint8(int /*long*/ _retval) {
++ public int GetAsUint8(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+ }
+
+@@ -73,7 +73,7 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
+ }
+
+- public int GetAsUint64(int /*long*/ _retval) {
++ public int GetAsUint64(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+@@ -81,7 +81,7 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+- public int GetAsDouble(int /*long*/ _retval) {
++ public int GetAsDouble(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+@@ -97,51 +97,51 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
+ }
+
+- public int GetAsID(int /*long*/ retval) {
++ public int GetAsID(long /*int*/ retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
+ }
+
+- public int GetAsAString(int /*long*/ _retval) {
++ public int GetAsAString(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
+ }
+
+- public int GetAsDOMString(int /*long*/ _retval) {
++ public int GetAsDOMString(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
+ }
+
+- public int GetAsACString(int /*long*/ _retval) {
++ public int GetAsACString(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
+ }
+
+- public int GetAsAUTF8String(int /*long*/ _retval) {
++ public int GetAsAUTF8String(long /*int*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
+ }
+
+- public int GetAsString(int /*long*/[] _retval) {
++ public int GetAsString(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
+ }
+
+- public int GetAsWString(int /*long*/[] _retval) {
++ public int GetAsWString(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+- public int GetAsISupports(int /*long*/[] _retval) {
++ public int GetAsISupports(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+ }
+
+- public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
++ public int GetAsInterface(long /*int*/[] iid, long /*int*/[] iface) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);
+ }
+
+- public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
++ public int GetAsArray(short[] type, long /*int*/ iid, int[] count, long /*int*/[] ptr) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);
+ }
+
+- public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
++ public int GetAsStringWithSize(int[] size, long /*int*/[] str) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);
+ }
+
+- public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
++ public int GetAsWStringWithSize(int[] size, long /*int*/[] str) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWeakReference.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IWEAKREFERENCE_IID =
new nsID(NS_IWEAKREFERENCE_IID_STR);
@@ -30002,9 +27983,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWeakReference.java x86_64/org/e
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IWEBBROWSERCHROMEFOCUS_IID =
new nsID(NS_IWEBBROWSERCHROMEFOCUS_IID_STR);
@@ -30014,35 +27995,35 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java x86_
super(address);
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBBROWSERCHROME_IID =
- new nsID(NS_IWEBBROWSERCHROME_IID_STR);
-
-- public nsIWebBrowserChrome(int /*long*/ address) {
-+ public nsIWebBrowserChrome(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IWEBBROWSERCHROME_IID =
+ new nsID(NS_IWEBBROWSERCHROME_IID_STR);
+
+- public nsIWebBrowserChrome(int /*long*/ address) {
++ public nsIWebBrowserChrome(long /*int*/ address) {
+ super(address);
+ }
+
@@ -51,11 +51,11 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
- }
-
-- public int GetWebBrowser(int /*long*/[] aWebBrowser) {
-+ public int GetWebBrowser(long /*int*/[] aWebBrowser) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
- }
-
-- public int SetWebBrowser(int /*long*/ aWebBrowser) {
-+ public int SetWebBrowser(long /*int*/ aWebBrowser) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2009-02-11 17:43:48.000000000 -0500
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
+ }
+
+- public int GetWebBrowser(int /*long*/[] aWebBrowser) {
++ public int GetWebBrowser(long /*int*/[] aWebBrowser) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
+ }
+
+- public int SetWebBrowser(int /*long*/ aWebBrowser) {
++ public int SetWebBrowser(long /*int*/ aWebBrowser) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IWEBBROWSERFOCUS_IID =
new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
@@ -30077,9 +28058,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java x86_64/org
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,35 +37,35 @@
public static final nsID NS_IWEBBROWSER_IID =
new nsID(NS_IWEBBROWSER_IID_STR);
@@ -30125,9 +28106,43 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java x86_64/org/ecli
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2009-02-20 14:12:54.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_IWEBBROWSERSETUP_IID =
+ new nsID(NS_IWEBBROWSERSETUP_IID_STR);
+
+- public nsIWebBrowserSetup(int /*long*/ address) {
++ public nsIWebBrowserSetup(long /*int*/ address) {
+ super(address);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2009-03-31 13:05:56.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,15 +37,15 @@
+ public static final nsID NS_IWEBBROWSERSTREAM_IID =
+ new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
+
+- public nsIWebBrowserStream(int /*long*/ address) {
++ public nsIWebBrowserStream(long /*int*/ address) {
+ super(address);
+ }
+
+- public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
++ public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
+ }
+
+- public int AppendToStream(int /*long*/ aData, int aLen) {
++ public int AppendToStream(long /*int*/ aData, int aLen) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2007-04-24 17:35:12.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IWEBNAVIGATIONINFO_IID =
new nsID(NS_IWEBNAVIGATIONINFO_IID_STR);
@@ -30147,91 +28162,90 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java x86_64/o
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBNAVIGATION_IID =
- new nsID(NS_IWEBNAVIGATION_IID_STR);
-
-- public nsIWebNavigation(int /*long*/ address) {
-+ public nsIWebNavigation(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IWEBNAVIGATION_IID =
+ new nsID(NS_IWEBNAVIGATION_IID_STR);
+
+- public nsIWebNavigation(int /*long*/ address) {
++ public nsIWebNavigation(long /*int*/ address) {
+ super(address);
+ }
+
@@ -79,7 +79,7 @@
-
- public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
-
-- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
-+ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
- }
-
+
+ public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
+
+- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
++ public int LoadURI(char[] uri, int loadFlags, long /*int*/ referrer, long /*int*/ postData, long /*int*/ headers) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
+ }
+
@@ -97,23 +97,23 @@
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
- }
-
-- public int GetDocument(int /*long*/[] aDocument) {
-+ public int GetDocument(long /*int*/[] aDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
- }
-
-- public int GetCurrentURI(int /*long*/[] aCurrentURI) {
-+ public int GetCurrentURI(long /*int*/[] aCurrentURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
- }
-
-- public int GetReferringURI(int /*long*/[] aReferringURI) {
-+ public int GetReferringURI(long /*int*/[] aReferringURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
- }
-
-- public int GetSessionHistory(int /*long*/[] aSessionHistory) {
-+ public int GetSessionHistory(long /*int*/[] aSessionHistory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
- }
-
-- public int SetSessionHistory(int /*long*/ aSessionHistory) {
-+ public int SetSessionHistory(long /*int*/ aSessionHistory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
- }
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
+ }
+
+- public int GetDocument(int /*long*/[] aDocument) {
++ public int GetDocument(long /*int*/[] aDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
+ }
+
+- public int GetCurrentURI(int /*long*/[] aCurrentURI) {
++ public int GetCurrentURI(long /*int*/[] aCurrentURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
+ }
+
+- public int GetReferringURI(int /*long*/[] aReferringURI) {
++ public int GetReferringURI(long /*int*/[] aReferringURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
+ }
+
+- public int GetSessionHistory(int /*long*/[] aSessionHistory) {
++ public int GetSessionHistory(long /*int*/[] aSessionHistory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
+ }
+
+- public int SetSessionHistory(int /*long*/ aSessionHistory) {
++ public int SetSessionHistory(long /*int*/ aSessionHistory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2008-10-22 16:02:54.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgress.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
- public static final nsID NS_IWEBPROGRESS_IID =
- new nsID(NS_IWEBPROGRESS_IID_STR);
-
-- public nsIWebProgress(int /*long*/ address) {
-+ public nsIWebProgress(long /*int*/ address) {
- super(address);
- }
-
+ public static final nsID NS_IWEBPROGRESS_IID =
+ new nsID(NS_IWEBPROGRESS_IID_STR);
+
+- public nsIWebProgress(int /*long*/ address) {
++ public nsIWebProgress(long /*int*/ address) {
+ super(address);
+ }
+
@@ -61,15 +61,15 @@
-
- public static final int NOTIFY_ALL = 255;
-
-- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
-+ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
- }
-
-- public int RemoveProgressListener(int /*long*/ listener) {
-+ public int RemoveProgressListener(long /*int*/ listener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
- }
-
-- public int GetDOMWindow(int /*long*/[] aDOMWindow) {
-+ public int GetDOMWindow(long /*int*/[] aDOMWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
- }
-
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2009-02-11 17:43:48.000000000 -0500
+
+ public static final int NOTIFY_ALL = 255;
+
+- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
++ public int AddProgressListener(long /*int*/ listener, int aNotifyMask) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
+ }
+
+- public int RemoveProgressListener(int /*long*/ listener) {
++ public int RemoveProgressListener(long /*int*/ listener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
+ }
+
+- public int GetDOMWindow(int /*long*/[] aDOMWindow) {
++ public int GetDOMWindow(long /*int*/[] aDOMWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
+ }
+
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2006-10-26 11:24:38.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IWEBPROGRESSLISTENER2_IID =
new nsID(NS_IWEBPROGRESSLISTENER2_IID_STR);
@@ -30246,9 +28260,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java x86_6
return XPCOM.VtblCall(nsIWebProgressListener.LAST_METHOD_ID + 1, getAddress(), aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress);
}
}
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,7 +37,7 @@
public static final nsID NS_IWEBPROGRESSLISTENER_IID =
new nsID(NS_IWEBPROGRESSLISTENER_IID_STR);
@@ -30288,29 +28302,28 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java x86_64
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2008-10-22 16:17:00.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,13 +37,13 @@
- public static final nsID NS_IWINDOWCREATOR2_IID =
- new nsID(NS_IWINDOWCREATOR2_IID_STR);
-
-- public nsIWindowCreator2(int /*long*/ address) {
-+ public nsIWindowCreator2(long /*int*/ address) {
- super(address);
- }
-
- public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
-
-- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
-+ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {
- return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
- }
+ public static final nsID NS_IWINDOWCREATOR2_IID =
+ new nsID(NS_IWINDOWCREATOR2_IID_STR);
+
+- public nsIWindowCreator2(int /*long*/ address) {
++ public nsIWindowCreator2(long /*int*/ address) {
+ super(address);
+ }
+
+ public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
+
+- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
++ public int CreateChromeWindow2(long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, int[] cancel, long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
+ }
}
-\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2007-03-02 11:13:26.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,11 +37,11 @@
public static final nsID NS_IWINDOWCREATOR_IID =
new nsID(NS_IWINDOWCREATOR_IID_STR);
@@ -30326,9 +28339,9 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java x86_64/org/e
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
---- x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2006-05-09 14:54:24.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java 2009-09-17 08:48:22.000000000 -0400
@@ -37,51 +37,51 @@
public static final nsID NS_IWINDOWWATCHER_IID =
new nsID(NS_IWINDOWWATCHER_IID_STR);
@@ -30394,408 +28407,2770 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java x86_64/org/e
}
}
\ No newline at end of file
-diff -ur x86/org/eclipse/swt/internal/mozilla/XPCOMInit.java x86_64/org/eclipse/swt/internal/mozilla/XPCOMInit.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOMInit.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOMInit.java 2009-02-11 17:43:48.000000000 -0500
-@@ -33,7 +33,7 @@
- public static final int PATH_MAX = 4096;
-
- public static final native int GREVersionRange_sizeof ();
--public static final native int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
-+public static final native int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, long /*int*/ properties, int propertiesLength, long /*int*/ buffer, int buflen);
- public static final native int XPCOMGlueStartup (byte[] place);
- public static final native int XPCOMGlueShutdown ();
- }
-diff -ur x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-02-11 17:43:48.000000000 -0500
-@@ -124,183 +124,183 @@
- public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
- public static final int NS_ERROR_FILE_UNRECOGNIZED_PATH = 0x80520001;
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2008-12-02 11:18:44.000000000 -0500
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java 2009-09-17 08:48:22.000000000 -0400
+@@ -11,7 +11,7 @@
+ public static final nsID NS_IWRITABLEVARIANT_IID =
+ new nsID(NS_IWRITABLEVARIANT_IID_STR);
+
+- public nsIWritableVariant(int /*long*/ address) {
++ public nsIWritableVariant(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -75,23 +75,23 @@
+ // return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
+ // }
+
+- public int SetAsID(int /*long*/ aValue) {
++ public int SetAsID(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
+ }
+
+- public int SetAsAString(int /*long*/ aValue) {
++ public int SetAsAString(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
+ }
+
+- public int SetAsDOMString(int /*long*/ aValue) {
++ public int SetAsDOMString(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
+ }
+
+- public int SetAsACString(int /*long*/ aValue) {
++ public int SetAsACString(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
+ }
+
+- public int SetAsAUTF8String(int /*long*/ aValue) {
++ public int SetAsAUTF8String(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
+ }
+
+@@ -103,15 +103,15 @@
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
+ }
+
+- public int SetAsISupports(int /*long*/ aValue) {
++ public int SetAsISupports(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
+ }
+
+- public int SetAsInterface(nsID iid, int /*long*/ iface) {
++ public int SetAsInterface(nsID iid, long /*int*/ iface) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
+ }
+
+- public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
++ public int SetAsArray(short type, long /*int*/ iid, int count, long /*int*/ ptr) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
+ }
+
+@@ -135,7 +135,7 @@
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
+ }
+
+- public int SetFromVariant(int /*long*/ aValue) {
++ public int SetFromVariant(long /*int*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
+ }
+ }
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2009-08-19 16:24:46.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509Cert.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,87 +37,87 @@
+ public static final nsID NS_IX509CERT_IID =
+ new nsID(NS_IX509CERT_IID_STR);
+
+- public nsIX509Cert(int /*long*/ address) {
++ public nsIX509Cert(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetNickname(int /*long*/ aNickname) {
++ public int GetNickname(long /*int*/ aNickname) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
+ }
+
+- public int GetEmailAddress(int /*long*/ aEmailAddress) {
++ public int GetEmailAddress(long /*int*/ aEmailAddress) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
+ }
+
+- public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
++ public int GetEmailAddresses(int[] length, long /*int*/[] addresses) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
+ }
+
+- public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
++ public int ContainsEmailAddress(long /*int*/ aEmailAddress, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
+ }
+
+- public int GetSubjectName(int /*long*/ aSubjectName) {
++ public int GetSubjectName(long /*int*/ aSubjectName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
+ }
+
+- public int GetCommonName(int /*long*/ aCommonName) {
++ public int GetCommonName(long /*int*/ aCommonName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
+ }
+
+- public int GetOrganization(int /*long*/ aOrganization) {
++ public int GetOrganization(long /*int*/ aOrganization) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
+ }
+
+- public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
++ public int GetOrganizationalUnit(long /*int*/ aOrganizationalUnit) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
+ }
+
+- public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
++ public int GetSha1Fingerprint(long /*int*/ aSha1Fingerprint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
+ }
+
+- public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
++ public int GetMd5Fingerprint(long /*int*/ aMd5Fingerprint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
+ }
+
+- public int GetTokenName(int /*long*/ aTokenName) {
++ public int GetTokenName(long /*int*/ aTokenName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
+ }
+
+- public int GetIssuerName(int /*long*/ aIssuerName) {
++ public int GetIssuerName(long /*int*/ aIssuerName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
+ }
+
+- public int GetSerialNumber(int /*long*/ aSerialNumber) {
++ public int GetSerialNumber(long /*int*/ aSerialNumber) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
+ }
+
+- public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
++ public int GetIssuerCommonName(long /*int*/ aIssuerCommonName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
+ }
+
+- public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
++ public int GetIssuerOrganization(long /*int*/ aIssuerOrganization) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
+ }
+
+- public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
++ public int GetIssuerOrganizationUnit(long /*int*/ aIssuerOrganizationUnit) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
+ }
+
+- public int GetIssuer(int /*long*/[] aIssuer) {
++ public int GetIssuer(long /*int*/[] aIssuer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
+ }
+
+- public int GetValidity(int /*long*/[] aValidity) {
++ public int GetValidity(long /*int*/[] aValidity) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
+ }
+
+- public int GetDbKey(int /*long*/[] aDbKey) {
++ public int GetDbKey(long /*int*/[] aDbKey) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
+ }
+
+- public int GetWindowTitle(int /*long*/[] aWindowTitle) {
++ public int GetWindowTitle(long /*int*/[] aWindowTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
+ }
+
+@@ -173,15 +173,15 @@
+
+ public static final int CERT_USAGE_AnyCA = 11;
+
+- public int GetChain(int /*long*/[] _retval) {
++ public int GetChain(long /*int*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+- public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
++ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, long /*int*/[] usages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
+ }
+
+- public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
++ public int GetUsagesString(int ignoreOcsp, int[] verified, long /*int*/ usages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
+ }
+
+@@ -189,15 +189,15 @@
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
+ }
+
+- public int GetASN1Structure(int /*long*/[] aASN1Structure) {
++ public int GetASN1Structure(long /*int*/[] aASN1Structure) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
+ }
+
+- public int GetRawDER(int[] length, int /*long*/[] data) {
++ public int GetRawDER(int[] length, long /*int*/[] data) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
+ }
+
+- public int Equals(int /*long*/ other, int[] _retval) {
++ public int Equals(long /*int*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2009-08-19 16:24:46.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,39 +37,39 @@
+ public static final nsID NS_IX509CERTVALIDITY_IID =
+ new nsID(NS_IX509CERTVALIDITY_IID_STR);
+
+- public nsIX509CertValidity(int /*long*/ address) {
++ public nsIX509CertValidity(long /*int*/ address) {
+ super(address);
+ }
+
+- public int GetNotBefore(int /*long*/ aNotBefore) {
++ public int GetNotBefore(long /*int*/ aNotBefore) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
+ }
+
+- public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
++ public int GetNotBeforeLocalTime(long /*int*/ aNotBeforeLocalTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
+ }
+
+- public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
++ public int GetNotBeforeLocalDay(long /*int*/ aNotBeforeLocalDay) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
+ }
+
+- public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
++ public int GetNotBeforeGMT(long /*int*/ aNotBeforeGMT) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
+ }
+
+- public int GetNotAfter(int /*long*/ aNotAfter) {
++ public int GetNotAfter(long /*int*/ aNotAfter) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
+ }
+
+- public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
++ public int GetNotAfterLocalTime(long /*int*/ aNotAfterLocalTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
+ }
+- public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
++ public int GetNotAfterLocalDay(long /*int*/ aNotAfterLocalDay) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
+ }
+
+- public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
++ public int GetNotAfterGMT(long /*int*/ aNotAfterGMT) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+--- x86/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2009-04-08 14:54:52.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java 2009-09-17 08:48:22.000000000 -0400
+@@ -37,7 +37,7 @@
+ public static final nsID NS_IXPCSECURITYMANAGER_IID =
+ new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
+
+- public nsIXPCSecurityManager(int /*long*/ address) {
++ public nsIXPCSecurityManager(long /*int*/ address) {
+ super(address);
+ }
+
+@@ -55,15 +55,15 @@
+
+ public static final int HOOK_ALL = 63;
+
+- public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
++ public int CanCreateWrapper(long /*int*/ aJSContext, nsID aIID, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/[] aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
+ }
+
+- public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
++ public int CanCreateInstance(long /*int*/ aJSContext, nsID aCID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
+ }
+
+- public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
++ public int CanGetService(long /*int*/ aJSContext, nsID aCID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
+ }
+
+@@ -73,7 +73,7 @@
+
+ public static final int ACCESS_SET_PROPERTY = 2;
+
+- public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
++ public int CanAccess(int aAction, long /*int*/ aCallContext, long /*int*/ aJSContext, long /*int*/ aJSObject, long /*int*/ aObj, long /*int*/ aClassInfo, long /*int*/ aName, long /*int*/[] aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
+ }
+ }
+\ No newline at end of file
+diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOM.java x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java
+--- x86/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-08-19 16:24:48.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/XPCOM.java 2009-09-17 08:48:20.000000000 -0400
+@@ -139,25 +139,25 @@
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+-public static final native void memmove (int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
++public static final native void memmove (long /*int*/ dest, nsDynamicFunctionLoad src, long /*int*/ size);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param nbytes cast=(size_t)
+ */
-public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
--public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
--public static final native int NS_GetComponentManager(int /*long*/[] result);
--public static final native int NS_GetServiceManager(int /*long*/[] result);
--public static final native int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
--public static final native int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
--public static final native int strlen_PRUnichar(int /*long*/ s);
--public static final native int /*long*/ nsEmbedCString_new();
--public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length);
--public static final native int /*long*/ nsEmbedCString_new(int aString, int length);
--public static final native void nsEmbedCString_delete(int /*long*/ ptr);
--public static final native int nsEmbedCString_Length(int /*long*/ ptr);
--public static final native int /*long*/ nsEmbedCString_get(int /*long*/ ptr);
--public static final native void nsID_delete(int /*long*/ ptr);
--public static final native int /*long*/ nsID_new();
--public static final native int nsID_Equals(int /*long*/ ptr, int /*long*/ other);
--public static final native int /*long*/ nsEmbedString_new();
--public static final native int /*long*/ nsEmbedString_new(char[] aString);
--public static final native void nsEmbedString_delete(int /*long*/ ptr);
--public static final native int nsEmbedString_Length(int /*long*/ ptr);
--public static final native int /*long*/ nsEmbedString_get(int /*long*/ ptr);
+public static final native void memmove(nsID dest, long /*int*/ src, int nbytes);
+ /**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param nbytes cast=(size_t)
+ */
+-public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
+public static final native void memmove(long /*int*/ dest, nsID src, int nbytes);
-+public static final native int NS_GetComponentManager(long /*int*/[] result);
-+public static final native int NS_GetServiceManager(long /*int*/[] result);
-+public static final native int NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider);
-+public static final native int NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result);
+ /** @method flags=no_gen */
+-public static final native int strlen_PRUnichar(int /*long*/ s);
+public static final native int strlen_PRUnichar(long /*int*/ s);
-+public static final native long /*int*/ nsEmbedCString_new();
-+public static final native long /*int*/ nsEmbedCString_new(byte[] aString, int length);
-+public static final native long /*int*/ nsEmbedCString_new(int aString, int length);
-+public static final native void nsEmbedCString_delete(long /*int*/ ptr);
-+public static final native int nsEmbedCString_Length(long /*int*/ ptr);
-+public static final native long /*int*/ nsEmbedCString_get(long /*int*/ ptr);
-+public static final native void nsID_delete(long /*int*/ ptr);
-+public static final native long /*int*/ nsID_new();
-+public static final native int nsID_Equals(long /*int*/ ptr, long /*int*/ other);
-+public static final native long /*int*/ nsEmbedString_new();
-+public static final native long /*int*/ nsEmbedString_new(char[] aString);
-+public static final native void nsEmbedString_delete(long /*int*/ ptr);
-+public static final native int nsEmbedString_Length(long /*int*/ ptr);
-+public static final native long /*int*/ nsEmbedString_get(long /*int*/ ptr);
- public static final native int XPCOMGlueStartup(byte[] place);
- public static final native int XPCOMGlueShutdown();
-
--public static final native int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
-+public static final native long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
-
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long [] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
--
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
--static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long [] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
-+
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
-+static final native int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
- }
-diff -ur x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java
---- x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-02-11 17:43:48.000000000 -0500
-@@ -16,7 +16,7 @@
-
- public class XPCOMObject {
+ /** @method flags=no_gen */
+-public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal);
+-public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) {
++public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal);
++public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, long /*int*/ cx, long /*int*/ obj, long /*int*/ principals, char[] chars, int length, byte[] filename, int lineno, long /*int*/[] retVal) {
+ lock.lock();
+ try {
+ return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
+@@ -167,8 +167,8 @@
+ }
+
+ /** @param result cast=(nsIComponentManager**) */
+-public static final native int _NS_GetComponentManager(int /*long*/[] result);
+-public static final int NS_GetComponentManager(int /*long*/[] result) {
++public static final native int _NS_GetComponentManager(long /*int*/[] result);
++public static final int NS_GetComponentManager(long /*int*/[] result) {
+ lock.lock();
+ try {
+ return _NS_GetComponentManager(result);
+@@ -177,8 +177,8 @@
+ }
+ }
+ /** @param result cast=(nsIServiceManager**) */
+-public static final native int _NS_GetServiceManager(int /*long*/[] result);
+-public static final int NS_GetServiceManager(int /*long*/[] result) {
++public static final native int _NS_GetServiceManager(long /*int*/[] result);
++public static final int NS_GetServiceManager(long /*int*/[] result) {
+ lock.lock();
+ try {
+ return _NS_GetServiceManager(result);
+@@ -191,8 +191,8 @@
+ * @param binDirectory cast=(nsIFile *)
+ * @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
+ */
+-public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
+-public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) {
++public static final native int _NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider);
++public static final int NS_InitXPCOM2(long /*int*/ result, long /*int*/ binDirectory, long /*int*/ appFileLocationProvider) {
+ lock.lock();
+ try {
+ return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
+@@ -204,8 +204,8 @@
+ * @param path cast=(nsAString *),flags=struct
+ * @param result cast=(nsILocalFile**)
+ */
+-public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
+-public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) {
++public static final native int _NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result);
++public static final int NS_NewLocalFile(long /*int*/ path, int followLinks, long /*int*/[] result) {
+ lock.lock();
+ try {
+ return _NS_NewLocalFile(path, followLinks, result);
+@@ -214,8 +214,8 @@
+ }
+ }
+ /** @method flags=new */
+-public static final native int /*long*/ _nsEmbedCString_new();
+-public static final int /*long*/ nsEmbedCString_new() {
++public static final native long /*int*/ _nsEmbedCString_new();
++public static final long /*int*/ nsEmbedCString_new() {
+ lock.lock();
+ try {
+ return _nsEmbedCString_new();
+@@ -227,8 +227,8 @@
+ * @method flags=new
+ * @param aString cast=(const char *)
+ */
+-public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length);
+-public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) {
++public static final native long /*int*/ _nsEmbedCString_new(byte[] aString, int length);
++public static final long /*int*/ nsEmbedCString_new(byte[] aString, int length) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_new(aString, length);
+@@ -240,8 +240,8 @@
+ * @method flags=new
+ * @param aString cast=(const char *)
+ */
+-public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length);
+-public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) {
++public static final native long /*int*/ _nsEmbedCString_new(long /*int*/ aString, int length);
++public static final long /*int*/ nsEmbedCString_new(long /*int*/ aString, int length) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_new(aString, length);
+@@ -253,8 +253,8 @@
+ * @method flags=delete
+ * @param ptr cast=(nsEmbedCString *)
+ */
+-public static final native void _nsEmbedCString_delete(int /*long*/ ptr);
+-public static final void nsEmbedCString_delete(int /*long*/ ptr) {
++public static final native void _nsEmbedCString_delete(long /*int*/ ptr);
++public static final void nsEmbedCString_delete(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ _nsEmbedCString_delete(ptr);
+@@ -266,8 +266,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedCString *)
+ */
+-public static final native int _nsEmbedCString_Length(int /*long*/ ptr);
+-public static final int nsEmbedCString_Length(int /*long*/ ptr) {
++public static final native int _nsEmbedCString_Length(long /*int*/ ptr);
++public static final int nsEmbedCString_Length(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_Length(ptr);
+@@ -279,8 +279,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+-public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang);
+-public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) {
++public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang);
++public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(long /*int*/ ptr, int lang) {
+ lock.lock();
+ try {
+ return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
+@@ -292,8 +292,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang);
+-public static final int /*long*/ nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang) {
++public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptGlobal(long /*int*/ ptr, int lang);
++public static final long /*int*/ nsIScriptGlobalObject_GetScriptGlobal(long /*int*/ ptr, int lang) {
+ lock.lock();
+ try {
+ return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang);
+@@ -305,8 +305,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+-public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang);
+-public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) {
++public static final native long /*int*/ _nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang);
++public static final long /*int*/ nsIScriptGlobalObject_GetScriptContext(long /*int*/ ptr, int lang) {
+ lock.lock();
+ try {
+ return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
+@@ -318,8 +318,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptContext *)
+ */
+-public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);
+-public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {
++public static final native long /*int*/ _nsIScriptContext_GetNativeContext(long /*int*/ ptr);
++public static final long /*int*/ nsIScriptContext_GetNativeContext(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ return _nsIScriptContext_GetNativeContext(ptr);
+@@ -332,8 +332,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedCString *)
+ */
+-public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr);
+-public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
++public static final native long /*int*/ _nsEmbedCString_get(long /*int*/ ptr);
++public static final long /*int*/ nsEmbedCString_get(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_get(ptr);
+@@ -345,8 +345,8 @@
+ * @method flags=delete
+ * @param ptr cast=(nsID *)
+ */
+-public static final native void _nsID_delete(int /*long*/ ptr);
+-public static final void nsID_delete(int /*long*/ ptr) {
++public static final native void _nsID_delete(long /*int*/ ptr);
++public static final void nsID_delete(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ _nsID_delete(ptr);
+@@ -355,8 +355,8 @@
+ }
+ }
+ /** @method flags=new */
+-public static final native int /*long*/ _nsID_new();
+-public static final int /*long*/ nsID_new() {
++public static final native long /*int*/ _nsID_new();
++public static final long /*int*/ nsID_new() {
+ lock.lock();
+ try {
+ return _nsID_new();
+@@ -369,8 +369,8 @@
+ * @param ptr cast=(nsID *)
+ * @param other cast=(nsID *),flags=struct
+ */
+-public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other);
+-public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
++public static final native int _nsID_Equals(long /*int*/ ptr, long /*int*/ other);
++public static final int nsID_Equals(long /*int*/ ptr, long /*int*/ other) {
+ lock.lock();
+ try {
+ return _nsID_Equals(ptr, other);
+@@ -379,8 +379,8 @@
+ }
+ }
+ /** @method flags=new */
+-public static final native int /*long*/ _nsEmbedString_new();
+-public static final int /*long*/ nsEmbedString_new() {
++public static final native long /*int*/ _nsEmbedString_new();
++public static final long /*int*/ nsEmbedString_new() {
+ lock.lock();
+ try {
+ return _nsEmbedString_new();
+@@ -392,8 +392,8 @@
+ * @method flags=new
+ * @param aString cast=(PRUnichar *)
+ */
+-public static final native int /*long*/ _nsEmbedString_new(char[] aString);
+-public static final int /*long*/ nsEmbedString_new(char[] aString) {
++public static final native long /*int*/ _nsEmbedString_new(char[] aString);
++public static final long /*int*/ nsEmbedString_new(char[] aString) {
+ lock.lock();
+ try {
+ return _nsEmbedString_new(aString);
+@@ -405,8 +405,8 @@
+ * @method flags=delete
+ * @param ptr cast=(nsEmbedString *)
+ */
+-public static final native void _nsEmbedString_delete(int /*long*/ ptr);
+-public static final void nsEmbedString_delete(int /*long*/ ptr) {
++public static final native void _nsEmbedString_delete(long /*int*/ ptr);
++public static final void nsEmbedString_delete(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ _nsEmbedString_delete(ptr);
+@@ -418,8 +418,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedString *)
+ */
+-public static final native int _nsEmbedString_Length(int /*long*/ ptr);
+-public static final int nsEmbedString_Length(int /*long*/ ptr) {
++public static final native int _nsEmbedString_Length(long /*int*/ ptr);
++public static final int nsEmbedString_Length(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedString_Length(ptr);
+@@ -431,8 +431,8 @@
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedString *)
+ */
+-public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr);
+-public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
++public static final native long /*int*/ _nsEmbedString_get(long /*int*/ ptr);
++public static final long /*int*/ nsEmbedString_get(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedString_get(ptr);
+@@ -445,8 +445,8 @@
+ * @param ptr cast=(nsIMemory *)
+ * @param size cast=(size_t)
+ */
+-public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size);
+-public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
++public static final native long /*int*/ _nsIMemory_Alloc(long /*int*/ ptr, int size);
++public static final long /*int*/ nsIMemory_Alloc(long /*int*/ ptr, int size) {
+ lock.lock();
+ try {
+ return _nsIMemory_Alloc(ptr, size);
+@@ -460,8 +460,8 @@
+ * @param ptr2 cast=(void *)
+ * @param size cast=(size_t)
+ */
+-public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size);
+-public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) {
++public static final native long /*int*/ _nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size);
++public static final long /*int*/ nsIMemory_Realloc(long /*int*/ ptr1, long /*int*/ ptr2, int size) {
+ lock.lock();
+ try {
+ return _nsIMemory_Realloc(ptr1, ptr2, size);
+@@ -470,8 +470,8 @@
+ }
+ }
+ /** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
+-public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad);
+-public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) {
++public static final native int _XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad);
++public static final int XPCOMGlueLoadXULFunctions (long /*int*/ functionLoad) {
+ lock.lock();
+ try {
+ return _XPCOMGlueLoadXULFunctions(functionLoad);
+@@ -499,8 +499,8 @@
+ }
+ }
+
+-public static final native int _Call(int /*long*/ ptr);
+-public static final int Call(int /*long*/ ptr) {
++public static final native int _Call(long /*int*/ ptr);
++public static final int Call(long /*int*/ ptr) {
+ lock.lock();
+ try {
+ return _Call(ptr);
+@@ -516,8 +516,8 @@
+ * @param aFromSegment cast=(const char *)
+ * @param aWriteCount cast=(PRUint32 *)
+ */
+-public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
+-public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
++public static final native long /*int*/ _Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
++public static final long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, long /*int*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
+ lock.lock();
+ try {
+ return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
+@@ -533,8 +533,8 @@
+ * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
+ * @param aStaticComponents cast=(nsStaticModuleInfo const *)
+ */
+-public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount);
+-public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) {
++public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount);
++public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) {
+ lock.lock();
+ try {
+ return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
+@@ -543,8 +543,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl);
+@@ -553,8 +553,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -562,8 +562,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -571,8 +571,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, double arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -580,8 +580,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -589,8 +589,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, float[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -598,8 +598,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -607,8 +607,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -616,8 +616,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -625,8 +625,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -634,8 +634,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+@@ -644,8 +644,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -653,8 +653,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -662,8 +662,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -671,8 +671,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -680,8 +680,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long [] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -689,8 +689,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -698,8 +698,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -707,8 +707,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -716,8 +716,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -725,8 +725,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -734,8 +734,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -743,8 +743,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -752,8 +752,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -761,8 +761,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -770,8 +770,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -779,8 +779,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -788,8 +788,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -797,8 +797,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -806,8 +806,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -815,8 +815,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, char[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -824,8 +824,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -833,8 +833,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -842,8 +842,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -852,8 +852,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -861,8 +861,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -870,8 +870,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -879,8 +879,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -888,8 +888,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -897,8 +897,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+@@ -906,8 +906,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -915,8 +915,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -924,8 +924,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -934,8 +934,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -943,8 +943,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -953,8 +953,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -962,8 +962,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -971,8 +971,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -980,8 +980,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -989,8 +989,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -998,8 +998,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1007,8 +1007,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1016,8 +1016,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1025,8 +1025,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1034,8 +1034,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1043,8 +1043,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1052,8 +1052,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1061,8 +1061,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1070,8 +1070,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1079,8 +1079,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1088,8 +1088,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1097,8 +1097,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1106,8 +1106,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1115,8 +1115,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1124,8 +1124,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1133,8 +1133,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1142,8 +1142,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1151,8 +1151,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1160,8 +1160,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1169,8 +1169,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1178,8 +1178,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1187,8 +1187,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1196,8 +1196,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1205,8 +1205,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1214,8 +1214,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1223,8 +1223,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1232,8 +1232,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1241,8 +1241,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1250,8 +1250,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1259,8 +1259,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1268,8 +1268,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1277,8 +1277,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1286,8 +1286,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1295,8 +1295,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1304,8 +1304,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1313,8 +1313,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1322,8 +1322,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+@@ -1332,8 +1332,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1341,8 +1341,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1350,8 +1350,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1359,8 +1359,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1368,8 +1368,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1377,8 +1377,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1386,8 +1386,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1395,8 +1395,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1404,8 +1404,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1413,8 +1413,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1422,8 +1422,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1431,8 +1431,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1440,8 +1440,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1449,8 +1449,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1458,8 +1458,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1467,8 +1467,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1476,8 +1476,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1485,8 +1485,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1494,8 +1494,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1503,8 +1503,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1512,8 +1512,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1521,8 +1521,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1530,8 +1530,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1539,8 +1539,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1548,8 +1548,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1557,8 +1557,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1566,8 +1566,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1575,8 +1575,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1584,8 +1584,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1593,8 +1593,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1602,8 +1602,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1611,8 +1611,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1620,8 +1620,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1629,8 +1629,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+@@ -1639,8 +1639,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1648,8 +1648,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1657,8 +1657,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1666,8 +1666,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1675,8 +1675,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1684,8 +1684,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1693,8 +1693,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1702,8 +1702,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1711,8 +1711,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1720,8 +1720,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1730,8 +1730,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1739,8 +1739,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1748,8 +1748,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1757,8 +1757,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+@@ -1767,8 +1767,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1776,8 +1776,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1785,8 +1785,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1794,8 +1794,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1803,8 +1803,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1812,8 +1812,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1821,8 +1821,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1831,8 +1831,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1840,8 +1840,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1849,8 +1849,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1858,8 +1858,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1868,8 +1868,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1877,8 +1877,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1886,8 +1886,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1895,8 +1895,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1904,8 +1904,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1913,8 +1913,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1922,8 +1922,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1931,8 +1931,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1940,8 +1940,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1949,8 +1949,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1958,8 +1958,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1967,8 +1967,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1976,8 +1976,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1985,8 +1985,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -1994,8 +1994,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -2003,8 +2003,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -2012,8 +2012,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+@@ -2022,8 +2022,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2031,8 +2031,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2040,8 +2040,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2049,8 +2049,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2058,8 +2058,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2067,8 +2067,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2076,8 +2076,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2085,8 +2085,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2094,8 +2094,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2103,8 +2103,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+@@ -2113,8 +2113,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+@@ -2122,8 +2122,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+@@ -2131,8 +2131,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+@@ -2140,8 +2140,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+@@ -2150,8 +2150,8 @@
+ }
+ }
+
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+@@ -2159,8 +2159,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+@@ -2168,8 +2168,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+@@ -2177,8 +2177,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+@@ -2186,8 +2186,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+@@ -2195,8 +2195,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+@@ -2204,8 +2204,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+@@ -2213,8 +2213,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+@@ -2222,8 +2222,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+@@ -2231,8 +2231,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+@@ -2240,8 +2240,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
+@@ -2249,8 +2249,8 @@
+ lock.unlock();
+ }
+ }
+-static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
+-static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
++static final native int _VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
++static final int VtblCall(int fnNumber, long /*int*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
+diff -urN x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+--- x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/mozilla/XPCOMObject.java 2009-09-17 08:48:20.000000000 -0400
+@@ -21,7 +21,7 @@
+ IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
+ }
+
- private int /*long*/ ppVtable;
+ private long /*int*/ ppVtable;
-
+
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
-@@ -24,7 +24,7 @@
- static private Hashtable ObjectMap = new Hashtable ();
+@@ -31,7 +31,7 @@
+
public XPCOMObject (int[] argCounts) {
-- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length];
-+ long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length];
+- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET];
++ long /*int*/[] callbackAddresses = new long /*int*/[argCounts.length + OS_OFFSET];
synchronized (Callbacks) {
- for (int i = 0, length = argCounts.length; i < length; i++){
- if ((Callbacks[i][argCounts[i]]) == null) {
-@@ -35,737 +35,737 @@
+ for (int i = 0, length = argCounts.length; i < length; i++) {
+ if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
+@@ -42,737 +42,737 @@
}
}
-- int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * argCounts.length);
-+ long /*int*/ pVtable = C.malloc (C.PTR_SIZEOF * argCounts.length);
- XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * argCounts.length);
+- int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
++ long /*int*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
+ XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
ppVtable = C.malloc (C.PTR_SIZEOF);
- XPCOM.memmove (ppVtable, new int /*long*/[] {pVtable}, C.PTR_SIZEOF);
+ XPCOM.memmove (ppVtable, new long /*int*/[] {pVtable}, C.PTR_SIZEOF);
@@ -31770,7 +32145,7 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclips
XPCOM.memmove (pVtable, ppVtable, C.PTR_SIZEOF);
C.free (pVtable[0]);
C.free (ppVtable);
-@@ -776,248 +776,248 @@
+@@ -783,248 +783,248 @@
ppVtable = 0;
}
@@ -32100,13 +32475,13 @@ diff -ur x86/org/eclipse/swt/internal/mozilla/XPCOMObject.java x86_64/org/eclips
return XPCOM.NS_ERROR_NOT_IMPLEMENTED;
}
}
-diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java
---- x86/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-02-11 17:43:48.000000000 -0500
-@@ -220,8 +220,8 @@
- lock.unlock();
+diff -urN x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java
+--- x86/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-05-29 17:30:30.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/opengl/glx/GLX.java 2009-09-17 08:48:22.000000000 -0400
+@@ -231,8 +231,8 @@
}
}
+ /** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList);
-public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList) {
+public static final native long /*int*/ _glXChooseVisual(long /*int*/ dpy, int screen, int[] attribList);
@@ -32114,10 +32489,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXChooseVisual(dpy, screen, attribList);
-@@ -229,8 +229,8 @@
- lock.unlock();
- }
- }
+@@ -245,8 +245,8 @@
+ * @param src cast=(GLXContext)
+ * @param dst cast=(GLXContext)
+ */
-public static final native void _glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask);
-public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask) {
+public static final native void _glXCopyContext(long /*int*/ dpy, long /*int*/ src, long /*int*/ dst, int mask);
@@ -32125,10 +32500,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
_glXCopyContext(dpy, src, dst, mask);
-@@ -238,8 +238,8 @@
- lock.unlock();
- }
- }
+@@ -258,8 +258,8 @@
+ * @param dpy cast=(Display *)
+ * @param shareList cast=(GLXContext)
+ */
-public static final native int /*long*/ _glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct);
-public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct) {
+public static final native long /*int*/ _glXCreateContext(long /*int*/ dpy, XVisualInfo vis, long /*int*/ shareList, boolean direct);
@@ -32136,10 +32511,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXCreateContext(dpy, vis, shareList, direct);
-@@ -247,8 +247,8 @@
- lock.unlock();
- }
- }
+@@ -271,8 +271,8 @@
+ * @param dpy cast=(Display *)
+ * @param pixmap cast=(Pixmap)
+ */
-public static final native int /*long*/ _glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap);
-public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap) {
+public static final native long /*int*/ _glXCreateGLXPixmap(long /*int*/ dpy, XVisualInfo vis, long /*int*/ pixmap);
@@ -32147,10 +32522,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXCreateGLXPixmap(dpy, vis, pixmap);
-@@ -256,8 +256,8 @@
- lock.unlock();
- }
- }
+@@ -284,8 +284,8 @@
+ * @param dpy cast=(Display *)
+ * @param ctx cast=(GLXContext)
+ */
-public static final native void _glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx);
-public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {
+public static final native void _glXDestroyContext(long /*int*/ dpy, long /*int*/ ctx);
@@ -32158,10 +32533,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
_glXDestroyContext(dpy, ctx);
-@@ -265,8 +265,8 @@
- lock.unlock();
- }
- }
+@@ -297,8 +297,8 @@
+ * @param dpy cast=(Display *)
+ * @param pix cast=(GLXPixmap)
+ */
-public static final native void _glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix);
-public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix) {
+public static final native void _glXDestroyGLXPixmap(long /*int*/ dpy, long /*int*/ pix);
@@ -32169,10 +32544,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
_glXDestroyGLXPixmap(dpy, pix);
-@@ -274,8 +274,8 @@
- lock.unlock();
+@@ -307,8 +307,8 @@
}
}
+ /** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXGetClientString(int /*long*/ dpy, int name);
-public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name) {
+public static final native long /*int*/ _glXGetClientString(long /*int*/ dpy, int name);
@@ -32180,10 +32555,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXGetClientString(dpy, name);
-@@ -283,8 +283,8 @@
- lock.unlock();
+@@ -317,8 +317,8 @@
}
}
+ /** @param dpy cast=(Display *) */
-public static final native int _glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value);
-public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value) {
+public static final native int _glXGetConfig(long /*int*/ dpy, XVisualInfo vis, int attrib, int[] value);
@@ -32191,7 +32566,7 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXGetConfig(dpy, vis, attrib, value);
-@@ -292,8 +292,8 @@
+@@ -326,8 +326,8 @@
lock.unlock();
}
}
@@ -32202,7 +32577,7 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXGetCurrentContext();
-@@ -301,8 +301,8 @@
+@@ -335,8 +335,8 @@
lock.unlock();
}
}
@@ -32213,10 +32588,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXGetCurrentDrawable();
-@@ -310,8 +310,8 @@
- lock.unlock();
- }
- }
+@@ -348,8 +348,8 @@
+ * @param dpy cast=(Display *)
+ * @param ctx cast=(GLXContext)
+ */
-public static final native boolean _glXIsDirect(int /*long*/ dpy, int /*long*/ ctx);
-public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {
+public static final native boolean _glXIsDirect(long /*int*/ dpy, long /*int*/ ctx);
@@ -32224,10 +32599,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXIsDirect(dpy, ctx);
-@@ -319,8 +319,8 @@
- lock.unlock();
- }
- }
+@@ -362,8 +362,8 @@
+ * @param drawable cast=(GLXDrawable)
+ * @param ctx cast=(GLXContext)
+ */
-public static final native boolean _glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx);
-public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx) {
+public static final native boolean _glXMakeCurrent(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ ctx);
@@ -32235,10 +32610,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXMakeCurrent(dpy, drawable, ctx);
-@@ -328,8 +328,8 @@
- lock.unlock();
+@@ -372,8 +372,8 @@
}
}
+ /** @param dpy cast=(Display *) */
-public static final native boolean _glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase);
-public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase) {
+public static final native boolean _glXQueryExtension(long /*int*/ dpy, int[] errorBase, int[] eventBase);
@@ -32246,10 +32621,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXQueryExtension(dpy, errorBase, eventBase);
-@@ -337,8 +337,8 @@
- lock.unlock();
+@@ -382,8 +382,8 @@
}
}
+ /** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXQueryExtensionsString(int /*long*/ dpy, int screen);
-public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int screen) {
+public static final native long /*int*/ _glXQueryExtensionsString(long /*int*/ dpy, int screen);
@@ -32257,10 +32632,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXQueryExtensionsString(dpy, screen);
-@@ -346,8 +346,8 @@
- lock.unlock();
+@@ -392,8 +392,8 @@
}
}
+ /** @param dpy cast=(Display *) */
-public static final native int /*long*/ _glXQueryServerString(int /*long*/ dpy, int screen, int name);
-public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int screen, int name) {
+public static final native long /*int*/ _glXQueryServerString(long /*int*/ dpy, int screen, int name);
@@ -32268,10 +32643,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXQueryServerString(dpy, screen, name);
-@@ -355,8 +355,8 @@
- lock.unlock();
- }
- }
+@@ -406,8 +406,8 @@
+ * @param major flags=no_in
+ * @param minor flags=no_in
+ */
-public static final native boolean _glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor);
-public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor) {
+public static final native boolean _glXQueryVersion(long /*int*/ dpy, int[] major, int[] minor);
@@ -32279,10 +32654,10 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
return _glXQueryVersion(dpy, major, minor);
-@@ -364,8 +364,8 @@
- lock.unlock();
- }
- }
+@@ -419,8 +419,8 @@
+ * @param dpy cast=(Display *)
+ * @param drawable cast=(GLXDrawable)
+ */
-public static final native void _glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable);
-public static final void glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable) {
+public static final native void _glXSwapBuffers(long /*int*/ dpy, long /*int*/ drawable);
@@ -32290,28 +32665,28 @@ diff -ur x86/org/eclipse/swt/internal/opengl/glx/GLX.java x86_64/org/eclipse/swt
lock.lock();
try {
_glXSwapBuffers(dpy, drawable);
-@@ -391,5 +391,5 @@
- lock.unlock();
- }
- }
+@@ -450,5 +450,5 @@
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
-public static final native void memmove(XVisualInfo dest, int /*long*/ src, int size);
+public static final native void memmove(XVisualInfo dest, long /*int*/ src, int size);
}
-diff -ur x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
---- x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-02-11 17:43:48.000000000 -0500
-@@ -11,7 +11,7 @@
- package org.eclipse.swt.internal.opengl.glx;
+diff -urN x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+--- x86/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-05-29 17:30:32.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java 2009-09-17 08:48:22.000000000 -0400
+@@ -12,7 +12,7 @@
public class XVisualInfo {
+ /** @field cast=(Visual *) */
- public int /*long*/ visual;
+ public long /*int*/ visual;
public int visualid;
public int screen;
public int depth;
-diff -ur x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java
---- x86/org/eclipse/swt/internal/theme/ButtonDrawData.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java
+--- x86/org/eclipse/swt/internal/theme/ButtonDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/ButtonDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -25,10 +25,10 @@
void draw(Theme theme, GC gc, Rectangle bounds) {
int state = this.state[DrawData.WIDGET_WHOLE];
@@ -32348,9 +32723,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/ButtonDrawData.java x86_64/org/eclip
theme.transferClipping (gc, gtkStyle);
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
-diff -ur x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java
---- x86/org/eclipse/swt/internal/theme/ComboDrawData.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java
+--- x86/org/eclipse/swt/internal/theme/ComboDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/ComboDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -24,9 +24,9 @@
}
@@ -32388,9 +32763,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/ComboDrawData.java x86_64/org/eclips
int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
int focus_padding = theme.getWidgetProperty(buttonHandle, "focus-padding");
-diff -ur x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/swt/internal/theme/DrawData.java
---- x86/org/eclipse/swt/internal/theme/DrawData.java 2009-06-24 21:13:54.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/DrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/swt/internal/theme/DrawData.java
+--- x86/org/eclipse/swt/internal/theme/DrawData.java 2006-04-26 14:44:04.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/DrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -79,21 +79,21 @@
}
@@ -32457,9 +32832,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/DrawData.java x86_64/org/eclipse/swt
if (bounds != null) OS.pango_layout_set_width(layout, bounds.width);
if ((flags & DrawData.DRAW_LEFT) != 0) {
OS.pango_layout_set_alignment(layout, OS.PANGO_ALIGN_LEFT);
-diff -ur x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java
---- x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+--- x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/ExpanderDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -22,9 +22,9 @@
}
@@ -32482,9 +32857,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/ExpanderDrawData.java x86_64/org/ecl
int expander_size = theme.getWidgetProperty(treeHandle, "expander-size");
if (new Rectangle(bounds.x, bounds.y, expander_size, expander_size).contains(position)) {
return DrawData.WIDGET_WHOLE;
-diff -ur x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java
---- x86/org/eclipse/swt/internal/theme/GroupDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java
+--- x86/org/eclipse/swt/internal/theme/GroupDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/GroupDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -29,9 +29,9 @@
static final int GROUP_HEADER_X = 9;
static final int GROUP_HEADER_PAD = 2;
@@ -32498,9 +32873,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/GroupDrawData.java x86_64/org/eclips
theme.transferClipping(gc, gtkStyle);
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int ythickness = OS.gtk_style_get_ythickness(gtkStyle);
-diff -ur x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
---- x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+--- x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2006-04-26 14:44:04.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/ProgressBarDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -22,9 +22,9 @@
}
@@ -32514,9 +32889,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/ProgressBarDrawData.java x86_64/org/
theme.transferClipping(gc, gtkStyle);
byte[] detail = Converter.wcsToMbcs(null, "trough", true);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
-diff -ur x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java
---- x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+--- x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2006-04-26 14:44:04.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/TabFolderDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -31,9 +31,9 @@
}
@@ -32530,9 +32905,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/TabFolderDrawData.java x86_64/org/ec
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
height -= tabsHeight;
-diff -ur x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java
---- x86/org/eclipse/swt/internal/theme/TabItemDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java
+--- x86/org/eclipse/swt/internal/theme/TabItemDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/TabItemDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -27,8 +27,8 @@
}
@@ -32557,9 +32932,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/TabItemDrawData.java x86_64/org/ecli
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
if ((state[DrawData.WIDGET_WHOLE] & DrawData.SELECTED) == 0) {
-diff -ur x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/internal/theme/Theme.java
---- x86/org/eclipse/swt/internal/theme/Theme.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/Theme.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/internal/theme/Theme.java
+--- x86/org/eclipse/swt/internal/theme/Theme.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/Theme.java 2009-09-17 08:48:24.000000000 -0400
@@ -18,7 +18,7 @@
public class Theme {
Device device;
@@ -32653,9 +33028,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/Theme.java x86_64/org/eclipse/swt/in
for (int i = 0; i < 5; i++) {
OS.gtk_style_get_fg_gc (style, i, curGC);
if (curGC[0] != 0) OS.gdk_gc_set_clip_region (curGC[0], clipping);
-diff -ur x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java
---- x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java
+--- x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/ToolBarDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -21,9 +21,9 @@
}
@@ -32669,9 +33044,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/ToolBarDrawData.java x86_64/org/ecli
theme.transferClipping(gc, gtkStyle);
int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
byte[] detail = Converter.wcsToMbcs(null, "toolbar", true);
-diff -ur x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java
---- x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+--- x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2006-04-26 14:44:02.000000000 -0400
++++ x86_64/org/eclipse/swt/internal/theme/ToolItemDrawData.java 2009-09-17 08:48:24.000000000 -0400
@@ -27,8 +27,8 @@
}
@@ -32731,9 +33106,9 @@ diff -ur x86/org/eclipse/swt/internal/theme/ToolItemDrawData.java x86_64/org/ecl
int xthickness = OS.gtk_style_get_xthickness(gtkStyle);
int interior_focus = theme.getWidgetProperty(buttonHandle, "interior-focus");
int focus_line_width = theme.getWidgetProperty(buttonHandle, "focus-line-width");
-diff -ur x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/GLCanvas.java
---- x86/org/eclipse/swt/opengl/GLCanvas.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/opengl/GLCanvas.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/GLCanvas.java
+--- x86/org/eclipse/swt/opengl/GLCanvas.java 2009-05-29 17:30:26.000000000 -0400
++++ x86_64/org/eclipse/swt/opengl/GLCanvas.java 2009-09-17 08:48:22.000000000 -0400
@@ -27,9 +27,9 @@
*/
@@ -32760,18 +33135,20 @@ diff -ur x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/
if (infoPtr == 0) {
dispose ();
SWT.error (SWT.ERROR_UNSUPPORTED_DEPTH);
-@@ -114,8 +114,8 @@
+@@ -114,9 +114,9 @@
vinfo = new XVisualInfo ();
GLX.memmove (vinfo, infoPtr, XVisualInfo.sizeof);
OS.XFree (infoPtr);
- int /*long*/ screen = OS.gdk_screen_get_default ();
- int /*long*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);
+- int /*long*/ share = data.shareContext != null ? data.shareContext.context : 0;
+ long /*int*/ screen = OS.gdk_screen_get_default ();
+ long /*int*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);
- //FIXME- share lists
- //context = GLX.glXCreateContext (xDisplay, info, share == null ? 0 : share.context, true);
- context = GLX.glXCreateContext (xDisplay, vinfo, 0, true);
-@@ -157,8 +157,8 @@
++ long /*int*/ 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 ();
+@@ -156,8 +156,8 @@
OS.gdk_window_resize (glWindow, clientArea.width, clientArea.height);
break;
case SWT.Dispose:
@@ -32782,7 +33159,7 @@ diff -ur x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/
if (context != 0) {
if (GLX.glXGetCurrentContext () == context) {
GLX.glXMakeCurrent (xDisplay, 0, 0);
-@@ -190,8 +190,8 @@
+@@ -189,8 +189,8 @@
*/
public GLData getGLData () {
checkWidget ();
@@ -32793,7 +33170,7 @@ diff -ur x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/
GLData data = new GLData ();
int [] value = new int [1];
GLX.glXGetConfig (xDisplay, vinfo, GLX.GLX_DOUBLEBUFFER, value);
-@@ -253,8 +253,8 @@
+@@ -252,8 +252,8 @@
public void setCurrent () {
checkWidget ();
if (GLX.glXGetCurrentContext () == context) return;
@@ -32804,7 +33181,7 @@ diff -ur x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/
GLX.glXMakeCurrent (xDisplay, xWindow, context);
}
-@@ -268,8 +268,8 @@
+@@ -267,8 +267,8 @@
*/
public void swapBuffers () {
checkWidget ();
@@ -32815,19 +33192,19 @@ diff -ur x86/org/eclipse/swt/opengl/GLCanvas.java x86_64/org/eclipse/swt/opengl/
GLX.glXSwapBuffers (xDisplay, xWindow);
}
}
-diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/printing/PrintDialog.java
---- x86/org/eclipse/swt/printing/PrintDialog.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/printing/PrintDialog.java 2009-02-11 17:43:48.000000000 -0500
-@@ -36,7 +36,7 @@
- int startPage = 1, endPage = 1;
- boolean printToFile = false;
+diff -urN x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/printing/PrintDialog.java
+--- x86/org/eclipse/swt/printing/PrintDialog.java 2009-05-29 17:30:32.000000000 -0400
++++ x86_64/org/eclipse/swt/printing/PrintDialog.java 2009-09-17 08:48:24.000000000 -0400
+@@ -34,7 +34,7 @@
+ public class PrintDialog extends Dialog {
+ PrinterData printerData = new PrinterData();
- int /*long*/ handle;
+ long /*int*/ handle;
int index;
byte [] settingsData;
-@@ -279,7 +279,7 @@
+@@ -292,7 +292,7 @@
return Printer.getDefaultPrinterData();
} else {
byte [] titleBytes = Converter.wcsToMbcs (null, getText(), true);
@@ -32836,7 +33213,7 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
while (topHandle != 0 && !OS.GTK_IS_WINDOW(topHandle)) {
topHandle = OS.gtk_widget_get_parent(topHandle);
}
-@@ -292,8 +292,8 @@
+@@ -305,8 +305,8 @@
OS.GTK_PRINT_CAPABILITY_COLLATE | OS.GTK_PRINT_CAPABILITY_COPIES | OS.GTK_PRINT_CAPABILITY_PAGE_SET);
/* Set state into print dialog settings. */
@@ -32845,9 +33222,9 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
+ long /*int*/ settings = OS.gtk_print_settings_new();
+ long /*int*/ page_setup = OS.gtk_page_setup_new();
- if (printerData != null) {
- if (printerData.otherData != null) {
-@@ -329,7 +329,7 @@
+ if (printerData.otherData != null) {
+ Printer.restore(printerData.otherData, settings, page_setup);
+@@ -361,7 +361,7 @@
Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();
int signalId = 0;
@@ -32856,7 +33233,7 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
if ((getStyle () & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, ((LONG) display.getData (GET_EMISSION_PROC_KEY)).value, handle, 0);
-@@ -348,7 +348,7 @@
+@@ -380,7 +380,7 @@
OS.g_signal_remove_emission_hook (signalId, hookId);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -32865,25 +33242,25 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
if (printer != 0) {
/* Get state from print dialog. */
settings = OS.gtk_print_unix_dialog_get_settings(handle); // must unref
-@@ -362,7 +362,7 @@
+@@ -394,7 +394,7 @@
case OS.GTK_PRINT_PAGES_RANGES:
- scope = PrinterData.PAGE_RANGE;
+ data.scope = PrinterData.PAGE_RANGE;
int[] num_ranges = new int[1];
- int /*long*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);
+ long /*int*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);
int [] pageRange = new int[2];
int length = num_ranges[0];
int min = Integer.MAX_VALUE, max = 0;
-@@ -384,7 +384,7 @@
+@@ -416,7 +416,7 @@
- printToFile = data.name.equals("Print to File"); //$NON-NLS-1$
- if (printToFile) {
+ data.printToFile = data.name.equals("Print to File"); //$NON-NLS-1$
+ if (data.printToFile) {
- int /*long*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);
+ long /*int*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
-@@ -400,7 +400,7 @@
+@@ -429,7 +429,7 @@
/* Save other print_settings data as key/value pairs in otherData. */
Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$
@@ -32892,7 +33269,7 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
if (GtkPrintSettingsFunc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
index = 0;
settingsData = new byte[1024];
-@@ -416,7 +416,7 @@
+@@ -445,7 +445,7 @@
store("bottom_margin", OS.gtk_page_setup_get_bottom_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
store("left_margin", OS.gtk_page_setup_get_left_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
store("right_margin", OS.gtk_page_setup_get_right_margin(page_setup, OS.GTK_UNIT_MM)); //$NON-NLS-1$
@@ -32901,7 +33278,7 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
storeBytes("paper_size_name", OS.gtk_paper_size_get_name(paper_size)); //$NON-NLS-1$
storeBytes("paper_size_display_name", OS.gtk_paper_size_get_display_name(paper_size)); //$NON-NLS-1$
storeBytes("paper_size_ppd_name", OS.gtk_paper_size_get_ppd_name(paper_size)); //$NON-NLS-1$
-@@ -433,7 +433,7 @@
+@@ -463,7 +463,7 @@
}
}
@@ -32910,7 +33287,7 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
int length = OS.strlen (key);
byte [] keyBuffer = new byte [length];
OS.memmove (keyBuffer, key, length);
-@@ -456,7 +456,7 @@
+@@ -486,7 +486,7 @@
store(key, String.valueOf(value));
}
@@ -32919,10 +33296,10 @@ diff -ur x86/org/eclipse/swt/printing/PrintDialog.java x86_64/org/eclipse/swt/pr
int length = OS.strlen (value);
byte [] valueBuffer = new byte [length];
OS.memmove (valueBuffer, value, length);
-diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printing/Printer.java
---- x86/org/eclipse/swt/printing/Printer.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/printing/Printer.java 2009-02-11 17:43:48.000000000 -0500
-@@ -44,12 +44,12 @@
+diff -urN x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printing/Printer.java
+--- x86/org/eclipse/swt/printing/Printer.java 2009-05-29 17:30:32.000000000 -0400
++++ x86_64/org/eclipse/swt/printing/Printer.java 2009-09-17 08:48:24.000000000 -0400
+@@ -46,12 +46,12 @@
static PrinterData [] printerList;
PrinterData data;
@@ -32941,7 +33318,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
/**
* whether or not a GC was created for this printer
-@@ -79,18 +79,18 @@
+@@ -82,18 +82,18 @@
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -32963,7 +33340,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
int length = printerList.length;
PrinterData [] newList = new PrinterData [length + 1];
System.arraycopy (printerList, 0, newList, 0, length);
-@@ -126,18 +126,18 @@
+@@ -129,18 +129,18 @@
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -32985,7 +33362,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
if (OS.gtk_printer_is_default(printer)) {
printerList[0] = printerDataFromGtkPrinter(printer);
return 1;
-@@ -147,9 +147,9 @@
+@@ -150,9 +150,9 @@
return 0;
}
@@ -32997,7 +33374,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
if (GtkPrinterFunc_FindNamedPrinter == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
printer = 0;
OS.gtk_enumerate_printers(GtkPrinterFunc_FindNamedPrinter, 0, 0, true);
-@@ -157,7 +157,7 @@
+@@ -160,7 +160,7 @@
return printer;
}
@@ -33006,7 +33383,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
PrinterData pd = printerDataFromGtkPrinter(printer);
if (pd.driver.equals(data.driver) && pd.name.equals(data.name)) {
this.printer = printer;
-@@ -169,9 +169,9 @@
+@@ -172,9 +172,9 @@
return 0;
}
@@ -33019,7 +33396,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
int length = OS.strlen (address);
byte [] buffer = new byte [length];
OS.memmove (buffer, address, length);
-@@ -189,7 +189,7 @@
+@@ -192,7 +192,7 @@
/*
* Restore printer settings and page_setup data from data.
*/
@@ -33028,7 +33405,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
settingsData = data;
start = end = 0;
while (end < settingsData.length && settingsData[end] != 0) {
-@@ -222,7 +222,7 @@
+@@ -225,7 +225,7 @@
double width = restoreDouble("paper_size_width"); //$NON-NLS-1$
double height = restoreDouble("paper_size_height"); //$NON-NLS-1$
boolean custom = restoreBoolean("paper_size_is_custom"); //$NON-NLS-1$
@@ -33037,16 +33414,7 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
if (custom) {
if (ppd_name.length > 0) {
paper_size = OS.gtk_paper_size_new_from_ppd(ppd_name, display_name, width, height);
-@@ -236,7 +236,7 @@
- OS.gtk_paper_size_free(paper_size);
- }
-
--static void setScope(int /*long*/ settings, int scope, int startPage, int endPage) {
-+static void setScope(long /*int*/ settings, int scope, int startPage, int endPage) {
- switch (scope) {
- case PrinterData.ALL_PAGES:
- OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
-@@ -365,8 +365,8 @@
+@@ -350,8 +350,8 @@
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -33057,20 +33425,22 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -383,9 +383,9 @@
+@@ -368,11 +368,11 @@
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
-public int /*long*/ internal_new_GC(GCData data) {
-- int /*long*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, 1);
-- int /*long*/ gdkGC = OS.gdk_gc_new (drawable);
+public long /*int*/ internal_new_GC(GCData data) {
-+ long /*int*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, 1);
+ GdkVisual visual = new GdkVisual ();
+ OS.memmove (visual, OS.gdk_visual_get_system());
+- int /*long*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth);
+- int /*long*/ gdkGC = OS.gdk_gc_new (drawable);
++ long /*int*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth);
+ long /*int*/ gdkGC = OS.gdk_gc_new (drawable);
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
if (data != null) {
if (isGCCreated) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-@@ -421,7 +421,7 @@
+@@ -408,7 +408,7 @@
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -33079,9 +33449,9 @@ diff -ur x86/org/eclipse/swt/printing/Printer.java x86_64/org/eclipse/swt/printi
if (data != null) isGCCreated = false;
OS.g_object_unref (gdkGC);
if (data != null) {
-diff -ur x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/program/Program.java
---- x86/org/eclipse/swt/program/Program.java 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/org/eclipse/swt/program/Program.java 2009-02-11 17:43:48.000000000 -0500
+diff -urN x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/program/Program.java
+--- x86/org/eclipse/swt/program/Program.java 2008-08-05 10:59:14.000000000 -0400
++++ x86_64/org/eclipse/swt/program/Program.java 2009-09-17 08:48:24.000000000 -0400
@@ -42,7 +42,7 @@
*/
boolean gnomeExpectUri;
@@ -33287,11 +33657,11 @@ diff -ur x86/org/eclipse/swt/program/Program.java x86_64/org/eclipse/swt/program
if (icon_name != 0) path = GNOME.gnome_icon_theme_lookup_icon(gnomeIconTheme.value, icon_name, PREFERRED_ICON_SIZE, null, null);
if (path != 0) {
length = OS.strlen(path);
-diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/Button.java
---- x86/org/eclipse/swt/widgets/Button.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Button.java 2009-02-11 17:43:50.000000000 -0500
-@@ -45,7 +45,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/Button.java
+--- x86/org/eclipse/swt/widgets/Button.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Button.java 2009-09-17 08:48:24.000000000 -0400
+@@ -46,7 +46,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Button extends Control {
- int /*long*/ boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle;
@@ -33299,7 +33669,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
boolean selected, grayed;
ImageList imageList;
Image image;
-@@ -162,7 +162,7 @@
+@@ -165,7 +165,7 @@
}
if (wHint != SWT.DEFAULT || hHint != SWT.DEFAULT) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_CAN_DEFAULT) != 0) {
@@ -33308,7 +33678,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
GtkBorder border = new GtkBorder ();
OS.gtk_widget_style_get (handle, OS.default_border, buffer, 0);
if (buffer[0] != 0) {
-@@ -263,7 +263,7 @@
+@@ -266,7 +266,7 @@
if (arrowHandle != 0) display.removeWidget (arrowHandle);
}
@@ -33317,7 +33687,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
if (labelHandle != 0) return labelHandle;
return super.fontHandle ();
}
-@@ -379,14 +379,14 @@
+@@ -382,14 +382,14 @@
return text;
}
@@ -33335,7 +33705,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
if ((style & SWT.RADIO) != 0) {
if ((parent.getStyle () & SWT.NO_RADIO_GROUP) != 0) {
setSelection (!selected);
-@@ -408,8 +408,8 @@
+@@ -411,8 +411,8 @@
return 0;
}
@@ -33346,7 +33716,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0 && OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-@@ -419,8 +419,8 @@
+@@ -422,8 +422,8 @@
return result;
}
@@ -33357,7 +33727,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
// widget could be disposed at this point
if (handle == 0) return 0;
if ((style & SWT.PUSH) != 0 && !OS.GTK_WIDGET_HAS_DEFAULT (handle)) {
-@@ -432,8 +432,8 @@
+@@ -435,8 +435,8 @@
return result;
}
@@ -33368,7 +33738,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
if (result != 0) return result;
if ((style & SWT.RADIO) != 0) selected = getSelection ();
return result;
-@@ -637,7 +637,7 @@
+@@ -640,7 +640,7 @@
if (imageHandle != 0) setBackgroundColor(imageHandle, color);
}
@@ -33377,7 +33747,7 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -712,7 +712,7 @@
+@@ -715,7 +715,7 @@
if (image.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -33386,9 +33756,9 @@ diff -ur x86/org/eclipse/swt/widgets/Button.java x86_64/org/eclipse/swt/widgets/
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-diff -ur x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets/Canvas.java
---- x86/org/eclipse/swt/widgets/Canvas.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Canvas.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets/Canvas.java
+--- x86/org/eclipse/swt/widgets/Canvas.java 2008-06-05 13:31:08.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Canvas.java 2009-09-17 08:48:24.000000000 -0400
@@ -147,46 +147,46 @@
return ime;
}
@@ -33487,10 +33857,10 @@ diff -ur x86/org/eclipse/swt/widgets/Canvas.java x86_64/org/eclipse/swt/widgets/
if (imHandle == 0) return;
GdkRectangle rect = new GdkRectangle ();
rect.x = caret.x;
-diff -ur x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/Caret.java
---- x86/org/eclipse/swt/widgets/Caret.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Caret.java 2009-02-11 17:43:50.000000000 -0500
-@@ -96,13 +96,13 @@
+diff -urN x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/Caret.java
+--- x86/org/eclipse/swt/widgets/Caret.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Caret.java 2009-09-17 08:48:24.000000000 -0400
+@@ -97,13 +97,13 @@
boolean drawCaret () {
if (parent == null) return false;
if (parent.isDisposed ()) return false;
@@ -33507,10 +33877,10 @@ diff -ur x86/org/eclipse/swt/widgets/Caret.java x86_64/org/eclipse/swt/widgets/C
OS.gdk_colormap_alloc_color (colormap, color, true, true);
OS.gdk_gc_set_foreground (gc, color);
OS.gdk_gc_set_function (gc, OS.GDK_XOR);
-diff -ur x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/widgets/ColorDialog.java
---- x86/org/eclipse/swt/widgets/ColorDialog.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ColorDialog.java 2009-02-11 17:43:50.000000000 -0500
-@@ -113,12 +113,12 @@
+diff -urN x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/widgets/ColorDialog.java
+--- x86/org/eclipse/swt/widgets/ColorDialog.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ColorDialog.java 2009-09-17 08:48:24.000000000 -0400
+@@ -114,12 +114,12 @@
*/
public RGB open () {
byte [] buffer = Converter.wcsToMbcs (null, title, true);
@@ -33526,7 +33896,7 @@ diff -ur x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/wid
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -141,7 +141,7 @@
+@@ -143,7 +143,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -33535,11 +33905,11 @@ diff -ur x86/org/eclipse/swt/widgets/ColorDialog.java x86_64/org/eclipse/swt/wid
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/Combo.java
---- x86/org/eclipse/swt/widgets/Combo.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Combo.java 2009-02-11 17:43:50.000000000 -0500
-@@ -56,9 +56,9 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/Combo.java
+--- x86/org/eclipse/swt/widgets/Combo.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Combo.java 2009-09-17 08:48:24.000000000 -0400
+@@ -57,9 +57,9 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Combo extends Composite {
- int /*long*/ buttonHandle, entryHandle, listHandle, textRenderer, cellHandle, popupHandle;
@@ -33550,7 +33920,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
int fixStart = -1, fixEnd = -1;
String [] items = new String [0];
boolean ignoreSelect, lockText;
-@@ -183,13 +183,13 @@
+@@ -182,13 +182,13 @@
* stopping the "delete" and "insert_text" signal emission.
*/
ignoreSelect = lockText = true;
@@ -33567,7 +33937,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_list_insert_items (listHandle, items, index);
ignoreSelect = lockText = false;
}
-@@ -344,9 +344,9 @@
+@@ -343,9 +343,9 @@
if ((style & SWT.READ_ONLY) != 0) {
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) {
@@ -33580,20 +33950,20 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
-@@ -370,10 +370,10 @@
+@@ -369,10 +369,10 @@
if (hHint != SWT.DEFAULT && hHint < 0) hHint = 0;
int[] w = new int [1], h = new int [1];
OS.gtk_widget_realize (entryHandle);
- int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle);
+ long /*int*/ layout = OS.gtk_entry_get_layout (entryHandle);
OS.pango_layout_get_size (layout, w, h);
- int xborder = INNER_BORDER, yborder = INNER_BORDER;
+ int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER;
- int /*long*/ style = OS.gtk_widget_get_style (entryHandle);
+ long /*int*/ style = OS.gtk_widget_get_style (entryHandle);
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
int [] property = new int [1];
-@@ -389,7 +389,7 @@
+@@ -388,7 +388,7 @@
GtkRequisition arrowRequesition = new GtkRequisition ();
OS.gtk_widget_size_request (buttonHandle, arrowRequesition);
GtkRequisition listRequesition = new GtkRequisition ();
@@ -33602,7 +33972,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_widget_size_request (listParent != 0 ? listParent : listHandle, listRequesition);
width = Math.max (listRequesition.width, width) + arrowRequesition.width + 4;
-@@ -422,7 +422,7 @@
+@@ -421,7 +421,7 @@
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
@@ -33611,7 +33981,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if ((style & SWT.READ_ONLY) != 0) {
handle = OS.gtk_combo_box_new_text ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -468,9 +468,9 @@
+@@ -467,9 +467,9 @@
*/
OS.gtk_container_forall (handle, display.allChildrenProc, 0);
if (display.allChildren != 0) {
@@ -33623,7 +33993,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (OS.GTK_IS_BUTTON (widget)) {
buttonHandle = widget;
break;
-@@ -499,14 +499,14 @@
+@@ -498,14 +498,14 @@
listHandle = combo.list;
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
@@ -33641,7 +34011,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (modalGroup != 0) {
OS.gtk_window_group_add_window (modalGroup, popupHandle);
}
-@@ -519,11 +519,11 @@
+@@ -518,11 +518,11 @@
* to hook events. The fix is to find the first child that is
* not the entry or list and assume this is the arrow handle.
*/
@@ -33655,7 +34025,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (childHandle != entryHandle && childHandle != listHandle) {
buttonHandle = childHandle;
break;
-@@ -564,15 +564,15 @@
+@@ -563,15 +563,15 @@
if (buttonHandle != 0) display.removeWidget (buttonHandle);
if (entryHandle != 0) display.removeWidget (entryHandle);
if (listHandle != 0) display.removeWidget (listHandle);
@@ -33674,7 +34044,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -581,18 +581,18 @@
+@@ -580,18 +580,18 @@
return false;
}
@@ -33700,7 +34070,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (newToplevel == oldToplevel) {
isFound = true;
break;
-@@ -610,7 +610,7 @@
+@@ -609,7 +609,7 @@
return hdl;
}
@@ -33709,7 +34079,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (popupHandle != 0) {
if (group != 0) {
OS.gtk_window_group_add_window (group, popupHandle);
-@@ -632,7 +632,7 @@
+@@ -631,7 +631,7 @@
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -33718,7 +34088,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -642,12 +642,12 @@
+@@ -641,12 +641,12 @@
gdkEventKey = 0;
}
@@ -33733,7 +34103,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if ((style & SWT.READ_ONLY) != 0 && buttonHandle != 0) return buttonHandle;
}
-@@ -677,9 +677,9 @@
+@@ -676,9 +676,9 @@
}
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK |
OS.GDK_BUTTON_RELEASE_MASK;
@@ -33745,7 +34115,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (eventHandle != 0) {
/* Connect the mouse signals */
OS.gtk_widget_add_events (eventHandle, eventMask);
-@@ -703,7 +703,7 @@
+@@ -702,7 +702,7 @@
}
}
}
@@ -33754,7 +34124,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -712,7 +712,7 @@
+@@ -711,7 +711,7 @@
}
}
@@ -33763,7 +34133,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
return entryHandle != 0 ? OS.GTK_ENTRY_IM_CONTEXT (entryHandle) : 0;
}
-@@ -737,8 +737,8 @@
+@@ -736,8 +736,8 @@
}
} else {
ignoreSelect = true;
@@ -33774,7 +34144,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
boolean selected = OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;
if (selected) {
OS.gtk_list_unselect_all (listHandle);
-@@ -779,9 +779,9 @@
+@@ -778,9 +778,9 @@
if (filter && entryHandle != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -33786,7 +34156,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
int position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
Point selection = getSelection ();
if (selection.x <= position && position < selection.y) {
-@@ -795,11 +795,11 @@
+@@ -794,11 +794,11 @@
return super.dragDetect (x, y, filter, consume);
}
@@ -33800,7 +34170,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
return paintWindow ();
}
-@@ -964,7 +964,7 @@
+@@ -963,7 +963,7 @@
int index = OS.gtk_combo_box_get_active (handle);
if (index != -1) length = getItem (index).length ();
} else {
@@ -33809,7 +34179,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (str != 0) length = (int)/*64*/OS.g_utf8_strlen (str, -1);
}
return new Point (0, length);
-@@ -994,10 +994,10 @@
+@@ -993,10 +993,10 @@
return OS.gtk_combo_box_get_active (handle);
}
int index = 0, result = -1;
@@ -33823,7 +34193,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED) {
result = index;
break;
-@@ -1024,7 +1024,7 @@
+@@ -1023,7 +1023,7 @@
public String getText () {
checkWidget();
if (entryHandle != 0) {
@@ -33832,7 +34202,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -1105,12 +1105,12 @@
+@@ -1104,12 +1104,12 @@
return visibleCount;
}
@@ -33847,7 +34217,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1126,7 +1126,7 @@
+@@ -1125,7 +1125,7 @@
return super.gtk_button_press_event (widget, event);
}
@@ -33856,7 +34226,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (widget == handle) {
if (entryHandle == 0) {
-@@ -1150,7 +1150,7 @@
+@@ -1149,7 +1149,7 @@
}
} else {
if (!ignoreSelect) {
@@ -33865,7 +34235,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
OS.memmove (buffer, ptr, length);
-@@ -1171,7 +1171,7 @@
+@@ -1170,7 +1170,7 @@
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -33874,7 +34244,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1190,7 +1190,7 @@
+@@ -1189,7 +1189,7 @@
return 0;
}
@@ -33883,7 +34253,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (entryHandle)) return 0;
int length = OS.strlen (text);
-@@ -1228,7 +1228,7 @@
+@@ -1227,7 +1227,7 @@
return 0;
}
@@ -33892,7 +34262,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (lockText) {
OS.gtk_list_unselect_item (listHandle, 0);
OS.g_signal_stop_emission_by_name (entryHandle, OS.delete_text);
-@@ -1254,7 +1254,7 @@
+@@ -1253,7 +1253,7 @@
return 0;
}
@@ -33901,7 +34271,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
/*
* Feature in GTK. Depending on where the user clicks, GTK prevents
* the left mouse button event from being propagated. The fix is to
-@@ -1306,12 +1306,12 @@
+@@ -1305,12 +1305,12 @@
return super.gtk_event_after(widget, gdkEvent);
}
@@ -33916,7 +34286,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (lockText) {
OS.gtk_list_unselect_item (listHandle, 0);
OS.g_signal_stop_emission_by_name (entryHandle, OS.insert_text);
-@@ -1325,7 +1325,7 @@
+@@ -1324,7 +1324,7 @@
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -33925,7 +34295,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
String newText = verifyText (oldText, pos [0], pos [0]);
-@@ -1357,8 +1357,8 @@
+@@ -1356,8 +1356,8 @@
return 0;
}
@@ -33936,7 +34306,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (result != 0) fixIM ();
if (gdkEventKey == -1) result = 1;
gdkEventKey = 0;
-@@ -1406,7 +1406,7 @@
+@@ -1403,7 +1403,7 @@
return result;
}
@@ -33945,7 +34315,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -1473,14 +1473,14 @@
+@@ -1470,14 +1470,14 @@
return super.isFocusHandle (widget);
}
@@ -33964,7 +34334,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -1505,7 +1505,7 @@
+@@ -1502,7 +1502,7 @@
if (entryHandle != 0) OS.gtk_editable_paste_clipboard (entryHandle);
}
@@ -33973,7 +34343,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
return fixedHandle;
}
-@@ -1514,7 +1514,7 @@
+@@ -1511,7 +1511,7 @@
if (buttonHandle != 0) display.addWidget (buttonHandle, this);
if (entryHandle != 0) display.addWidget (entryHandle, this);
if (listHandle != 0) display.addWidget (listHandle, this);
@@ -33982,7 +34352,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1558,10 +1558,10 @@
+@@ -1555,10 +1555,10 @@
OS.gtk_combo_box_remove_text (handle, index);
} else {
ignoreSelect = true;
@@ -33996,7 +34366,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_list_remove_items (listHandle, items);
OS.g_list_free (items);
OS.g_list_free (children);
-@@ -1608,10 +1608,10 @@
+@@ -1605,10 +1605,10 @@
} else {
boolean selected = false;
ignoreSelect = true;
@@ -34010,7 +34380,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
selected |= OS.GTK_WIDGET_STATE (item) == OS.GTK_STATE_SELECTED;
items = OS.g_list_append (items, item);
}
-@@ -1801,7 +1801,7 @@
+@@ -1798,7 +1798,7 @@
return super.setBounds (x, y, width, newHeight, move, resize);
}
@@ -34019,7 +34389,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
super.setFontDescription (font);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (entryHandle != 0) OS.gtk_widget_modify_font (entryHandle, font);
-@@ -1822,11 +1822,11 @@
+@@ -1819,11 +1819,11 @@
OS.gtk_widget_modify_font (entryHandle, font);
if (listHandle != 0) {
OS.gtk_widget_modify_font (listHandle, font);
@@ -34033,7 +34403,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_widget_modify_font (widget, font);
}
OS.g_list_free (itemsList);
-@@ -1844,11 +1844,11 @@
+@@ -1841,11 +1841,11 @@
setForegroundColor (entryHandle, color);
if (listHandle != 0) {
setForegroundColor (listHandle, color);
@@ -34047,7 +34417,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
setForegroundColor (widget, color);
}
OS.g_list_free (itemsList);
-@@ -1889,9 +1889,9 @@
+@@ -1886,9 +1886,9 @@
}
} else {
ignoreSelect = true;
@@ -34060,7 +34430,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_label_set_text (label, buffer);
OS.g_list_free (children);
ignoreSelect = false;
-@@ -1937,15 +1937,15 @@
+@@ -1934,15 +1934,15 @@
} else {
lockText = ignoreSelect = true;
OS.gtk_list_clear_items (listHandle, 0, -1);
@@ -34079,7 +34449,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
setForegroundColor (label, color);
OS.gtk_widget_modify_font (label, font);
OS.gtk_widget_set_direction (label, direction);
-@@ -2023,11 +2023,11 @@
+@@ -2020,11 +2020,11 @@
if (entryHandle != 0) OS.gtk_widget_set_direction (entryHandle, dir);
if (listHandle != 0) {
OS.gtk_widget_set_direction (listHandle, dir);
@@ -34093,7 +34463,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_widget_set_direction (widget, dir);
}
OS.g_list_free (itemsList);
-@@ -2110,7 +2110,7 @@
+@@ -2111,7 +2111,7 @@
* fix is to block the firing of these events and fire them ourselves in a consistent manner.
*/
if (hooks (SWT.Verify) || filters (SWT.Verify)) {
@@ -34102,7 +34472,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
string = verifyText (string, 0, (int)/*64*/OS.g_utf8_strlen (ptr, -1));
if (string == null) return;
}
-@@ -2190,9 +2190,9 @@
+@@ -2195,9 +2195,9 @@
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -34114,7 +34484,7 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2211,7 +2211,7 @@
+@@ -2216,7 +2216,7 @@
event.text = string;
event.start = start;
event.end = end;
@@ -34123,10 +34493,10 @@ diff -ur x86/org/eclipse/swt/widgets/Combo.java x86_64/org/eclipse/swt/widgets/C
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widgets/Composite.java
---- x86/org/eclipse/swt/widgets/Composite.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Composite.java 2009-02-11 17:43:50.000000000 -0500
-@@ -48,8 +48,8 @@
+diff -urN x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widgets/Composite.java
+--- x86/org/eclipse/swt/widgets/Composite.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Composite.java 2009-09-17 08:48:24.000000000 -0400
+@@ -47,8 +47,8 @@
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
public class Composite extends Scrollable {
@@ -34137,7 +34507,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
Layout layout;
Control[] tabList;
int layoutCount, backgroundMode;
-@@ -100,15 +100,15 @@
+@@ -101,15 +101,15 @@
}
Control [] _getChildren () {
@@ -34157,7 +34527,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -202,7 +202,7 @@
+@@ -203,7 +203,7 @@
/* Do nothing - Subclassing is allowed */
}
@@ -34166,7 +34536,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (scrolledHandle != 0) return 0;
return super.childStyle ();
}
-@@ -262,9 +262,9 @@
+@@ -263,9 +263,9 @@
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
}
@@ -34178,7 +34548,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (hadj == 0) error (SWT.ERROR_NO_HANDLES);
scrolledHandle = OS.gtk_scrolled_window_new (hadj, vadj);
if (scrolledHandle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
-@@ -332,7 +332,7 @@
+@@ -333,7 +333,7 @@
Control control = findBackgroundControl ();
if (control != null) {
GCData data = gc.getGCData ();
@@ -34187,7 +34557,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (cairo != 0) {
Cairo.cairo_save (cairo);
if (control.backgroundImage != null) {
-@@ -340,15 +340,15 @@
+@@ -341,15 +341,15 @@
Cairo.cairo_translate (cairo, -pt.x, -pt.y);
x += pt.x;
y += pt.y;
@@ -34209,7 +34579,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (pattern == 0) error (SWT.ERROR_NO_HANDLES);
Cairo.cairo_pattern_set_extend (pattern, Cairo.CAIRO_EXTEND_REPEAT);
if ((data.style & SWT.MIRRORED) != 0) {
-@@ -366,7 +366,7 @@
+@@ -367,7 +367,7 @@
Cairo.cairo_fill (cairo);
Cairo.cairo_restore (cairo);
} else {
@@ -34218,7 +34588,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
GdkGCValues values = new GdkGCValues ();
OS.gdk_gc_get_values (gdkGC, values);
if (control.backgroundImage != null) {
-@@ -424,7 +424,7 @@
+@@ -425,7 +425,7 @@
}
}
@@ -34227,7 +34597,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
Control[] controls = _getChildren ();
for (int i = 0; i < controls.length; i++) {
controls[i].fixModal (group, modalGroup);
-@@ -463,15 +463,15 @@
+@@ -464,15 +464,15 @@
void fixZOrder () {
if ((state & CANVAS) != 0) return;
@@ -34249,7 +34619,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (window != redrawWindow) {
OS.gdk_window_get_user_data (window, userData);
if (userData [0] == 0 || OS.G_OBJECT_TYPE (userData [0]) != display.gtk_fixed_get_type ()) {
-@@ -484,12 +484,12 @@
+@@ -485,12 +485,12 @@
}
}
@@ -34264,7 +34634,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (socketHandle != 0) OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
boolean result = super.forceFocus (focusHandle);
if (socketHandle != 0) OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -550,7 +550,7 @@
+@@ -551,7 +551,7 @@
* NOTE: The current implementation will count
* non-registered children.
*/
@@ -34273,7 +34643,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -564,7 +564,7 @@
+@@ -565,7 +565,7 @@
return new Rectangle (0, 0, 0, 0);
}
forceResize ();
@@ -34282,7 +34652,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (0, 0, width, height);
-@@ -645,8 +645,8 @@
+@@ -646,8 +646,8 @@
return tabList;
}
@@ -34293,7 +34663,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (result != 0) return result;
if ((state & CANVAS) != 0) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
-@@ -660,7 +660,7 @@
+@@ -661,7 +661,7 @@
return result;
}
@@ -34302,7 +34672,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if ((state & OBSCURED) != 0) return 0;
if ((state & CANVAS) == 0) {
return super.gtk_expose_event (widget, eventPtr);
-@@ -671,7 +671,7 @@
+@@ -672,7 +672,7 @@
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
@@ -34311,7 +34681,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
int [] n_rectangles = new int [1];
OS.gdk_region_get_rectangles (gdkEvent.region, rectangles, n_rectangles);
GdkRectangle rect = new GdkRectangle ();
-@@ -683,7 +683,7 @@
+@@ -684,7 +684,7 @@
event.width = rect.width;
event.height = rect.height;
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth () - event.width - event.x;
@@ -34320,7 +34690,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
OS.gdk_region_union_with_rect (damageRgn, rect);
GCData data = new GCData ();
data.damageRgn = damageRgn;
-@@ -698,8 +698,8 @@
+@@ -699,8 +699,8 @@
return 0;
}
@@ -34331,7 +34701,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (result != 0) return result;
/*
* Feature in GTK. The default behavior when the return key
-@@ -719,30 +719,30 @@
+@@ -720,30 +720,30 @@
return result;
}
@@ -34371,7 +34741,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
if (socketHandle != 0) {
-@@ -751,16 +751,16 @@
+@@ -752,16 +752,16 @@
return result;
}
@@ -34392,7 +34762,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, false);
}
return result;
-@@ -784,7 +784,7 @@
+@@ -785,7 +785,7 @@
return hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
}
@@ -34401,7 +34771,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
return imHandle;
}
-@@ -1002,16 +1002,16 @@
+@@ -1003,16 +1003,16 @@
}
}
@@ -34424,7 +34794,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1039,20 +1039,20 @@
+@@ -1040,20 +1040,20 @@
OS.memmove (parentHandle, fixed);
}
@@ -34451,7 +34821,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.memmove (widget, data [0], OS.PTR_SIZEOF);
-@@ -1084,7 +1084,7 @@
+@@ -1085,7 +1085,7 @@
Control[] children = _getChildren ();
for (int i = 0; i < children.length; i++) {
Control child = children[i];
@@ -34460,7 +34830,7 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
int controlWidth = (child.state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -1126,12 +1126,12 @@
+@@ -1127,12 +1127,12 @@
return new Point (width, height);
}
@@ -34475,11 +34845,11 @@ diff -ur x86/org/eclipse/swt/widgets/Composite.java x86_64/org/eclipse/swt/widge
Region oldClip = new Region (gc.getDevice ());
Region newClip = new Region (gc.getDevice ());
gc.getClipping (oldClip);
-diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets/Control.java
---- x86/org/eclipse/swt/widgets/Control.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Control.java 2009-02-11 17:43:50.000000000 -0500
-@@ -42,8 +42,8 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets/Control.java
+--- x86/org/eclipse/swt/widgets/Control.java 2009-08-07 14:50:38.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Control.java 2009-09-17 08:48:24.000000000 -0400
+@@ -44,8 +44,8 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Control extends Widget implements Drawable {
- int /*long*/ fixedHandle;
@@ -34489,7 +34859,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int drawCount;
Composite parent;
Cursor cursor;
-@@ -99,13 +99,13 @@
+@@ -105,13 +105,13 @@
void deregister () {
super.deregister ();
if (fixedHandle != 0) display.removeWidget (fixedHandle);
@@ -34506,7 +34876,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (window == 0) return false;
int orientation = vertical ? OS.GTK_ORIENTATION_HORIZONTAL : OS.GTK_ORIENTATION_VERTICAL;
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - width - x;
-@@ -117,16 +117,16 @@
+@@ -123,16 +123,16 @@
OS.gtk_widget_set_sensitive (handle, enabled);
}
@@ -34527,7 +34897,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (eventHandle);
return OS.GTK_WIDGET_WINDOW (eventHandle);
}
-@@ -138,7 +138,7 @@
+@@ -144,7 +144,7 @@
if (control.setFocus ()) return;
}
shell.setSavedFocus (focusControl);
@@ -34536,7 +34906,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.GTK_WIDGET_SET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
OS.gtk_widget_grab_focus (focusHandle);
OS.GTK_WIDGET_UNSET_FLAGS (focusHandle, OS.GTK_CAN_FOCUS);
-@@ -148,7 +148,7 @@
+@@ -154,7 +154,7 @@
if (fixedHandle != 0) fixStyle (fixedHandle);
}
@@ -34545,16 +34915,16 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
/*
* Feature in GTK. Some GTK themes apply a different background to
* the contents of a GtkNotebook. However, in an SWT TabFolder, the
-@@ -161,7 +161,7 @@
- * should not override the application background.
+@@ -168,7 +168,7 @@
*/
if ((state & BACKGROUND) != 0) return;
+ if ((state & THEME_BACKGROUND) == 0) return;
- int /*long*/ childStyle = parent.childStyle ();
+ long /*int*/ childStyle = parent.childStyle ();
- if (childStyle != 0) {
+ if (childStyle != 0) {
GdkColor color = new GdkColor();
OS.gtk_style_get_bg (childStyle, 0, color);
-@@ -169,11 +169,11 @@
+@@ -176,11 +176,11 @@
}
}
@@ -34568,7 +34938,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
return handle;
}
-@@ -183,7 +183,7 @@
+@@ -190,7 +190,7 @@
void hookEvents () {
/* Connect the keyboard signals */
@@ -34577,7 +34947,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int focusMask = OS.GDK_KEY_PRESS_MASK | OS.GDK_KEY_RELEASE_MASK | OS.GDK_FOCUS_CHANGE_MASK;
OS.gtk_widget_add_events (focusHandle, focusMask);
OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [POPUP_MENU], 0, display.closures [POPUP_MENU], false);
-@@ -195,7 +195,7 @@
+@@ -202,7 +202,7 @@
OS.g_signal_connect_closure_by_id (focusHandle, display.signalIds [FOCUS_OUT_EVENT], 0, display.closures [FOCUS_OUT_EVENT], false);
/* Connect the mouse signals */
@@ -34586,7 +34956,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int eventMask = OS.GDK_POINTER_MOTION_MASK | OS.GDK_BUTTON_PRESS_MASK | OS.GDK_BUTTON_RELEASE_MASK;
OS.gtk_widget_add_events (eventHandle, eventMask);
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
-@@ -204,7 +204,7 @@
+@@ -211,7 +211,7 @@
OS.g_signal_connect_closure_by_id (eventHandle, display.signalIds [SCROLL_EVENT], 0, display.closures [SCROLL_EVENT], false);
/* Connect enter/exit signals */
@@ -34595,7 +34965,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int enterExitMask = OS.GDK_ENTER_NOTIFY_MASK | OS.GDK_LEAVE_NOTIFY_MASK;
OS.gtk_widget_add_events (enterExitHandle, enterExitMask);
OS.g_signal_connect_closure_by_id (enterExitHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
-@@ -220,7 +220,7 @@
+@@ -227,7 +227,7 @@
* The signal is hooked to the fixedHandle to catch events sent to
* lightweight widgets.
*/
@@ -34604,7 +34974,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT_INVERSE], true);
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT_INVERSE], true);
OS.g_signal_connect_closure_by_id (blockHandle, display.signalIds [MOTION_NOTIFY_EVENT], 0, display.closures [MOTION_NOTIFY_EVENT_INVERSE], true);
-@@ -232,7 +232,7 @@
+@@ -239,7 +239,7 @@
}
/* Connect the paint signal */
@@ -34613,7 +34983,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int paintMask = OS.GDK_EXPOSURE_MASK | OS.GDK_VISIBILITY_NOTIFY_MASK;
OS.gtk_widget_add_events (paintHandle, paintMask);
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [EXPOSE_EVENT], 0, display.closures [EXPOSE_EVENT_INVERSE], false);
-@@ -242,7 +242,7 @@
+@@ -249,7 +249,7 @@
/* Connect the Input Method signals */
OS.g_signal_connect_closure_by_id (handle, display.signalIds [REALIZE], 0, display.closures [REALIZE], true);
OS.g_signal_connect_closure_by_id (handle, display.signalIds [UNREALIZE], 0, display.closures [UNREALIZE], false);
@@ -34622,7 +34992,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (imHandle != 0) {
OS.g_signal_connect_closure (imHandle, OS.commit, display.closures [COMMIT], false);
OS.g_signal_connect_closure (imHandle, OS.preedit_changed, display.closures [PREEDIT_CHANGED], false);
-@@ -250,11 +250,11 @@
+@@ -257,11 +257,11 @@
OS.g_signal_connect_closure_by_id (paintHandle, display.signalIds [STYLE_SET], 0, display.closures [STYLE_SET], false);
@@ -34636,7 +35006,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int [] x = new int [1], y = new int [1], mask = new int [1];
OS.gdk_window_get_pointer (0, x, y, mask);
sendMouseEvent (SWT.MouseHover, 0, /*time*/0, x [0], y [0], false, mask [0]);
-@@ -262,14 +262,14 @@
+@@ -269,14 +269,14 @@
return 0;
}
@@ -34655,7 +35025,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
while (paintHandle != topHandle) {
if ((OS.GTK_WIDGET_FLAGS (paintHandle) & OS.GTK_NO_WINDOW) == 0) break;
paintHandle = OS.gtk_widget_get_parent (paintHandle);
-@@ -277,8 +277,8 @@
+@@ -284,8 +284,8 @@
return paintHandle;
}
@@ -34666,7 +35036,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (paintHandle);
return OS.GTK_WIDGET_WINDOW (paintHandle);
}
-@@ -304,25 +304,25 @@
+@@ -311,25 +311,25 @@
checkWidget ();
if (gc == null) error (SWT.ERROR_NULL_ARGUMENT);
if (gc.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -34689,16 +35059,16 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle);
+ long /*int*/ topHandle = topHandle ();
+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topHandle);
- printWindow (true, this, gc.handle, drawable, depth, window, x, y);
+ printWindow (true, this, gc, drawable, depth, window, x, y);
if (obscured) state |= OBSCURED;
}
--void printWindow (boolean first, Control control, int /*long*/ gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) {
-+void printWindow (boolean first, Control control, long /*int*/ gc, long /*int*/ drawable, int depth, long /*int*/ window, int x, int y) {
+-void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) {
++void printWindow (boolean first, Control control, GC gc, long /*int*/ drawable, int depth, long /*int*/ window, int x, int y) {
if (OS.gdk_drawable_get_depth (window) != depth) return;
GdkRectangle rect = new GdkRectangle ();
int [] width = new int [1], height = new int [1];
-@@ -330,13 +330,13 @@
+@@ -337,13 +337,13 @@
rect.width = width [0];
rect.height = height [0];
OS.gdk_window_begin_paint_rect (window, rect);
@@ -34715,7 +35085,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkEventExpose event = new GdkEventExpose ();
event.type = OS.GDK_EXPOSE;
event.window = OS.g_object_ref (window);
-@@ -352,7 +352,7 @@
+@@ -359,7 +359,7 @@
if (!first) {
int [] cX = new int [1], cY = new int [1];
OS.gdk_window_get_position (window, cX, cY);
@@ -34724,9 +35094,34 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int [] pW = new int [1], pH = new int [1];
OS.gdk_drawable_get_size (parentWindow, pW, pH);
srcX = x_offset [0] - cX [0];
-@@ -364,13 +364,13 @@
+@@ -370,18 +370,18 @@
+ destHeight = Math.min (cY [0] + height [0], pH [0]);
+ }
+ GCData gcData = gc.getGCData();
+- int /*long*/ cairo = gcData.cairo;
++ long /*int*/ cairo = gcData.cairo;
+ if (cairo != 0) {
+- int /*long*/ xDisplay = OS.GDK_DISPLAY();
+- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+- int /*long*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);
+- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);
++ long /*int*/ xDisplay = OS.GDK_DISPLAY();
++ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
++ long /*int*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);
++ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);
+ if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ Cairo.cairo_save(cairo);
+ Cairo.cairo_rectangle(cairo, destX , destY, destWidth, destHeight);
+ Cairo.cairo_clip(cairo);
+ Cairo.cairo_translate(cairo, destX, destY);
+- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
++ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
+ if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);
+ Cairo.cairo_set_source(cairo, pattern);
+@@ -397,13 +397,13 @@
+ OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
}
- OS.gdk_draw_drawable (drawable, gc, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
OS.gdk_window_end_paint (window);
- int /*long*/ children = OS.gdk_window_get_children (window);
+ long /*int*/ children = OS.gdk_window_get_children (window);
@@ -34742,7 +35137,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gdk_window_get_user_data (child, data);
if (data [0] != 0) {
Widget widget = display.findWidget (data [0]);
-@@ -484,7 +484,7 @@
+@@ -517,7 +517,7 @@
if ((style & SWT.RIGHT_TO_LEFT) != 0) style |= SWT.MIRRORED;
}
@@ -34751,7 +35146,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
return parent.childStyle ();
}
-@@ -544,7 +544,7 @@
+@@ -577,7 +577,7 @@
return computeNativeSize (handle, wHint, hHint, changed);
}
@@ -34760,7 +35155,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int width = wHint, height = hHint;
if (wHint == SWT.DEFAULT && hHint == SWT.DEFAULT) {
GtkRequisition requisition = new GtkRequisition ();
-@@ -570,7 +570,7 @@
+@@ -603,7 +603,7 @@
* topHandle. Note that all calls to gtk_widget_size_allocate()
* must be preceded by a call to gtk_widget_size_request().
*/
@@ -34769,7 +35164,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GtkRequisition requisition = new GtkRequisition ();
gtk_widget_size_request (topHandle, requisition);
GtkAllocation allocation = new GtkAllocation ();
-@@ -621,7 +621,7 @@
+@@ -654,7 +654,7 @@
*/
public Rectangle getBounds () {
checkWidget();
@@ -34778,7 +35173,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -686,7 +686,7 @@
+@@ -719,7 +719,7 @@
/* Do nothing */
}
@@ -34787,7 +35182,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
super.modifyStyle(handle, style);
/*
* Bug in GTK. When changing the style of a control that
-@@ -697,8 +697,8 @@
+@@ -730,8 +730,8 @@
}
void moveHandle (int x, int y) {
@@ -34798,7 +35193,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
/*
* Feature in GTK. Calling gtk_fixed_move() to move a child causes
* the whole parent to redraw. This is a performance problem. The
-@@ -716,13 +716,13 @@
+@@ -749,13 +749,13 @@
}
void resizeHandle (int width, int height) {
@@ -34814,7 +35209,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
boolean sendMove = move;
if ((parent.style & SWT.MIRRORED) != 0) {
int clientWidth = parent.getClientWidth ();
-@@ -846,7 +846,7 @@
+@@ -879,7 +879,7 @@
*/
public Point getLocation () {
checkWidget();
@@ -34823,7 +35218,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int x = OS.GTK_WIDGET_X (topHandle);
int y = OS.GTK_WIDGET_Y (topHandle);
if ((parent.style & SWT.MIRRORED) != 0) {
-@@ -911,7 +911,7 @@
+@@ -944,7 +944,7 @@
*/
public Point getSize () {
checkWidget();
@@ -34832,7 +35227,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (topHandle);
return new Point (width, height);
-@@ -961,15 +961,15 @@
+@@ -994,15 +994,15 @@
public void setRegion (Region region) {
checkWidget ();
if (region != null && region.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
@@ -34852,7 +35247,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (list == 0) return;
int count = OS.g_list_length (list);
if (count > 1) {
-@@ -977,7 +977,7 @@
+@@ -1010,7 +1010,7 @@
* the receiver is the last item in the list, so its predecessor will
* be the second-last item in the list
*/
@@ -34861,7 +35256,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (handle != 0) {
Widget widget = display.getWidget (handle);
if (widget != null && widget != this) {
-@@ -1020,7 +1020,7 @@
+@@ -1058,7 +1058,7 @@
return true;
}
@@ -34870,7 +35265,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
return widget == focusHandle ();
}
-@@ -1159,7 +1159,7 @@
+@@ -1197,7 +1197,7 @@
*/
public Point toControl (int x, int y) {
checkWidget ();
@@ -34879,7 +35274,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
x -= origin_x [0];
-@@ -1208,7 +1208,7 @@
+@@ -1246,7 +1246,7 @@
*/
public Point toDisplay (int x, int y) {
checkWidget();
@@ -34888,7 +35283,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if ((style & SWT.MIRRORED) != 0) x = getClientWidth () - x;
-@@ -1856,12 +1856,12 @@
+@@ -1894,12 +1894,12 @@
*/
void removeRelation () {
if (!isDescribedByLabel ()) return; /* there will not be any */
@@ -34904,16 +35299,16 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
ATK.atk_relation_set_remove (set, relation);
}
OS.g_object_unref (set);
-@@ -1984,7 +1984,7 @@
+@@ -2022,7 +2022,7 @@
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean quit = false, dragging = false;
while (!quit) {
- int /*long*/ eventPtr = 0;
+ long /*int*/ eventPtr = 0;
- while (true) {
- eventPtr = OS.gdk_event_get ();
- if (eventPtr != 0) {
-@@ -2032,8 +2032,8 @@
+ /*
+ * There should be an event on the queue already, but
+ * in cases where there isn't one, stop trying after
+@@ -2077,8 +2077,8 @@
return dragging;
}
@@ -34924,7 +35319,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (imHandle != 0) {
return OS.gtk_im_context_filter_keypress (imHandle, event);
}
-@@ -2055,13 +2055,13 @@
+@@ -2100,13 +2100,13 @@
oldDecorations.fixDecorations (newDecorations, this, menus);
}
@@ -34942,7 +35337,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (OS.GTK_WIDGET_VISIBLE (child) && OS.gtk_widget_get_child_visible (child) && !OS.GTK_WIDGET_MAPPED (child)) {
OS.gtk_widget_map (child);
}
-@@ -2075,7 +2075,7 @@
+@@ -2120,7 +2120,7 @@
return 0;
}
@@ -34951,12 +35346,13 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
}
/**
-@@ -2101,13 +2101,13 @@
+@@ -2146,14 +2146,14 @@
return forceFocus (focusHandle ());
}
-boolean forceFocus (int /*long*/ focusHandle) {
+boolean forceFocus (long /*int*/ focusHandle) {
+ if (OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return true;
/* When the control is zero sized it must be realized */
OS.gtk_widget_realize (focusHandle);
OS.gtk_widget_grab_focus (focusHandle);
@@ -34966,9 +35362,9 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
+ long /*int*/ shellHandle = shell.shellHandle;
+ long /*int*/ handle = OS.gtk_window_get_focus (shellHandle);
while (handle != 0) {
- if (handle == focusHandle) return true;
- Widget widget = display.getWidget (handle);
-@@ -2160,7 +2160,7 @@
+ if (handle == focusHandle) {
+ /* Cancel any previous ignoreFocus requests */
+@@ -2214,7 +2214,7 @@
}
GdkColor getBgColor () {
@@ -34977,7 +35373,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_bg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2168,7 +2168,7 @@
+@@ -2222,7 +2222,7 @@
}
GdkColor getBaseColor () {
@@ -34986,7 +35382,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_base (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2268,8 +2268,8 @@
+@@ -2327,8 +2327,8 @@
return font != null ? font : defaultFont ();
}
@@ -34997,7 +35393,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (fontHandle);
return OS.gtk_style_get_font_desc (OS.gtk_widget_get_style (fontHandle));
}
-@@ -2294,7 +2294,7 @@
+@@ -2353,7 +2353,7 @@
}
GdkColor getFgColor () {
@@ -35006,7 +35402,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_fg (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2306,7 +2306,7 @@
+@@ -2365,7 +2365,7 @@
}
GdkColor getTextColor () {
@@ -35015,7 +35411,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (fontHandle);
GdkColor color = new GdkColor ();
OS.gtk_style_get_text (OS.gtk_widget_get_style (fontHandle), OS.GTK_STATE_NORMAL, color);
-@@ -2358,7 +2358,7 @@
+@@ -2417,7 +2417,7 @@
public Monitor getMonitor () {
checkWidget();
Monitor monitor = null;
@@ -35024,7 +35420,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
GdkRectangle dest = new GdkRectangle ();
-@@ -2501,11 +2501,11 @@
+@@ -2560,11 +2560,11 @@
return (state & HIDDEN) == 0;
}
@@ -35038,7 +35434,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-@@ -2520,10 +2520,10 @@
+@@ -2579,10 +2579,10 @@
if (((shell.style & SWT.ON_TOP) != 0) && (((shell.style & SWT.NO_FOCUS) == 0) || ((style & SWT.NO_FOCUS) == 0))) {
shell.forceActive();
}
@@ -35051,7 +35447,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (nextEvent != 0) {
int eventType = OS.GDK_EVENT_TYPE (nextEvent);
if (eventType == OS.GDK_2BUTTON_PRESS) display.clickCount = 2;
-@@ -2570,7 +2570,7 @@
+@@ -2629,7 +2629,7 @@
return result;
}
@@ -35060,7 +35456,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
/*
-@@ -2589,7 +2589,7 @@
+@@ -2648,7 +2648,7 @@
return sendMouseEvent (SWT.MouseUp, button, display.clickCount, 0, false, gdkEvent.time, gdkEvent.x_root, gdkEvent.y_root, false, gdkEvent.state) ? 0 : 1;
}
@@ -35069,7 +35465,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (text == 0) return 0;
int length = OS.strlen (text);
if (length == 0) return 0;
-@@ -2600,7 +2600,7 @@
+@@ -2659,7 +2659,7 @@
return 0;
}
@@ -35078,7 +35474,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
/*
* Feature in GTK. Children of a shell will inherit and display the shell's
-@@ -2613,7 +2613,7 @@
+@@ -2672,7 +2672,7 @@
char [] chars = fixMnemonic (toolTipText, false);
buffer = Converter.wcsToMbcs (null, chars, true);
}
@@ -35087,8 +35483,8 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_set_tooltip_text (toolHandle, buffer);
}
if (display.currentControl == this) return 0;
-@@ -2632,7 +2632,7 @@
- return 0;
+@@ -2702,7 +2702,7 @@
+ return false;
}
-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
@@ -35096,7 +35492,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -2672,7 +2672,7 @@
+@@ -2744,7 +2744,7 @@
}
} else {
display.ignoreFocus = false;
@@ -35105,7 +35501,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (grabHandle != 0) {
if (OS.G_OBJECT_TYPE (grabHandle) == OS.GTK_TYPE_MENU ()) {
display.ignoreFocus = true;
-@@ -2688,7 +2688,7 @@
+@@ -2760,7 +2760,7 @@
return 0;
}
@@ -35114,7 +35510,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if ((state & OBSCURED) != 0) return 0;
if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
-@@ -2710,34 +2710,34 @@
+@@ -2782,34 +2782,34 @@
return 0;
}
@@ -35155,7 +35551,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (imHandle != 0) {
OS.gtk_im_context_focus_out (imHandle);
}
-@@ -2746,7 +2746,7 @@
+@@ -2818,7 +2818,7 @@
return 0;
}
@@ -35164,7 +35560,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (!hasFocus ()) return 0;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, event, GdkEventKey.sizeof);
-@@ -2765,16 +2765,16 @@
+@@ -2837,16 +2837,16 @@
return super.gtk_key_press_event (widget, event);
}
@@ -35184,7 +35580,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (display.currentControl != this) return 0;
display.removeMouseHoverTimeout (handle);
int result = 0;
-@@ -2789,15 +2789,15 @@
+@@ -2861,15 +2861,15 @@
return result;
}
@@ -35203,7 +35599,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (focusHandle != 0) {
display.mnemonicControl = this;
OS.gtk_widget_event (focusHandle, eventPtr);
-@@ -2810,7 +2810,7 @@
+@@ -2882,7 +2882,7 @@
return result;
}
@@ -35212,7 +35608,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
if (this == display.currentControl && (hooks (SWT.MouseHover) || filters (SWT.MouseHover))) {
-@@ -2820,7 +2820,7 @@
+@@ -2892,7 +2892,7 @@
int state = gdkEvent.state;
if (gdkEvent.is_hint != 0) {
int [] pointer_x = new int [1], pointer_y = new int [1], mask = new int [1];
@@ -35221,7 +35617,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gdk_window_get_pointer (window, pointer_x, pointer_y, mask);
x = pointer_x [0];
y = pointer_y [0];
-@@ -2830,32 +2830,32 @@
+@@ -2902,32 +2902,32 @@
return result;
}
@@ -35261,7 +35657,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkEventScroll gdkEvent = new GdkEventScroll ();
OS.memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);
switch (gdkEvent.direction) {
-@@ -2871,29 +2871,29 @@
+@@ -2943,29 +2943,29 @@
return 0;
}
@@ -35298,7 +35694,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (window == paintWindow) {
if (gdkEvent.state == OS.GDK_VISIBILITY_FULLY_OBSCURED) {
state |= OBSCURED;
-@@ -2912,7 +2912,7 @@
+@@ -2984,7 +2984,7 @@
return 0;
}
@@ -35307,7 +35703,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_size_request (widget, requisition);
}
-@@ -2929,11 +2929,11 @@
+@@ -3001,11 +3001,11 @@
* @param data the platform specific GC data
* @return the platform specific GC handle
*/
@@ -35322,7 +35718,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (gdkGC == 0) error (SWT.ERROR_NO_HANDLES);
if (data != null) {
int mask = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
-@@ -2955,7 +2955,7 @@
+@@ -3027,7 +3027,7 @@
return gdkGC;
}
@@ -35331,7 +35727,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
return 0;
}
-@@ -2972,7 +2972,7 @@
+@@ -3044,7 +3044,7 @@
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -35340,7 +35736,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
checkWidget ();
OS.g_object_unref (gdkGC);
}
-@@ -3112,7 +3112,7 @@
+@@ -3184,7 +3184,7 @@
void register () {
super.register ();
if (fixedHandle != 0) display.addWidget (fixedHandle, this);
@@ -35349,7 +35745,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (imHandle != 0) display.addWidget (imHandle, this);
}
-@@ -3188,7 +3188,7 @@
+@@ -3260,7 +3260,7 @@
void redrawWidget (int x, int y, int width, int height, boolean redrawAll, boolean all, boolean trim) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
@@ -35358,7 +35754,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
int [] w = new int [1], h = new int [1];
-@@ -3238,7 +3238,7 @@
+@@ -3310,7 +3310,7 @@
super.releaseWidget ();
if (display.currentControl == this) display.currentControl = null;
display.removeMouseHoverTimeout (handle);
@@ -35367,7 +35763,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (imHandle != 0) {
OS.gtk_im_context_reset (imHandle);
OS.gtk_im_context_set_client_window (imHandle, 0);
-@@ -3304,7 +3304,7 @@
+@@ -3376,7 +3376,7 @@
}
}
@@ -35376,7 +35772,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
Control control = this;
while (control != null) {
if (control.hooks (SWT.Help)) {
-@@ -3335,7 +3335,7 @@
+@@ -3407,7 +3407,7 @@
event.x = (int)x;
event.y = (int)y;
} else {
@@ -35385,7 +35781,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
event.x = (int)x - origin_x [0];
-@@ -3389,7 +3389,7 @@
+@@ -3461,7 +3461,7 @@
}
boolean set = false;
if (gdkColor == null) {
@@ -35394,7 +35790,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_BG) != 0;
} else {
GdkColor oldColor = getBackgroundColor ();
-@@ -3406,10 +3406,10 @@
+@@ -3478,10 +3478,10 @@
}
}
@@ -35408,7 +35804,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (ptr != 0) OS.g_free (ptr);
String name = color == null ? "<parent>" : "<none>";
byte[] buffer = Converter.wcsToMbcs (null, name, true);
-@@ -3463,8 +3463,8 @@
+@@ -3535,8 +3535,8 @@
redrawChildren ();
}
@@ -35419,7 +35815,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (window != 0) OS.gdk_window_set_back_pixmap (window, backgroundImage.pixmap, false);
}
-@@ -3518,14 +3518,14 @@
+@@ -3590,14 +3590,14 @@
setCursor (cursor != null ? cursor.handle : 0);
}
@@ -35437,7 +35833,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.XFlush (xDisplay);
}
}
-@@ -3593,9 +3593,9 @@
+@@ -3665,9 +3665,9 @@
}
} else {
OS.gtk_widget_realize (handle);
@@ -35450,7 +35846,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.x = OS.GTK_WIDGET_X (topHandle);
attributes.y = OS.GTK_WIDGET_Y (topHandle);
-@@ -3610,9 +3610,9 @@
+@@ -3682,9 +3682,9 @@
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_window_raise (enableWindow);
} else {
@@ -35463,7 +35859,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int xScreen = OS.XDefaultScreen (xDisplay);
int flags = OS.CWStackMode | OS.CWSibling;
XWindowChanges changes = new XWindowChanges ();
-@@ -3665,7 +3665,7 @@
+@@ -3737,7 +3737,7 @@
checkWidget();
if (((state & FONT) == 0) && font == null) return;
this.font = font;
@@ -35472,7 +35868,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (font == null) {
fontDesc = defaultFont ().handle;
} else {
-@@ -3680,7 +3680,7 @@
+@@ -3752,7 +3752,7 @@
setFontDescription (fontDesc);
}
@@ -35481,7 +35877,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_modify_font (handle, font);
}
-@@ -3711,7 +3711,7 @@
+@@ -3783,7 +3783,7 @@
}
boolean set = false;
if (gdkColor == null) {
@@ -35490,7 +35886,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
set = (OS.gtk_rc_style_get_color_flags (style, OS.GTK_STATE_NORMAL) & OS.GTK_RC_FG) != 0;
} else {
GdkColor oldColor = getForegroundColor ();
-@@ -3739,7 +3739,7 @@
+@@ -3811,7 +3811,7 @@
* first sized. The fix is to set the value to (0, 0) as
* expected by SWT.
*/
@@ -35499,16 +35895,16 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if ((parent.style & SWT.MIRRORED) != 0) {
OS.GTK_WIDGET_SET_X (topHandle, parent.getClientWidth ());
} else {
-@@ -3820,7 +3820,7 @@
- if (parent.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+@@ -3893,7 +3893,7 @@
if (this.parent == parent) return true;
if (!isReparentable ()) return false;
+ OS.gtk_widget_realize (parent.handle);
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
int x = OS.GTK_WIDGET_X (topHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
if ((this.parent.style & SWT.MIRRORED) != 0) {
-@@ -3839,7 +3839,7 @@
+@@ -3912,7 +3912,7 @@
newDecorations.fixAccelGroup ();
oldDecorations.fixAccelGroup ();
}
@@ -35517,7 +35913,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_reparent (topHandle, newParent);
OS.gtk_fixed_move (newParent, topHandle, x, y);
this.parent = parent;
-@@ -3852,7 +3852,7 @@
+@@ -3925,7 +3925,7 @@
if (fixedHandle != 0) setBackgroundColor (fixedHandle, null);
}
@@ -35526,7 +35922,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
}
boolean setRadioSelection (boolean value) {
-@@ -3887,7 +3887,7 @@
+@@ -3960,7 +3960,7 @@
if (redraw) {
if (--drawCount == 0) {
if (redrawWindow != 0) {
@@ -35535,7 +35931,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
/* Explicitly hiding the window avoids flicker on GTK+ >= 2.6 */
OS.gdk_window_hide (redrawWindow);
OS.gdk_window_destroy (redrawWindow);
-@@ -3898,7 +3898,7 @@
+@@ -3971,7 +3971,7 @@
} else {
if (drawCount++ == 0) {
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) != 0) {
@@ -35544,7 +35940,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
-@@ -3987,7 +3987,7 @@
+@@ -4066,7 +4066,7 @@
public void setVisible (boolean visible) {
checkWidget();
if (((state & HIDDEN) == 0) == visible) return;
@@ -35553,7 +35949,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (visible) {
/*
* It is possible (but unlikely), that application
-@@ -4068,11 +4068,11 @@
+@@ -4147,11 +4147,11 @@
}
}
@@ -35569,7 +35965,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (sibling != null) {
if (above && sibling.enableWindow != 0) {
siblingWindow = enableWindow;
-@@ -4080,7 +4080,7 @@
+@@ -4159,7 +4159,7 @@
siblingWindow = OS.GTK_WIDGET_WINDOW (siblingHandle);
}
}
@@ -35578,7 +35974,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (!OS.GDK_WINDOWING_X11 () || (siblingWindow == 0 && (!above || redrawWindow == 0))) {
if (above) {
OS.gdk_window_raise (window);
-@@ -4095,8 +4095,8 @@
+@@ -4174,8 +4174,8 @@
changes.sibling = OS.gdk_x11_drawable_get_xid (siblingWindow != 0 ? siblingWindow : redrawWindow);
changes.stack_mode = above ? OS.Above : OS.Below;
if (redrawWindow != 0 && siblingWindow == 0) changes.stack_mode = OS.Below;
@@ -35589,7 +35985,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
int xScreen = OS.XDefaultScreen (xDisplay);
int flags = OS.CWStackMode | OS.CWSibling;
/*
-@@ -4163,10 +4163,10 @@
+@@ -4242,10 +4242,10 @@
void setWidgetBackground () {
if (fixedHandle != 0) {
@@ -35602,7 +35998,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
modifyStyle (handle, style);
}
-@@ -4192,8 +4192,8 @@
+@@ -4273,8 +4273,8 @@
void showWidget () {
// Comment this line to disable zero-sized widgets
state |= ZERO_WIDTH | ZERO_HEIGHT;
@@ -35613,7 +36009,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
parent.setParentWindow (topHandle);
OS.gtk_container_add (parentHandle, topHandle);
if (handle != 0 && handle != topHandle) OS.gtk_widget_show (handle);
-@@ -4460,7 +4460,7 @@
+@@ -4541,7 +4541,7 @@
// checkWidget();
if (!OS.GTK_WIDGET_VISIBLE (topHandle ())) return;
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
@@ -35622,7 +36018,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
if (flush) display.flushExposes (window, all);
OS.gdk_window_process_updates (window, all);
OS.gdk_flush ();
-@@ -4478,7 +4478,7 @@
+@@ -4559,7 +4559,7 @@
/* Do nothing */
}
@@ -35631,7 +36027,7 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
switch ((int)/*64*/user_data) {
case EXPOSE_EVENT_INVERSE: {
if ((OS.GTK_VERSION < OS.VERSION (2, 8, 0)) && ((state & OBSCURED) == 0)) {
-@@ -4486,10 +4486,10 @@
+@@ -4567,10 +4567,10 @@
if (control != null && control.backgroundImage != null) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, arg0, GdkEventExpose.sizeof);
@@ -35645,10 +36041,10 @@ diff -ur x86/org/eclipse/swt/widgets/Control.java x86_64/org/eclipse/swt/widgets
OS.gdk_gc_set_clip_region (gdkGC, gdkEvent.region);
int[] dest_x = new int[1], dest_y = new int[1];
OS.gtk_widget_translate_coordinates (paintHandle (), control.paintHandle (), 0, 0, dest_x, dest_y);
-diff -ur x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widgets/DateTime.java
---- x86/org/eclipse/swt/widgets/DateTime.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/DateTime.java 2009-02-11 17:43:50.000000000 -0500
-@@ -473,12 +473,12 @@
+diff -urN x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widgets/DateTime.java
+--- x86/org/eclipse/swt/widgets/DateTime.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/DateTime.java 2009-09-17 08:48:24.000000000 -0400
+@@ -483,17 +483,17 @@
}
}
@@ -35658,15 +36054,21 @@ diff -ur x86/org/eclipse/swt/widgets/DateTime.java x86_64/org/eclipse/swt/widget
return 0;
}
+-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {
++long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) {
+ postEvent(SWT.DefaultSelection);
+ return 0;
+ }
+
-int /*long*/ gtk_month_changed (int /*long*/ widget) {
+long /*int*/ gtk_month_changed (long /*int*/ widget) {
sendSelectionEvent ();
return 0;
}
-diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/widgets/Decorations.java
---- x86/org/eclipse/swt/widgets/Decorations.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Decorations.java 2009-02-11 17:43:50.000000000 -0500
-@@ -101,7 +101,7 @@
+diff -urN x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/widgets/Decorations.java
+--- x86/org/eclipse/swt/widgets/Decorations.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Decorations.java 2009-09-17 08:48:24.000000000 -0400
+@@ -102,7 +102,7 @@
Menu [] menus;
Control savedFocus;
Button defaultButton, saveDefault;
@@ -35675,7 +36077,7 @@ diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wid
Decorations () {
/* Do nothing */
-@@ -170,17 +170,17 @@
+@@ -171,17 +171,17 @@
sort (bestImages);
images = bestImages;
}
@@ -35697,7 +36099,7 @@ diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wid
while (temp != 0) {
OS.memmove (data, temp, OS.PTR_SIZEOF);
OS.g_object_unref (data [0]);
-@@ -231,7 +231,7 @@
+@@ -232,7 +232,7 @@
accelGroup = OS.gtk_accel_group_new ();
if (accelGroup == 0) SWT.error (SWT.ERROR_NO_HANDLES);
//FIXME - what should we do for Decorations
@@ -35706,7 +36108,7 @@ diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wid
OS.gtk_window_add_accel_group (shellHandle, accelGroup);
}
-@@ -242,7 +242,7 @@
+@@ -243,7 +243,7 @@
void destroyAccelGroup () {
if (accelGroup == 0) return;
@@ -35715,7 +36117,7 @@ diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wid
OS.gtk_window_remove_accel_group (shellHandle, accelGroup);
//TEMPORARY CODE
// OS.g_object_unref (accelGroup);
-@@ -532,7 +532,7 @@
+@@ -533,7 +533,7 @@
*/
public void setDefaultButton (Button button) {
checkWidget();
@@ -35724,7 +36126,7 @@ diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wid
if (button != null) {
if (button.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
if (button.menuShell () != this) error (SWT.ERROR_INVALID_PARENT);
-@@ -744,7 +744,7 @@
+@@ -745,7 +745,7 @@
* key.
*/
if (!button.isVisible () || !button.isEnabled ()) return true;
@@ -35733,29 +36135,30 @@ diff -ur x86/org/eclipse/swt/widgets/Decorations.java x86_64/org/eclipse/swt/wid
return OS.gtk_window_activate_default (shellHandle);
}
-diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt/widgets/DirectoryDialog.java
---- x86/org/eclipse/swt/widgets/DirectoryDialog.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/DirectoryDialog.java 2009-02-11 17:43:50.000000000 -0500
-@@ -124,15 +124,15 @@
+diff -urN x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt/widgets/DirectoryDialog.java
+--- x86/org/eclipse/swt/widgets/DirectoryDialog.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/DirectoryDialog.java 2009-09-17 08:48:24.000000000 -0400
+@@ -125,16 +125,16 @@
}
String openChooserDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
- int /*long*/ shellHandle = parent.topHandle ();
-- int /*long*/ handle = OS.gtk_file_chooser_dialog_new (
+ long /*int*/ shellHandle = parent.topHandle ();
-+ long /*int*/ handle = OS.gtk_file_chooser_dialog_new (
- titleBytes,
- shellHandle,
- OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL,
- OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK,
- 0);
+ Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
+- int /*long*/ handle = 0;
++ long /*int*/ handle = 0;
+ if (display.getDismissalAlignment() == SWT.RIGHT) {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
+ } else {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
+ }
+ OS.gtk_window_set_modal (handle, true);
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -150,7 +150,7 @@
+@@ -152,7 +152,7 @@
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
@@ -35764,7 +36167,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
if (ptr != 0) {
OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
-@@ -158,9 +158,9 @@
+@@ -160,9 +160,9 @@
}
if (message.length () > 0) {
byte [] buffer = Converter.wcsToMbcs (null, message, true);
@@ -35776,7 +36179,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
if (label == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (box, label);
OS.gtk_widget_show (label);
-@@ -177,7 +177,7 @@
+@@ -178,7 +178,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -35785,7 +36188,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -190,13 +190,13 @@
+@@ -191,13 +191,13 @@
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -35803,7 +36206,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -215,11 +215,11 @@
+@@ -216,11 +216,11 @@
}
String openClassicDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
@@ -35818,7 +36221,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -234,8 +234,8 @@
+@@ -236,8 +236,8 @@
int length = path.length ();
char [] buffer = new char [length + 1];
path.getChars (0, length, buffer, 0);
@@ -35829,7 +36232,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
OS.gtk_file_selection_set_filename (handle, fileNamePtr);
OS.g_free (utf8Ptr);
OS.g_free (fileNamePtr);
-@@ -243,12 +243,12 @@
+@@ -245,12 +245,12 @@
GtkFileSelection selection = new GtkFileSelection ();
OS.memmove (selection, handle);
OS.gtk_file_selection_hide_fileop_buttons (handle);
@@ -35844,7 +36247,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
OS.gtk_label_set_line_wrap (labelHandle, true);
OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);
OS.gtk_container_add (selection.main_vbox, labelHandle);
-@@ -264,7 +264,7 @@
+@@ -266,7 +266,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -35853,7 +36256,7 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -277,11 +277,11 @@
+@@ -279,11 +279,11 @@
display.setModalDialog (oldModal);
}
if (response == OS.GTK_RESPONSE_OK) {
@@ -35869,10 +36272,10 @@ diff -ur x86/org/eclipse/swt/widgets/DirectoryDialog.java x86_64/org/eclipse/swt
if (utf16Ptr != 0) {
int length = (int)/*64*/items_written [0];
char [] buffer = new char [length];
-diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets/Display.java
---- x86/org/eclipse/swt/widgets/Display.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Display.java 2009-02-11 17:43:50.000000000 -0500
-@@ -97,29 +97,29 @@
+diff -urN x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets/Display.java
+--- x86/org/eclipse/swt/widgets/Display.java 2009-05-29 17:20:00.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Display.java 2009-09-17 08:48:24.000000000 -0400
+@@ -98,29 +98,29 @@
/* Events Dispatching and Callback */
int gdkEventCount;
@@ -35908,7 +36311,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget lastWidget;
Widget [] widgetTable;
final static int GROW_SIZE = 1024;
-@@ -150,7 +150,7 @@
+@@ -151,7 +151,7 @@
/* Input method resources */
Control imControl;
@@ -35917,7 +36320,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
/* Sync/Async Widget Communication */
Synchronizer synchronizer = new Synchronizer (this);
-@@ -166,40 +166,40 @@
+@@ -167,40 +167,40 @@
int [] timerIds;
Runnable [] timerList;
Callback timerCallback;
@@ -35967,7 +36370,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int idleHandle;
Callback idleCallback;
static final String ADD_IDLE_PROC_KEY = "org.eclipse.swt.internal.gtk.addIdleProc"; //$NON-NLS-1$
-@@ -210,29 +210,29 @@
+@@ -211,29 +211,29 @@
/* GtkTreeView callbacks */
int[] treeSelection;
int treeSelectionLength;
@@ -36004,7 +36407,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
boolean settingsChanged, runSettings;
/* Entry focus behaviour */
-@@ -242,14 +242,14 @@
+@@ -243,14 +243,14 @@
Control currentControl;
/* Flush exposes */
@@ -36022,9 +36425,14 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
/* System Resources */
Font systemFont;
-@@ -276,16 +276,16 @@
+@@ -280,20 +280,20 @@
int lastEventTime, lastUserEventTime;
+ /* Pango layout constructor */
+- int /*long*/ pangoLayoutNewProc, pangoLayoutNewDefaultProc;
++ long /*int*/ pangoLayoutNewProc, pangoLayoutNewDefaultProc;
+ Callback pangoLayoutNewCallback;
+
/* Fixed Subclass */
- static int /*long*/ fixed_type;
- static int /*long*/ fixed_info_ptr;
@@ -36045,7 +36453,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
/* Key Mappings */
static final int [] [] KeyTable = {
-@@ -514,16 +514,16 @@
+@@ -522,16 +522,16 @@
filterTable.hook (eventType, listener);
}
@@ -36065,7 +36473,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
System.arraycopy (gdkEvents, 0, newEvents, 0, gdkEventCount);
gdkEvents = newEvents;
Widget [] newWidgets = new Widget [length];
-@@ -531,7 +531,7 @@
+@@ -539,7 +539,7 @@
gdkEventWidgets = newWidgets;
}
Widget widget = null;
@@ -36074,7 +36482,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (handle != 0) {
do {
widget = getWidget (handle);
-@@ -582,7 +582,7 @@
+@@ -590,7 +590,7 @@
eventTable.hook (eventType, listener);
}
@@ -36083,7 +36491,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
allChildren = OS.g_list_append (allChildren, widget);
if (recurse != 0 && OS.GTK_IS_CONTAINER (widget)) {
OS.gtk_container_forall (widget, allChildrenProc, recurse);
-@@ -590,7 +590,7 @@
+@@ -598,7 +598,7 @@
return 0;
}
@@ -36092,7 +36500,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);
mouseHoverId = OS.gtk_timeout_add (400, mouseHoverProc, handle);
mouseHoverHandle = handle;
-@@ -615,7 +615,7 @@
+@@ -623,7 +623,7 @@
popups [index] = menu;
}
@@ -36101,7 +36509,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (handle == 0) return;
if (freeSlot == -1) {
int length = (freeSlot = indexTable.length) + GROW_SIZE;
-@@ -688,12 +688,12 @@
+@@ -696,12 +696,12 @@
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -36116,7 +36524,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.cellDataProc (tree_column, cell, tree_model, iter, data);
-@@ -716,7 +716,7 @@
+@@ -724,7 +724,7 @@
}
}
@@ -36125,7 +36533,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int type = OS.X_EVENT_TYPE (xEvent);
switch (type) {
case OS.VisibilityNotify:
-@@ -726,11 +726,11 @@
+@@ -734,11 +734,11 @@
default:
return 0;
}
@@ -36139,7 +36547,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
do {
if (tempWindow == flushWindow) break;
} while ((tempWindow = OS.gdk_window_get_parent (tempWindow)) != 0);
-@@ -755,7 +755,7 @@
+@@ -763,7 +763,7 @@
case OS.VisibilityNotify: {
OS.memmove (visibilityEvent, xEvent, XVisibilityEvent.sizeof);
OS.gdk_window_get_user_data (window, flushData);
@@ -36148,7 +36556,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = handle != 0 ? getWidget (handle) : null;
if (widget != null && widget instanceof Control) {
Control control = (Control) widget;
-@@ -851,11 +851,11 @@
+@@ -859,11 +859,11 @@
OS.g_thread_init (0);
}
OS.gtk_set_locale();
@@ -36162,7 +36570,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (ptr != 0) {
int length = OS.strlen (ptr);
byte [] buffer = new byte [length];
-@@ -955,9 +955,9 @@
+@@ -963,9 +963,9 @@
}
Image createImage (String name) {
@@ -36174,7 +36582,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.gtk_icon_factory_lookup_default (buffer), style,
OS.GTK_TEXT_DIR_NONE, OS.GTK_STATE_NORMAL, OS.GTK_ICON_SIZE_DIALOG, 0, 0);
if (pixbuf == 0) return null;
-@@ -965,7 +965,7 @@
+@@ -973,7 +973,7 @@
int height = OS.gdk_pixbuf_get_height (pixbuf);
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha (pixbuf);
@@ -36183,7 +36591,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
byte [] data = new byte [stride * height];
OS.memmove (data, pixels, data.length);
OS.g_object_unref (pixbuf);
-@@ -990,29 +990,29 @@
+@@ -998,29 +998,29 @@
return new Image (this, imageData);
}
@@ -36221,7 +36629,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.memmove(maskLine, maskOffset, maskStride);
for (int x=0; x<w[0]; x++) {
if (maskLine[x * 3] == 0) {
-@@ -1031,10 +1031,10 @@
+@@ -1039,10 +1039,10 @@
if (hasAlpha) {
byte [] alpha = data.alphaData;
int stride = OS.gdk_pixbuf_get_rowstride (pixbuf);
@@ -36234,7 +36642,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.memmove (line, offset, stride);
for (int x = 0; x < w [0]; x++) {
line [x*4+3] = alpha [y*w [0]+x];
-@@ -1073,7 +1073,7 @@
+@@ -1081,7 +1081,7 @@
void destroyDisplay () {
}
@@ -36243,7 +36651,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (OS.gtk_widget_get_toplevel (OS.g_value_peek_pointer(param_values)) == data) {
OS.gtk_widget_set_direction (OS.g_value_peek_pointer(param_values), OS.GTK_TEXT_DIR_RTL);
}
-@@ -1142,7 +1142,7 @@
+@@ -1150,7 +1150,7 @@
SWT.error (code);
}
@@ -36252,7 +36660,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
/*
* Use gdk_event_get_time() rather than event.time or
* gtk_get_current_event_time(). If the event does not
-@@ -1197,7 +1197,7 @@
+@@ -1205,7 +1205,7 @@
* <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li>
* </ul>
*/
@@ -36261,7 +36669,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
checkDevice ();
return getWidget (handle);
}
-@@ -1224,7 +1224,7 @@
+@@ -1232,7 +1232,7 @@
*
* @since 3.1
*/
@@ -36270,7 +36678,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
checkDevice ();
return null;
}
-@@ -1246,12 +1246,12 @@
+@@ -1254,12 +1254,12 @@
*
* @since 3.3
*/
@@ -36285,7 +36693,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
GtkWidgetClass klass = new GtkWidgetClass ();
OS.memmove (klass, g_class);
klass.map = fixedMapProc;
-@@ -1261,21 +1261,21 @@
+@@ -1269,21 +1269,21 @@
return 0;
}
@@ -36310,7 +36718,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
klass.render = rendererRenderProc;
-@@ -1284,28 +1284,28 @@
+@@ -1292,28 +1292,28 @@
return 0;
}
@@ -36344,7 +36752,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.XCheckIfEvent (xDisplay, xEvent, checkIfEventProc, 0);
OS.g_free (xEvent);
this.flushWindow = 0;
-@@ -1358,7 +1358,7 @@
+@@ -1366,7 +1366,7 @@
int getCaretBlinkTime () {
// checkDevice ();
@@ -36353,7 +36761,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (settings == 0) return 500;
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_cursor_blink, buffer, 0);
-@@ -1388,9 +1388,9 @@
+@@ -1396,9 +1396,9 @@
public Control getCursorControl () {
checkDevice();
int[] x = new int[1], y = new int[1];
@@ -36366,7 +36774,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (window != 0) {
OS.gdk_window_get_user_data (window, user_data);
handle = user_data [0];
-@@ -1403,8 +1403,8 @@
+@@ -1411,8 +1411,8 @@
if (!OS.GDK_WINDOWING_X11 ()) return null;
OS.gdk_error_trap_push ();
int[] unusedInt = new int[1];
@@ -36377,7 +36785,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
do {
if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {
handle = 0;
-@@ -1412,7 +1412,7 @@
+@@ -1420,7 +1420,7 @@
}
if ((xWindow = buffer [0]) != 0) {
xParent = xWindow;
@@ -36386,7 +36794,26 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (gdkWindow != 0) {
OS.gdk_window_get_user_data (gdkWindow, user_data);
if (user_data[0] != 0) handle = user_data[0];
-@@ -1442,7 +1442,7 @@
+@@ -1440,15 +1440,15 @@
+ return null;
+ }
+
+-static GtkBorder getEntryInnerBorder (int /*long*/ handle) {
++static GtkBorder getEntryInnerBorder (long /*int*/ handle) {
+ GtkBorder gtkBorder = new GtkBorder();
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+- int /*long*/ border = OS.gtk_entry_get_inner_border (handle);
++ long /*int*/ border = OS.gtk_entry_get_inner_border (handle);
+ if (border != 0) {
+ OS.memmove (gtkBorder, border, GtkBorder.sizeof);
+ return gtkBorder;
+ }
+- int /*long*/ [] borderPtr = new int /*long*/ [1];
++ long /*int*/ [] borderPtr = new long /*int*/ [1];
+ OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
+ if (borderPtr[0] != 0) {
+ OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
+@@ -1473,7 +1473,7 @@
return filterTable.hooks (eventType);
}
@@ -36395,7 +36822,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (data == 0) {
/*
* Feature in GTK. When button 4, 5, 6, or 7 is released, GTK
-@@ -1599,19 +1599,19 @@
+@@ -1630,19 +1630,19 @@
return new Point (dpi, dpi);
}
@@ -36419,7 +36846,16 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
return toggle_renderer_type;
}
-@@ -1671,7 +1671,7 @@
+@@ -1687,7 +1687,7 @@
+ checkDevice ();
+ int [] buffer = new int [1];
+ if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+- int /*long*/ settings = OS.gtk_settings_get_default ();
++ long /*int*/ settings = OS.gtk_settings_get_default ();
+ OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
+ }
+ return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
+@@ -1707,7 +1707,7 @@
*/
public int getDoubleClickTime () {
checkDevice ();
@@ -36428,7 +36864,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int [] buffer = new int [1];
OS.g_object_get (settings, OS.gtk_double_click_time, buffer, 0);
return buffer [0];
-@@ -1696,8 +1696,8 @@
+@@ -1732,8 +1732,8 @@
return focusControl;
}
if (activeShell == null) return null;
@@ -36439,7 +36875,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (handle == 0) return null;
do {
Widget widget = getWidget (handle);
-@@ -1794,12 +1794,12 @@
+@@ -1830,12 +1830,12 @@
*/
Rectangle getWorkArea() {
byte[] name = Converter.wcsToMbcs (null, "_NET_WORKAREA", true); //$NON-NLS-1$
@@ -36455,7 +36891,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (!OS.gdk_property_get (OS.GDK_ROOT_PARENT (), atom, OS.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {
return null;
}
-@@ -1830,7 +1830,7 @@
+@@ -1866,7 +1866,7 @@
checkDevice ();
Monitor [] monitors = null;
Rectangle workArea = getWorkArea();
@@ -36464,7 +36900,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (screen != 0) {
int monitorCount = OS.gdk_screen_get_n_monitors (screen);
if (monitorCount > 0) {
-@@ -2132,12 +2132,12 @@
+@@ -2168,12 +2168,12 @@
GdkColor gdkColor;
/* Get Tooltip resources */
@@ -36479,7 +36915,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
gdkColor = new GdkColor();
OS.gtk_style_get_fg (tooltipStyle, OS.GTK_STATE_NORMAL, gdkColor);
COLOR_INFO_FOREGROUND = gdkColor;
-@@ -2147,7 +2147,7 @@
+@@ -2183,7 +2183,7 @@
OS.gtk_widget_destroy (tooltipShellHandle);
/* Get Shell resources */
@@ -36488,7 +36924,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
gdkColor = new GdkColor();
OS.gtk_style_get_black (style, gdkColor);
COLOR_WIDGET_DARK_SHADOW = gdkColor;
-@@ -2228,8 +2228,8 @@
+@@ -2264,8 +2264,8 @@
public Font getSystemFont () {
checkDevice ();
if (systemFont != null) return systemFont;
@@ -36499,7 +36935,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
return systemFont = Font.gtk_new (this, defaultFont);
}
-@@ -2267,10 +2267,10 @@
+@@ -2303,10 +2303,10 @@
}
}
@@ -36512,7 +36948,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (0 <= index && index < widgetTable.length) {
lastHandle = handle;
return lastWidget = widgetTable [(int)/*64*/index];
-@@ -2278,7 +2278,7 @@
+@@ -2314,7 +2314,7 @@
return null;
}
@@ -36521,7 +36957,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
boolean result = runAsyncMessages (false);
if (!result) {
synchronized (idleLock) {
-@@ -2307,7 +2307,7 @@
+@@ -2344,7 +2344,7 @@
}
void initializeCallbacks () {
@@ -36530,7 +36966,18 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
signalIds = new int [Widget.LAST_SIGNAL];
/* Cache signals for GtkWidget */
-@@ -2509,10 +2509,10 @@
+@@ -2540,8 +2540,8 @@
+ pangoLayoutNewCallback = new Callback (this, "pangoLayoutNewProc", 3); //$NON-NLS-1$
+ pangoLayoutNewProc = pangoLayoutNewCallback.getAddress ();
+ if (pangoLayoutNewProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
+- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
++ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
++ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+ pangoLayoutNewDefaultProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
+ OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
+ OS.g_type_class_unref (pangoLayoutClass);
+@@ -2563,10 +2563,10 @@
* fix is to for the initializaion by creating
* a temporary GtkEntry.
*/
@@ -36543,7 +36990,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.g_object_get (settings, OS.gtk_entry_select_on_focus, buffer2, 0);
entrySelectOnFocus = buffer2 [0] != 0;
}
-@@ -2528,9 +2528,9 @@
+@@ -2582,9 +2582,9 @@
/* Get the window manager name */
windowManager = ""; //$NON-NLS-1$
if (OS.GTK_VERSION >= OS.VERSION (2, 2, 0)) {
@@ -36555,7 +37002,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (ptr2 != 0) {
int length = OS.strlen (ptr2);
if (length > 0) {
-@@ -2556,7 +2556,7 @@
+@@ -2610,7 +2610,7 @@
* @param hDC the platform specific GC handle
* @param data the platform specific GC data
*/
@@ -36564,7 +37011,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.g_object_unref (gdkGC);
}
-@@ -2580,10 +2580,10 @@
+@@ -2634,10 +2634,10 @@
* <li>ERROR_NO_HANDLES if a handle could not be obtained for gc creation</li>
* </ul>
*/
@@ -36578,7 +37025,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
OS.gdk_gc_set_subwindow (gdkGC, OS.GDK_INCLUDE_INFERIORS);
if (data != null) {
-@@ -2689,7 +2689,7 @@
+@@ -2743,7 +2743,7 @@
Point point = new Point (x, y);
if (from == to) return point;
if (from != null) {
@@ -36587,7 +37034,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if ((from.style & SWT.MIRRORED) != 0) point.x = from.getClientWidth () - point.x;
-@@ -2697,7 +2697,7 @@
+@@ -2751,7 +2751,7 @@
point.y += origin_y [0];
}
if (to != null) {
@@ -36596,7 +37043,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
point.x -= origin_x [0];
-@@ -2766,7 +2766,7 @@
+@@ -2820,7 +2820,7 @@
return result [0];
}
@@ -36605,7 +37052,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = getWidget (menu);
if (widget == null) return 0;
return widget.menuPositionProc (menu, x, y, push_in, user_data);
-@@ -2818,7 +2818,7 @@
+@@ -2872,7 +2872,7 @@
if (from == to) return rect;
boolean fromRTL = false, toRTL = false;
if (from != null) {
@@ -36614,7 +37061,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
if (fromRTL = (from.style & SWT.MIRRORED) != 0) rect.x = from.getClientWidth() - rect.x;
-@@ -2826,7 +2826,7 @@
+@@ -2880,7 +2880,7 @@
rect.y += origin_y [0];
}
if (to != null) {
@@ -36623,7 +37070,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
rect.x -= origin_x [0];
-@@ -2837,7 +2837,7 @@
+@@ -2891,14 +2891,14 @@
return rect;
}
@@ -36632,23 +37079,32 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.hoverProc (handle);
-@@ -2901,13 +2901,13 @@
- if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
- if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
- if (!OS.GDK_WINDOWING_X11()) return false;
-- int /*long*/ xDisplay = OS.GDK_DISPLAY ();
-+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();
- int type = event.type;
- switch (type) {
- case SWT.KeyDown:
- case SWT.KeyUp: {
- int keyCode = 0;
-- int /*long*/ keysym = untranslateKey (event.keyCode);
-+ long /*int*/ keysym = untranslateKey (event.keyCode);
- if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
- if (keyCode == 0) {
- char key = event.character;
-@@ -2986,7 +2986,7 @@
+ }
+
+-int /*long*/ pangoLayoutNewProc (int /*long*/ type, int /*long*/ n_construct_properties, int /*long*/ construct_properties) {
+- int /*long*/ layout = OS.Call (pangoLayoutNewDefaultProc, type, (int)/*64*/n_construct_properties, construct_properties);
++long /*int*/ pangoLayoutNewProc (long /*int*/ type, long /*int*/ n_construct_properties, long /*int*/ construct_properties) {
++ long /*int*/ layout = OS.Call (pangoLayoutNewDefaultProc, type, (int)/*64*/n_construct_properties, construct_properties);
+ OS.pango_layout_set_auto_dir (layout, false);
+ return layout;
+ }
+@@ -2977,13 +2977,13 @@
+ if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+ if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (!OS.GDK_WINDOWING_X11()) return false;
+- int /*long*/ xDisplay = OS.GDK_DISPLAY ();
++ long /*int*/ xDisplay = OS.GDK_DISPLAY ();
+ int type = event.type;
+ switch (type) {
+ case SWT.KeyDown:
+ case SWT.KeyUp: {
+ int keyCode = 0;
+- int /*long*/ keysym = untranslateKey (event.keyCode);
++ long /*int*/ keysym = untranslateKey (event.keyCode);
+ if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
+ if (keyCode == 0) {
+ char key = event.character;
+@@ -3065,7 +3065,7 @@
void putGdkEvents () {
if (gdkEventCount != 0) {
for (int i = 0; i < gdkEventCount; i++) {
@@ -36657,7 +37113,18 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = gdkEventWidgets [i];
if (widget == null || !widget.isDisposed ()) {
OS.gdk_event_put (event);
-@@ -3291,9 +3291,9 @@
+@@ -3318,8 +3318,8 @@
+
+ /* Dispose subclass */
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
+- int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+- int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
++ long /*int*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
++ long /*int*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+ OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewDefaultProc);
+ OS.g_type_class_unref (pangoLayoutClass);
+ pangoLayoutNewCallback.dispose ();
+@@ -3381,9 +3381,9 @@
if (filterTable.size () == 0) filterTable = null;
}
@@ -36669,7 +37136,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
--gdkEventCount;
System.arraycopy (gdkEvents, 1, gdkEvents, 0, gdkEventCount);
System.arraycopy (gdkEventWidgets, 1, gdkEventWidgets, 0, gdkEventCount);
-@@ -3342,7 +3342,7 @@
+@@ -3432,7 +3432,7 @@
eventTable.unhook (eventType, listener);
}
@@ -36678,7 +37145,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (handle != mouseHoverHandle) return;
if (mouseHoverId != 0) OS.gtk_timeout_remove (mouseHoverId);
mouseHoverId = 0;
-@@ -3359,7 +3359,7 @@
+@@ -3449,7 +3449,7 @@
}
}
@@ -36687,7 +37154,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (handle == 0) return null;
lastWidget = null;
Widget widget = null;
-@@ -3479,8 +3479,8 @@
+@@ -3571,8 +3571,8 @@
public void setCursorLocation (int x, int y) {
checkDevice ();
if (OS.GDK_WINDOWING_X11 ()) {
@@ -36698,7 +37165,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.XWarpPointer (xDisplay, OS.None, xWindow, 0, 0, 0, 0, x, y);
}
}
-@@ -3548,7 +3548,7 @@
+@@ -3640,7 +3640,7 @@
}
if (key.equals (ADD_WIDGET_KEY)) {
Object [] data = (Object []) value;
@@ -36707,7 +37174,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = (Widget) data [1];
if (widget != null) {
addWidget (handle, widget);
-@@ -3637,10 +3637,10 @@
+@@ -3729,10 +3729,10 @@
this.data = data;
}
@@ -36720,7 +37187,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (submenu != 0) {
OS.gtk_widget_set_direction (submenu, (int)/*64*/ direction);
OS.gtk_container_forall (submenu, setDirectionProc, direction);
-@@ -3715,9 +3715,9 @@
+@@ -3807,9 +3807,9 @@
OS.gtk_container_add (preeditWindow, preeditLabel);
OS.gtk_widget_show (preeditLabel);
}
@@ -36733,7 +37200,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, null);
if (preeditString [0] != 0 && OS.strlen (preeditString [0]) > 0) {
Control widget = control.findBackgroundControl ();
-@@ -3771,7 +3771,7 @@
+@@ -3863,7 +3863,7 @@
fds = OS.g_malloc (OS.GPollFD_sizeof () * allocated_nfds);
}
max_priority [0] = timeout [0] = 0;
@@ -36742,7 +37209,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
boolean result = false;
do {
if (OS.g_main_context_acquire (context)) {
-@@ -3782,7 +3782,7 @@
+@@ -3874,7 +3874,7 @@
allocated_nfds = nfds;
fds = OS.g_malloc (OS.GPollFD_sizeof() * allocated_nfds);
}
@@ -36751,7 +37218,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (poll != 0) {
if (nfds > 0 || timeout [0] != 0) {
/*
-@@ -3876,7 +3876,7 @@
+@@ -3968,7 +3968,7 @@
}
}
@@ -36760,7 +37227,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
if (timerList == null) return 0;
int index = (int)/*64*/i;
if (0 <= index && index < timerList.length) {
-@@ -3888,7 +3888,7 @@
+@@ -3980,7 +3980,7 @@
return 0;
}
@@ -36769,7 +37236,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
caretId = 0;
if (currentCaret == null) {
return 0;
-@@ -3903,19 +3903,19 @@
+@@ -3995,19 +3995,19 @@
return 0;
}
@@ -36792,7 +37259,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = getWidget (data);
if (widget == null) return 0;
return widget.treeSelectionProc (model, path, iter, treeSelection, treeSelectionLength++);
-@@ -3973,13 +3973,13 @@
+@@ -4065,13 +4065,13 @@
caretId = OS.gtk_timeout_add (blinkRate, caretProc, 0);
}
@@ -36808,7 +37275,7 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
settingsChanged = true;
return 0;
}
-@@ -4087,31 +4087,31 @@
+@@ -4179,31 +4179,31 @@
return 0;
}
@@ -36845,10 +37312,18 @@ diff -ur x86/org/eclipse/swt/widgets/Display.java x86_64/org/eclipse/swt/widgets
Widget widget = getWidget (handle);
if (widget == null) return 0;
return widget.timerProc (handle);
-diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widgets/ExpandBar.java
---- x86/org/eclipse/swt/widgets/ExpandBar.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ExpandBar.java 2009-02-11 17:43:50.000000000 -0500
-@@ -164,7 +164,7 @@
+diff -urN x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widgets/ExpandBar.java
+--- x86/org/eclipse/swt/widgets/ExpandBar.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ExpandBar.java 2009-09-17 08:48:24.000000000 -0400
+@@ -160,14 +160,14 @@
+ OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
+ OS.gtk_container_add (fixedHandle, scrolledHandle);
+ OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
+- int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
++ long /*int*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
+ OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);
+ } else {
+ OS.gtk_container_add (fixedHandle, handle);
}
OS.gtk_container_set_border_width (handle, 0);
} else {
@@ -36857,7 +37332,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
if (topHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (topHandle, true);
if ((style & SWT.V_SCROLL) != 0) {
-@@ -238,11 +238,11 @@
+@@ -241,11 +241,11 @@
layoutItems (index, true);
}
@@ -36871,7 +37346,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
if (lastFocus != null && lastFocus.setFocus ()) return true;
for (int i = 0; i < itemCount; i++) {
-@@ -354,7 +354,7 @@
+@@ -366,7 +366,7 @@
return spacing;
}
@@ -36880,7 +37355,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -375,7 +375,7 @@
+@@ -387,7 +387,7 @@
return super.gtk_button_press_event (widget, event);
}
@@ -36889,7 +37364,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
if (lastFocus != null) {
GdkEventButton gdkEvent = new GdkEventButton ();
-@@ -395,7 +395,7 @@
+@@ -407,7 +407,7 @@
return super.gtk_button_release_event (widget, event);
}
@@ -36898,7 +37373,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
if (OS.GTK_VERSION < OS.VERSION (2, 4, 0)) {
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove(gdkEvent, eventPtr, GdkEventExpose.sizeof);
-@@ -413,24 +413,24 @@
+@@ -425,24 +425,24 @@
return super.gtk_expose_event (widget, eventPtr);
}
@@ -36927,16 +37402,24 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
if (result != 0) return result;
int index = 0;
while (index < itemCount) {
-@@ -544,7 +544,7 @@
+@@ -556,13 +556,13 @@
}
}
+-int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+- int /*long*/ result = super.gtk_size_allocate (widget, allocation);
++long /*int*/ gtk_size_allocate (long /*int*/ widget, long /*int*/ allocation) {
++ long /*int*/ result = super.gtk_size_allocate (widget, allocation);
+ layoutItems (0, false);
+ return result;
+ }
+
-int /*long*/ parentingHandle () {
+long /*int*/ parentingHandle () {
return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle;
}
-@@ -603,7 +603,7 @@
+@@ -621,7 +621,7 @@
return result;
}
@@ -36945,7 +37428,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
super.setFontDescription (font);
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
for (int i = 0; i < itemCount; i++) {
-@@ -629,7 +629,7 @@
+@@ -647,7 +647,7 @@
ExpandItem item = items [itemCount - 1];
int maxHeight = item.y + getBandHeight () + spacing;
if (item.expanded) maxHeight += item.height;
@@ -36954,7 +37437,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, adjustmentHandle);
yCurrentScroll = (int)adjustment.value;
-@@ -649,7 +649,7 @@
+@@ -667,7 +667,7 @@
OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, policy);
int width = OS.GTK_WIDGET_WIDTH (fixedHandle) - spacing * 2;
if (policy == OS.GTK_POLICY_ALWAYS) {
@@ -36963,10 +37446,10 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandBar.java x86_64/org/eclipse/swt/widge
GtkRequisition requisition = new GtkRequisition ();
OS.gtk_widget_size_request (vHandle, requisition);
width -= requisition.width;
-diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widgets/ExpandItem.java
---- x86/org/eclipse/swt/widgets/ExpandItem.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ExpandItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -38,7 +38,7 @@
+diff -urN x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widgets/ExpandItem.java
+--- x86/org/eclipse/swt/widgets/ExpandItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ExpandItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -39,7 +39,7 @@
ExpandBar parent;
Control control;
ImageList imageList;
@@ -36975,7 +37458,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widg
boolean expanded;
int x, y, width, height;
int imageHeight, imageWidth;
-@@ -315,7 +315,7 @@
+@@ -316,7 +316,7 @@
return width;
}
@@ -36984,7 +37467,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widg
Event event = new Event ();
event.item = this;
int type = OS.gtk_expander_get_expanded (handle) ? SWT.Collapse : SWT.Expand;
-@@ -323,23 +323,23 @@
+@@ -324,23 +324,23 @@
return 0;
}
@@ -37012,7 +37495,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widg
parent.gtk_enter_notify_event(widget, event);
return 0;
}
-@@ -502,7 +502,7 @@
+@@ -518,7 +518,7 @@
return result;
}
@@ -37021,7 +37504,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widg
OS.gtk_widget_modify_font (handle, font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -547,7 +547,7 @@
+@@ -563,7 +563,7 @@
if (image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -37030,7 +37513,7 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widg
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-@@ -602,7 +602,7 @@
+@@ -618,7 +618,7 @@
}
}
@@ -37039,24 +37522,29 @@ diff -ur x86/org/eclipse/swt/widgets/ExpandItem.java x86_64/org/eclipse/swt/widg
switch ((int)/*64*/user_data) {
case ACTIVATE_INVERSE: {
expanded = OS.gtk_expander_get_expanded (handle);
-diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widgets/FileDialog.java
---- x86/org/eclipse/swt/widgets/FileDialog.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/FileDialog.java 2009-02-11 17:43:50.000000000 -0500
-@@ -44,7 +44,7 @@
- String fullPath = "";
+diff -urN x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widgets/FileDialog.java
+--- x86/org/eclipse/swt/widgets/FileDialog.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/FileDialog.java 2009-09-17 08:48:24.000000000 -0400
+@@ -46,7 +46,7 @@
int filterIndex = -1;
boolean overwrite = false;
+ boolean uriMode;
- int /*long*/ handle;
+ long /*int*/ handle;
static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
static final char EXTENSION_SEPARATOR = ';';
-@@ -96,18 +96,18 @@
+@@ -102,7 +102,7 @@
/* MULTI is only valid if the native dialog's action is Open */
fullPath = null;
if ((style & (SWT.SAVE | SWT.MULTI)) == SWT.MULTI) {
-- int /*long*/ list = OS.gtk_file_chooser_get_filenames (handle);
-+ long /*int*/ list = OS.gtk_file_chooser_get_filenames (handle);
+- int /*long*/ list = 0;
++ long /*int*/ list = 0;
+ if (uriMode) {
+ list = OS.gtk_file_chooser_get_uris (handle);
+ } else {
+@@ -110,11 +110,11 @@
+ }
int listLength = OS.g_slist_length (list);
fileNames = new String [listLength];
- int /*long*/ current = list;
@@ -37064,10 +37552,15 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
int writePos = 0;
for (int i = 0; i < listLength; i++) {
- int /*long*/ name = OS.g_slist_data (current);
-- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (name, -1, null, null, null);
+- int /*long*/ utf8Ptr = 0;
+ long /*int*/ name = OS.g_slist_data (current);
-+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (name, -1, null, null, null);
- OS.g_free (name);
++ long /*int*/ utf8Ptr = 0;
+ if (uriMode) {
+ utf8Ptr = name;
+ } else {
+@@ -122,8 +122,8 @@
+ OS.g_free (name);
+ }
if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
@@ -37076,25 +37569,31 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
OS.g_free (utf8Ptr);
if (utf16Ptr != 0) {
int clength = (int)/*64*/items_written [0];
-@@ -127,13 +127,13 @@
+@@ -143,19 +143,19 @@
}
OS.g_slist_free (list);
} else {
-- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
-+ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
- if (path != 0) {
-- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
-+ long /*int*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
- OS.g_free (path);
- if (utf8Ptr != 0) {
-- int /*long*/ [] items_written = new int /*long*/ [1];
-- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
-+ long /*int*/ [] items_written = new long /*int*/ [1];
-+ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
- OS.g_free (utf8Ptr);
- if (utf16Ptr != 0) {
- int clength = (int)/*64*/items_written [0];
-@@ -148,9 +148,9 @@
+- int /*long*/ utf8Ptr = 0;
++ long /*int*/ utf8Ptr = 0;
+ if (uriMode) {
+ utf8Ptr = OS.gtk_file_chooser_get_uri (handle);
+ } else {
+- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
++ long /*int*/ path = OS.gtk_file_chooser_get_filename (handle);
+ if (path != 0) {
+ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
+ OS.g_free (path);
+ }
+ }
+ if (utf8Ptr != 0) {
+- int /*long*/ [] items_written = new int /*long*/ [1];
+- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
++ long /*int*/ [] items_written = new long /*int*/ [1];
++ long /*int*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+ OS.g_free (utf8Ptr);
+ if (utf16Ptr != 0) {
+ int clength = (int)/*64*/items_written [0];
+@@ -169,9 +169,9 @@
}
}
filterIndex = -1;
@@ -37106,7 +37605,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
if (filterNamePtr != 0) {
int length = OS.strlen (filterNamePtr);
byte[] buffer = new byte [length];
-@@ -183,23 +183,23 @@
+@@ -204,23 +204,23 @@
filterIndex = -1;
GtkFileSelection selection = new GtkFileSelection ();
OS.memmove (selection, handle);
@@ -37139,7 +37638,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
if (OS.gtk_tree_model_get_iter (model [0], iter, path)) {
OS.gtk_tree_model_get (model [0], iter, 0, ptr, -1);
}
-@@ -216,10 +216,10 @@
+@@ -237,10 +237,10 @@
OS.gtk_entry_set_text (entry, buffer);
}
@@ -37154,7 +37653,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
entryLength = (int)/*64*/items_written [0];
char [] buffer = new char [entryLength];
OS.memmove (buffer, utf16Ptr, entryLength * 2);
-@@ -237,9 +237,9 @@
+@@ -258,9 +258,9 @@
if ((style & SWT.MULTI) == 0) {
fileNames = new String[] {fileName};
} else {
@@ -37167,7 +37666,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
OS.memmove (namePtr, namesPtr1, OS.PTR_SIZEOF);
int length = 0;
while (namePtr[0] != 0) {
-@@ -248,11 +248,11 @@
+@@ -269,11 +269,11 @@
OS.memmove(namePtr, namesPtr1, OS.PTR_SIZEOF);
}
fileNames = new String [length];
@@ -37181,25 +37680,25 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
buffer = new char [(int)/*64*/items_written [0]];
OS.memmove (buffer, utf16Ptr, items_written [0] * 2);
-@@ -370,7 +370,7 @@
+@@ -391,7 +391,7 @@
int action = (style & SWT.SAVE) != 0 ?
OS.GTK_FILE_CHOOSER_ACTION_SAVE :
OS.GTK_FILE_CHOOSER_ACTION_OPEN;
- int /*long*/ shellHandle = parent.topHandle ();
+ long /*int*/ shellHandle = parent.topHandle ();
- handle = OS.gtk_file_chooser_dialog_new (
- titleBytes,
- shellHandle,
-@@ -378,7 +378,7 @@
- OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL,
- OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK,
- 0);
+ Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
+ if (display.getDismissalAlignment() == SWT.RIGHT) {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
+@@ -399,7 +399,7 @@
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
+ }
+ OS.gtk_window_set_modal (handle, true);
- int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
+ long /*int*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -393,7 +393,7 @@
+@@ -416,7 +416,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -37208,7 +37707,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -416,9 +416,9 @@
+@@ -439,9 +439,9 @@
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
handle = OS.gtk_file_selection_new (titleBytes);
if (parent != null) {
@@ -37220,7 +37719,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -434,7 +434,7 @@
+@@ -458,7 +458,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -37229,34 +37728,25 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -479,7 +479,7 @@
- * when setting a file name that is not a true canonical path.
- * The fix is to use the canonical path.
- */
-- int /*long*/ ptr = OS.realpath (buffer, null);
-+ long /*int*/ ptr = OS.realpath (buffer, null);
- if (ptr != 0) {
- OS.gtk_file_chooser_set_filename (handle, ptr);
+@@ -498,7 +498,7 @@
+ * when setting a file name that is not a true canonical path.
+ * The fix is to use the canonical path.
+ */
+- int /*long*/ ptr = OS.realpath (buffer, null);
++ long /*int*/ ptr = OS.realpath (buffer, null);
+ OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
-@@ -491,7 +491,7 @@
+ }
+@@ -529,7 +529,7 @@
* when setting a file name that is not a true canonical path.
* The fix is to use the canonical path.
*/
- int /*long*/ ptr = OS.realpath (buffer, null);
+ long /*int*/ ptr = OS.realpath (buffer, null);
if (ptr != 0) {
- OS.gtk_file_chooser_set_current_folder (handle, ptr);
+ OS.gtk_file_chooser_set_filename (handle, ptr);
OS.g_free (ptr);
-@@ -506,7 +506,7 @@
- * when setting a file name that is not a true canonical path.
- * The fix is to use the canonical path.
- */
-- int /*long*/ ptr = OS.realpath (buffer, null);
-+ long /*int*/ ptr = OS.realpath (buffer, null);
- if (ptr != 0) {
- OS.gtk_file_chooser_set_filename (handle, ptr);
- OS.g_free (ptr);
-@@ -527,10 +527,10 @@
+@@ -547,10 +547,10 @@
/* Set the extension filters */
if (filterNames == null) filterNames = new String [0];
if (filterExtensions == null) filterExtensions = new String [0];
@@ -37269,7 +37759,7 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
if (filterNames.length > i && filterNames [i] != null) {
byte [] name = Converter.wcsToMbcs (null, filterNames [i], true);
OS.gtk_file_filter_set_name (filter, name);
-@@ -586,8 +586,8 @@
+@@ -606,8 +606,8 @@
int length = fullPath.length ();
char [] buffer = new char [length + 1];
fullPath.getChars (0, length, buffer, 0);
@@ -37280,10 +37770,10 @@ diff -ur x86/org/eclipse/swt/widgets/FileDialog.java x86_64/org/eclipse/swt/widg
OS.gtk_file_selection_set_filename (handle, fileNamePtr);
OS.g_free (utf8Ptr);
OS.g_free (fileNamePtr);
-diff -ur x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widgets/FontDialog.java
---- x86/org/eclipse/swt/widgets/FontDialog.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/FontDialog.java 2009-02-11 17:43:50.000000000 -0500
-@@ -133,15 +133,15 @@
+diff -urN x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widgets/FontDialog.java
+--- x86/org/eclipse/swt/widgets/FontDialog.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/FontDialog.java 2009-09-17 08:48:24.000000000 -0400
+@@ -134,15 +134,15 @@
* </ul>
*/
public FontData open () {
@@ -37302,8 +37792,8 @@ diff -ur x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widg
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -149,7 +149,7 @@
- }
+@@ -151,7 +151,7 @@
+ OS.gtk_window_set_modal (handle, true);
if (fontData != null) {
Font font = new Font (display, fontData);
- int /*long*/ fontName = OS.pango_font_description_to_string (font.handle);
@@ -37311,7 +37801,7 @@ diff -ur x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widg
int length = OS.strlen (fontName);
byte [] buffer = new byte [length + 1];
OS.memmove (buffer, fontName, length);
-@@ -164,7 +164,7 @@
+@@ -166,7 +166,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -37320,7 +37810,7 @@ diff -ur x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widg
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-@@ -178,12 +178,12 @@
+@@ -180,12 +180,12 @@
}
boolean success = response == OS.GTK_RESPONSE_OK;
if (success) {
@@ -37335,11 +37825,11 @@ diff -ur x86/org/eclipse/swt/widgets/FontDialog.java x86_64/org/eclipse/swt/widg
Font font = Font.gtk_new (display, fontDesc);
fontData = font.getFontData () [0];
OS.pango_font_description_free (fontDesc);
-diff -ur x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/Group.java
---- x86/org/eclipse/swt/widgets/Group.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Group.java 2009-02-11 17:43:50.000000000 -0500
-@@ -40,7 +40,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/Group.java
+--- x86/org/eclipse/swt/widgets/Group.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Group.java 2009-09-17 08:48:24.000000000 -0400
+@@ -41,7 +41,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Group extends Composite {
- int /*long*/ clientHandle, labelHandle;
@@ -37347,7 +37837,7 @@ diff -ur x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/G
String text = "";
/**
-@@ -95,7 +95,7 @@
+@@ -96,7 +96,7 @@
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -37356,7 +37846,7 @@ diff -ur x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/G
return clientHandle;
}
-@@ -156,7 +156,7 @@
+@@ -157,7 +157,7 @@
OS.gtk_widget_set_sensitive (labelHandle, enabled);
}
@@ -37365,7 +37855,7 @@ diff -ur x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/G
return fixedHandle;
}
-@@ -200,7 +200,7 @@
+@@ -201,7 +201,7 @@
return mnemonicMatch (labelHandle, key);
}
@@ -37374,7 +37864,7 @@ diff -ur x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/G
return fixedHandle;
}
-@@ -226,7 +226,7 @@
+@@ -227,7 +227,7 @@
setBackgroundColor(fixedHandle, color);
}
@@ -37383,9 +37873,9 @@ diff -ur x86/org/eclipse/swt/widgets/Group.java x86_64/org/eclipse/swt/widgets/G
super.setFontDescription (font);
OS.gtk_widget_modify_font (labelHandle, font);
}
-diff -ur x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widgets/ImageList.java
---- x86/org/eclipse/swt/widgets/ImageList.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ImageList.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widgets/ImageList.java
+--- x86/org/eclipse/swt/widgets/ImageList.java 2005-06-23 10:51:56.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ImageList.java 2009-09-17 08:48:24.000000000 -0400
@@ -15,13 +15,13 @@
import org.eclipse.swt.graphics.*;
@@ -37450,10 +37940,10 @@ diff -ur x86/org/eclipse/swt/widgets/ImageList.java x86_64/org/eclipse/swt/widge
if (oldPixbuf != 0) {
if (images [index] == image) {
OS.gdk_pixbuf_copy_area (pixbuf, 0, 0, width, height, oldPixbuf, 0, 0);
-diff -ur x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME.java
---- x86/org/eclipse/swt/widgets/IME.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/IME.java 2009-02-11 17:43:50.000000000 -0500
-@@ -241,14 +241,14 @@
+diff -urN x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME.java
+--- x86/org/eclipse/swt/widgets/IME.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/IME.java 2009-09-17 08:48:24.000000000 -0400
+@@ -242,14 +242,14 @@
return false;
}
@@ -37471,7 +37961,7 @@ diff -ur x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME
if (!isInlineEnabled ()) return 0;
boolean doit = true;
ranges = null;
-@@ -277,14 +277,14 @@
+@@ -278,14 +278,14 @@
return doit ? 0 : 1;
}
@@ -37490,7 +37980,7 @@ diff -ur x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME
int [] cursorPos = new int [1];
OS.gtk_im_context_get_preedit_string (imHandle, preeditString, pangoAttrs, cursorPos);
caretOffset = cursorPos [0];
-@@ -296,7 +296,7 @@
+@@ -297,7 +297,7 @@
chars = Converter.mbcsToWcs (null, buffer);
if (pangoAttrs [0] != 0) {
int count = 0;
@@ -37499,7 +37989,7 @@ diff -ur x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME
while (OS.pango_attr_iterator_next (iterator)) count++;
OS.pango_attr_iterator_destroy (iterator);
ranges = new int [count * 2];
-@@ -311,7 +311,7 @@
+@@ -312,7 +312,7 @@
ranges [i * 2] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + start [0]);
ranges [i * 2 + 1] = (int)/*64*/OS.g_utf8_pointer_to_offset (preeditString [0], preeditString [0] + end [0]) - 1;
styles [i] = new TextStyle (null, null, null);
@@ -37508,7 +37998,7 @@ diff -ur x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME
if (attr != 0) {
OS.memmove (attrColor, attr, PangoAttrColor.sizeof);
GdkColor color = new GdkColor ();
-@@ -382,7 +382,7 @@
+@@ -395,7 +395,7 @@
return 1;
}
@@ -37517,11 +38007,11 @@ diff -ur x86/org/eclipse/swt/widgets/IME.java x86_64/org/eclipse/swt/widgets/IME
return parent.imHandle ();
}
-diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/Label.java
---- x86/org/eclipse/swt/widgets/Label.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Label.java 2009-02-11 17:43:50.000000000 -0500
-@@ -49,7 +49,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/Label.java
+--- x86/org/eclipse/swt/widgets/Label.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Label.java 2009-09-17 08:48:24.000000000 -0400
+@@ -50,7 +50,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Label extends Control {
- int /*long*/ frameHandle, labelHandle, imageHandle;
@@ -37529,7 +38019,7 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
ImageList imageList;
Image image;
String text;
-@@ -107,8 +107,8 @@
+@@ -108,8 +108,8 @@
void addRelation (Control control) {
if (!control.isDescribedByLabel ()) return;
if (labelHandle == 0) return;
@@ -37540,7 +38030,16 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
if (accessible != 0 && controlAccessible != 0) {
OS.atk_object_add_relationship (controlAccessible, OS.ATK_RELATION_LABELLED_BY, accessible);
}
-@@ -155,11 +155,11 @@
+@@ -135,7 +135,7 @@
+ boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0;
+ if (fixWrap || frameHandle != 0) forceResize ();
+ if (fixWrap) {
+- int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
++ long /*int*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+ int pangoWidth = OS.pango_layout_get_width (labelLayout);
+ if (wHint != SWT.DEFAULT) {
+ OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);
+@@ -179,11 +179,11 @@
* muliple lines of text.
*/
if (hHint == SWT.DEFAULT && labelHandle != 0) {
@@ -37557,7 +38056,7 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
OS.pango_font_metrics_unref (metrics);
-@@ -168,7 +168,7 @@
+@@ -192,7 +192,7 @@
OS.g_object_get (labelHandle, OS.ypad, buffer, 0);
fontHeight += 2 * buffer [0];
if (frameHandle != 0) {
@@ -37566,7 +38065,7 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
fontHeight += 2 * OS.gtk_style_get_ythickness (style);
fontHeight += 2 * OS.gtk_container_get_border_width (frameHandle);
}
-@@ -230,7 +230,7 @@
+@@ -254,7 +254,7 @@
if (imageHandle != 0) display.removeWidget (imageHandle);
}
@@ -37575,18 +38074,7 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
return fixedHandle;
}
-@@ -392,8 +392,8 @@
- boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
- if (text != null && text.length () != 0) {
- if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
-- int /*long*/ layout = OS.gtk_label_get_layout (labelHandle);
-- int /*long*/ linePtr = OS.pango_layout_get_line (layout, 0);
-+ long /*int*/ layout = OS.gtk_label_get_layout (labelHandle);
-+ long /*int*/ linePtr = OS.pango_layout_get_line (layout, 0);
- int resolved_dir = OS.pango_layout_line_get_resolved_dir (linePtr);
- if (resolved_dir == OS.PANGO_DIRECTION_RTL) {
- isRTL = !isRTL;
-@@ -474,7 +474,7 @@
+@@ -487,7 +487,7 @@
return result;
}
@@ -37595,7 +38083,7 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
super.setFontDescription (font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -518,7 +518,7 @@
+@@ -531,7 +531,7 @@
if (image != null) {
imageList = new ImageList ();
int imageIndex = imageList.add (image);
@@ -37604,10 +38092,10 @@ diff -ur x86/org/eclipse/swt/widgets/Label.java x86_64/org/eclipse/swt/widgets/L
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_hide (labelHandle);
OS.gtk_widget_show (imageHandle);
-diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Link.java
---- x86/org/eclipse/swt/widgets/Link.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Link.java 2009-02-11 17:43:50.000000000 -0500
-@@ -281,8 +281,8 @@
+diff -urN x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Link.java
+--- x86/org/eclipse/swt/widgets/Link.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Link.java 2009-09-17 08:48:24.000000000 -0400
+@@ -282,8 +282,8 @@
return text;
}
@@ -37618,7 +38106,7 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -320,8 +320,8 @@
+@@ -321,8 +321,8 @@
return result;
}
@@ -37629,7 +38117,7 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
-@@ -344,8 +344,8 @@
+@@ -345,8 +345,8 @@
return result;
}
@@ -37640,7 +38128,7 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -356,7 +356,7 @@
+@@ -357,7 +357,7 @@
return result;
}
@@ -37649,7 +38137,7 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
if ((state & OBSCURED) != 0) return 0;
GdkEventExpose gdkEvent = new GdkEventExpose ();
OS.memmove (gdkEvent, eventPtr, GdkEventExpose.sizeof);
-@@ -397,8 +397,8 @@
+@@ -398,8 +398,8 @@
return 0;
}
@@ -37660,7 +38148,7 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
if (result != 0) return result;
if (focusIndex == -1) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
-@@ -427,8 +427,8 @@
+@@ -428,8 +428,8 @@
return result;
}
@@ -37671,7 +38159,7 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
if (result != 0) return result;
GdkEventMotion gdkEvent = new GdkEventMotion ();
OS.memmove (gdkEvent, event, GdkEventMotion.sizeof);
-@@ -661,7 +661,7 @@
+@@ -662,7 +662,7 @@
return result;
}
@@ -37680,11 +38168,11 @@ diff -ur x86/org/eclipse/swt/widgets/Link.java x86_64/org/eclipse/swt/widgets/Li
super.setFontDescription (font);
layout.setFont (Font.gtk_new (display, font));
}
-diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/List.java
---- x86/org/eclipse/swt/widgets/List.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/List.java 2009-02-11 17:43:50.000000000 -0500
-@@ -39,7 +39,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/List.java
+--- x86/org/eclipse/swt/widgets/List.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/List.java 2009-09-17 08:48:24.000000000 -0400
+@@ -40,7 +40,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class List extends Scrollable {
- int /*long*/ modelHandle;
@@ -37692,7 +38180,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
static final int TEXT_COLUMN = 0;
-@@ -95,7 +95,7 @@
+@@ -96,7 +96,7 @@
checkWidget();
if (string == null) error (SWT.ERROR_NULL_ARGUMENT);
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -37701,7 +38189,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
OS.gtk_list_store_append (modelHandle, iter);
OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
-@@ -133,7 +133,7 @@
+@@ -134,7 +134,7 @@
error (SWT.ERROR_INVALID_RANGE);
}
byte [] buffer = Converter.wcsToMbcs (null, string, true);
@@ -37710,7 +38198,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
/*
* Feature in GTK. It is much faster to append to a list store
-@@ -195,14 +195,14 @@
+@@ -196,14 +196,14 @@
* Columns:
* 0 - text
*/
@@ -37728,7 +38216,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_view_column_pack_start (columnHandle, textRenderer, true);
OS.gtk_tree_view_column_add_attribute (columnHandle, textRenderer, OS.text, TEXT_COLUMN);
-@@ -211,7 +211,7 @@
+@@ -212,7 +212,7 @@
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -37737,7 +38225,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -275,8 +275,8 @@
+@@ -276,8 +276,8 @@
public void deselect (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -37748,7 +38236,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_selection_unselect_iter (selection, iter);
-@@ -306,8 +306,8 @@
+@@ -307,8 +307,8 @@
if (start >= count && end >= count) return;
start = Math.min (count - 1, Math.max (0, start));
end = Math.min (count - 1, Math.max (0, end));
@@ -37759,7 +38247,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-@@ -337,9 +337,9 @@
+@@ -338,9 +338,9 @@
public void deselect (int [] indices) {
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -37771,7 +38259,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<indices.length; i++) {
int index = indices [i];
-@@ -361,7 +361,7 @@
+@@ -362,7 +362,7 @@
*/
public void deselectAll () {
checkWidget();
@@ -37780,7 +38268,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -370,10 +370,10 @@
+@@ -371,10 +371,10 @@
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -37793,7 +38281,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -386,7 +386,7 @@
+@@ -387,7 +387,7 @@
return dragDetect;
}
@@ -37802,7 +38290,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
return paintWindow ();
}
-@@ -407,10 +407,10 @@
+@@ -408,10 +408,10 @@
*/
public int getFocusIndex () {
checkWidget();
@@ -37815,7 +38303,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
int [] index = new int []{-1};
if (indices != 0) OS.memmove (index, indices, 4);
OS.gtk_tree_path_free (path [0]);
-@@ -441,8 +441,8 @@
+@@ -442,8 +442,8 @@
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -37826,7 +38314,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
OS.g_free (iter);
-@@ -483,13 +483,13 @@
+@@ -484,13 +484,13 @@
public int getItemHeight () {
checkWidget();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
@@ -37842,7 +38330,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_model_get_iter_first (modelHandle, iter);
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
-@@ -518,9 +518,9 @@
+@@ -519,9 +519,9 @@
public String [] getItems () {
checkWidget();
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
@@ -37854,7 +38342,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
for (int index=0; index<count; index++) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_model_get (modelHandle, iter, 0, ptr, -1);
-@@ -574,7 +574,7 @@
+@@ -575,7 +575,7 @@
*/
public int getSelectionCount () {
checkWidget();
@@ -37863,7 +38351,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -597,7 +597,7 @@
+@@ -598,7 +598,7 @@
*/
public int getSelectionIndex () {
checkWidget();
@@ -37872,7 +38360,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
display.treeSelectionLength = 0;
-@@ -611,14 +611,14 @@
+@@ -612,14 +612,14 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -37891,7 +38379,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (indices != 0) {
OS.memmove (index, indices, 4);
break;
-@@ -648,7 +648,7 @@
+@@ -649,7 +649,7 @@
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -37900,7 +38388,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
display.treeSelectionLength = 0;
-@@ -664,15 +664,15 @@
+@@ -665,15 +665,15 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -37920,7 +38408,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -702,24 +702,24 @@
+@@ -703,24 +703,24 @@
*/
public int getTopIndex () {
checkWidget();
@@ -37950,7 +38438,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select list view, when multiple items are already
-@@ -733,10 +733,10 @@
+@@ -734,10 +734,10 @@
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -37963,7 +38451,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -751,10 +751,10 @@
+@@ -752,10 +752,10 @@
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -37976,7 +38464,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -774,8 +774,8 @@
+@@ -775,8 +775,8 @@
return result;
}
@@ -37987,7 +38475,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -797,8 +797,8 @@
+@@ -798,8 +798,8 @@
return result;
}
@@ -37998,7 +38486,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -811,14 +811,14 @@
+@@ -812,14 +812,14 @@
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -38015,7 +38503,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
}
-@@ -891,15 +891,15 @@
+@@ -892,15 +892,15 @@
*/
public boolean isSelected (int index) {
checkWidget();
@@ -38034,7 +38522,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -934,9 +934,9 @@
+@@ -935,9 +935,9 @@
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38046,7 +38534,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, iter);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -966,8 +966,8 @@
+@@ -967,8 +967,8 @@
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38057,7 +38545,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=end; index>=start; index--) {
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
-@@ -1028,8 +1028,8 @@
+@@ -1029,8 +1029,8 @@
if (!(0 <= start && start <= end && end < count)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38068,7 +38556,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
int last = -1;
for (int i=0; i<newIndices.length; i++) {
-@@ -1054,7 +1054,7 @@
+@@ -1055,7 +1055,7 @@
*/
public void removeAll () {
checkWidget();
@@ -38077,7 +38565,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_clear (modelHandle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1100,13 +1100,13 @@
+@@ -1101,13 +1101,13 @@
public void select (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -38094,7 +38582,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1143,14 +1143,14 @@
+@@ -1144,14 +1144,14 @@
if (count == 0 || start >= count) return;
start = Math.max (0, start);
end = Math.min (end, count - 1);
@@ -38112,7 +38600,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1186,9 +1186,9 @@
+@@ -1187,9 +1187,9 @@
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
@@ -38124,7 +38612,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -1196,7 +1196,7 @@
+@@ -1197,7 +1197,7 @@
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
OS.gtk_tree_selection_select_iter (selection, iter);
if ((style & SWT.SINGLE) != 0) {
@@ -38133,7 +38621,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -1218,7 +1218,7 @@
+@@ -1219,7 +1219,7 @@
public void selectAll () {
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
@@ -38142,7 +38630,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1232,10 +1232,10 @@
+@@ -1233,10 +1233,10 @@
*/
int count = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (!(0 <= index && index < count)) return;
@@ -38156,7 +38644,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
/*
-@@ -1302,7 +1302,7 @@
+@@ -1303,7 +1303,7 @@
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -38165,7 +38653,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
byte [] buffer = Converter.wcsToMbcs (null, string, true);
OS.gtk_list_store_set (modelHandle, iter, TEXT_COLUMN, buffer, -1);
-@@ -1329,11 +1329,11 @@
+@@ -1330,11 +1330,11 @@
for (int i=0; i<items.length; i++) {
if (items [i] == null) error (SWT.ERROR_INVALID_ARGUMENT);
}
@@ -38179,7 +38667,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (iter == 0) error (SWT.ERROR_ITEM_NOT_ADDED);
for (int i=0; i<items.length; i++) {
String string = items [i];
-@@ -1503,9 +1503,9 @@
+@@ -1504,9 +1504,9 @@
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < OS.gtk_tree_model_iter_n_children (modelHandle, 0))) return;
@@ -38191,7 +38679,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0, 0);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -1542,9 +1542,9 @@
+@@ -1543,9 +1543,9 @@
checkWidget();
int index = getSelectionIndex ();
if (index == -1) return;
@@ -38203,7 +38691,7 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -1578,9 +1578,9 @@
+@@ -1579,9 +1579,9 @@
OS.g_free (iter);
}
@@ -38215,10 +38703,10 @@ diff -ur x86/org/eclipse/swt/widgets/List.java x86_64/org/eclipse/swt/widgets/Li
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widgets/MenuItem.java
---- x86/org/eclipse/swt/widgets/MenuItem.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/MenuItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -37,7 +37,7 @@
+diff -urN x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widgets/MenuItem.java
+--- x86/org/eclipse/swt/widgets/MenuItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/MenuItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -38,7 +38,7 @@
*/
public class MenuItem extends Item {
Menu parent, menu;
@@ -38227,7 +38715,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
int accelerator;
/**
-@@ -126,11 +126,11 @@
+@@ -127,11 +127,11 @@
createWidget (index);
}
@@ -38241,7 +38729,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
addAccelerator (accelGroup);
if (menu != null) menu.addAccelerators (accelGroup);
}
-@@ -251,7 +251,7 @@
+@@ -252,7 +252,7 @@
if (groupHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_object_ref (groupHandle);
OS.gtk_object_sink (groupHandle);
@@ -38250,7 +38738,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
handle = OS.gtk_radio_menu_item_new_with_label (group, buffer);
break;
case SWT.CHECK:
-@@ -264,10 +264,10 @@
+@@ -265,10 +265,10 @@
}
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.SEPARATOR) == 0) {
@@ -38263,7 +38751,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
boolean enabled = OS.GTK_WIDGET_SENSITIVE (parentHandle);
if (!enabled) OS.GTK_WIDGET_SET_FLAGS (parentHandle, OS.GTK_SENSITIVE);
OS.gtk_menu_shell_insert (parentHandle, handle, index);
-@@ -299,7 +299,7 @@
+@@ -300,7 +300,7 @@
return accelerator;
}
@@ -38272,7 +38760,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
Menu menu = parent;
while (menu != null && menu.cascade != null) {
menu = menu.cascade.parent;
-@@ -400,7 +400,7 @@
+@@ -401,7 +401,7 @@
return OS.gtk_check_menu_item_get_active(handle);
}
@@ -38281,7 +38769,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if ((style & SWT.CASCADE) != 0 && menu != null) return 0;
/*
* Bug in GTK. When an ancestor menu is disabled and
-@@ -411,7 +411,7 @@
+@@ -412,7 +412,7 @@
*/
if (!isEnabled ()) return 0;
Event event = new Event ();
@@ -38290,7 +38778,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if (ptr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, ptr, GdkEvent.sizeof);
-@@ -438,13 +438,13 @@
+@@ -439,13 +439,13 @@
return 0;
}
@@ -38306,7 +38794,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
boolean handled = hooks (SWT.Help);
if (handled) {
postEvent (SWT.Help);
-@@ -503,7 +503,7 @@
+@@ -504,7 +504,7 @@
void releaseWidget () {
super.releaseWidget ();
@@ -38315,7 +38803,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if (accelGroup != 0) removeAccelerator (accelGroup);
if (groupHandle != 0) OS.g_object_unref (groupHandle);
groupHandle = 0;
-@@ -511,11 +511,11 @@
+@@ -512,11 +512,11 @@
parent = null;
}
@@ -38329,7 +38817,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
removeAccelerator (accelGroup);
if (menu != null) menu.removeAccelerators (accelGroup);
}
-@@ -621,7 +621,7 @@
+@@ -622,7 +622,7 @@
public void setAccelerator (int accelerator) {
checkWidget();
if (this.accelerator == accelerator) return;
@@ -38338,7 +38826,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if (accelGroup != 0) removeAccelerator (accelGroup);
this.accelerator = accelerator;
if (accelGroup != 0) addAccelerator (accelGroup);
-@@ -643,7 +643,7 @@
+@@ -644,7 +644,7 @@
public void setEnabled (boolean enabled) {
checkWidget();
if (OS.GTK_WIDGET_SENSITIVE (handle) == enabled) return;
@@ -38347,7 +38835,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if (accelGroup != 0) removeAccelerator (accelGroup);
OS.gtk_widget_set_sensitive (handle, enabled);
if (accelGroup != 0) addAccelerator (accelGroup);
-@@ -680,8 +680,8 @@
+@@ -681,8 +681,8 @@
} else {
imageList.put (imageIndex, image);
}
@@ -38358,7 +38846,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
OS.gtk_image_menu_item_set_image (handle, imageHandle);
OS.gtk_widget_show (imageHandle);
} else {
-@@ -733,7 +733,7 @@
+@@ -734,7 +734,7 @@
/* Assign the new menu */
Menu oldMenu = this.menu;
if (oldMenu == menu) return;
@@ -38367,7 +38855,7 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if (accelGroup != 0) removeAccelerators (accelGroup);
if (oldMenu != null) {
oldMenu.cascade = null;
-@@ -843,17 +843,17 @@
+@@ -844,17 +844,17 @@
}
char [] chars = fixMnemonic (string);
byte [] buffer = Converter.wcsToMbcs (null, chars, true);
@@ -38389,10 +38877,10 @@ diff -ur x86/org/eclipse/swt/widgets/MenuItem.java x86_64/org/eclipse/swt/widget
if (accelerator == 0 || !getEnabled ()) return;
if ((accelerator & SWT.COMMAND) != 0) return;
int mask = 0;
-diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Menu.java
---- x86/org/eclipse/swt/widgets/Menu.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Menu.java 2009-02-11 17:43:50.000000000 -0500
-@@ -43,7 +43,7 @@
+diff -urN x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Menu.java
+--- x86/org/eclipse/swt/widgets/Menu.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Menu.java 2009-09-17 08:48:24.000000000 -0400
+@@ -44,7 +44,7 @@
boolean hasLocation;
MenuItem cascade, selectedItem;
Decorations parent;
@@ -38401,7 +38889,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
ImageList imageList;
/**
-@@ -205,7 +205,7 @@
+@@ -209,7 +209,7 @@
OS.gtk_menu_shell_set_take_focus (handle, false);
}
}
@@ -38410,7 +38898,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
/*
* Bug in GTK. The timestamp passed into gtk_menu_popup is used
* to perform an X pointer grab. It cannot be zero, else the grab
-@@ -221,7 +221,7 @@
+@@ -225,7 +225,7 @@
}
}
@@ -38419,7 +38907,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
MenuItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
MenuItem item = items[i];
-@@ -287,7 +287,7 @@
+@@ -291,7 +291,7 @@
if ((style & SWT.BAR) != 0) {
handle = OS.gtk_menu_bar_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -38428,7 +38916,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
OS.gtk_container_add (vboxHandle, handle);
OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0, OS.GTK_PACK_START);
} else {
-@@ -296,7 +296,7 @@
+@@ -300,7 +300,7 @@
}
}
@@ -38437,7 +38925,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
if (this.imHandle == imHandle) return;
this.imHandle = imHandle;
if (imHandle == 0) {
-@@ -321,7 +321,7 @@
+@@ -325,7 +325,7 @@
OS.gtk_widget_show (imItem);
OS.gtk_menu_shell_insert (handle, imItem, -1);
}
@@ -38446,7 +38934,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
OS.gtk_im_multicontext_append_menuitems (imHandle, imSubmenu);
OS.gtk_menu_item_set_submenu (imItem, imSubmenu);
}
-@@ -347,7 +347,7 @@
+@@ -351,7 +351,7 @@
if (!OS.GTK_WIDGET_MAPPED (handle)) {
return new Rectangle (0, 0, 0, 0);
}
@@ -38455,7 +38943,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
int x = origin_x [0] + OS.GTK_WIDGET_X (handle);
-@@ -411,13 +411,13 @@
+@@ -415,13 +415,13 @@
*/
public MenuItem getItem (int index) {
checkWidget();
@@ -38471,7 +38959,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
OS.g_list_free (list);
if (data == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
return (MenuItem) display.getWidget (data);
-@@ -435,7 +435,7 @@
+@@ -439,7 +439,7 @@
*/
public int getItemCount () {
checkWidget();
@@ -38480,7 +38968,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
if (list == 0) return 0;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -462,7 +462,7 @@
+@@ -466,7 +466,7 @@
*/
public MenuItem [] getItems () {
checkWidget();
@@ -38489,7 +38977,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
if (list == 0) return new MenuItem [0];
int count = OS.g_list_length (list);
if (imSeparator != 0) count--;
-@@ -470,7 +470,7 @@
+@@ -474,7 +474,7 @@
MenuItem [] items = new MenuItem [count];
int index = 0;
for (int i=0; i<count; i++) {
@@ -38498,25 +38986,25 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
MenuItem item = (MenuItem) display.getWidget (data);
if (item != null) items [index++] = item;
}
-@@ -596,7 +596,7 @@
+@@ -600,7 +600,7 @@
return OS.GTK_WIDGET_MAPPED (handle);
}
-int /*long*/ gtk_hide (int /*long*/ widget) {
+long /*int*/ gtk_hide (long /*int*/ widget) {
if ((style & SWT.POP_UP) != 0) {
- display.activeShell = getShell ();
+ if (display.activeShell != null) display.activeShell = getShell ();
}
-@@ -615,7 +615,7 @@
+@@ -619,7 +619,7 @@
return 0;
}
-int /*long*/ gtk_show (int /*long*/ widget) {
+long /*int*/ gtk_show (long /*int*/ widget) {
if ((style & SWT.POP_UP) != 0) {
- display.activeShell = getShell ();
+ if (display.activeShell != null) display.activeShell = getShell ();
return 0;
-@@ -625,7 +625,7 @@
+@@ -629,7 +629,7 @@
}
@@ -38525,7 +39013,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
if (sendHelpEvent (helpType)) {
OS.gtk_menu_shell_deactivate (handle);
return 1;
-@@ -710,7 +710,7 @@
+@@ -714,7 +714,7 @@
return getVisible ();
}
@@ -38534,7 +39022,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
/*
* Feature in GTK. The menu position function sets the position of the
* top-left pixel of the menu. If the menu would be off-screen, GTK will
-@@ -798,7 +798,7 @@
+@@ -802,7 +802,7 @@
eventTable.unhook (SWT.Show, listener);
}
@@ -38543,7 +39031,7 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
MenuItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
MenuItem item = items[i];
-@@ -830,7 +830,7 @@
+@@ -834,7 +834,7 @@
eventTable.unhook (SWT.Help, listener);
}
@@ -38552,10 +39040,10 @@ diff -ur x86/org/eclipse/swt/widgets/Menu.java x86_64/org/eclipse/swt/widgets/Me
if (selectedItem != null && !selectedItem.isDisposed()) {
if (selectedItem.hooks (SWT.Help)) {
selectedItem.postEvent (SWT.Help);
-diff -ur x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widgets/MessageBox.java
---- x86/org/eclipse/swt/widgets/MessageBox.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/MessageBox.java 2009-02-11 17:43:50.000000000 -0500
-@@ -41,7 +41,7 @@
+diff -urN x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widgets/MessageBox.java
+--- x86/org/eclipse/swt/widgets/MessageBox.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/MessageBox.java 2009-09-17 08:48:24.000000000 -0400
+@@ -42,7 +42,7 @@
public class MessageBox extends Dialog {
String message = "";
@@ -38564,7 +39052,7 @@ diff -ur x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widg
/**
* Constructs a new instance of this class given only its parent.
*
-@@ -127,7 +127,7 @@
+@@ -141,7 +141,7 @@
* </ul>
*/
public int open () {
@@ -38573,7 +39061,7 @@ diff -ur x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widg
int dialogFlags = OS.GTK_DIALOG_DESTROY_WITH_PARENT;
if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) {
dialogFlags |= OS.GTK_DIALOG_MODAL;
-@@ -141,7 +141,7 @@
+@@ -155,7 +155,7 @@
handle = OS.gtk_message_dialog_new(parentHandle, dialogFlags, messageType, 0, buffer);
if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
if (parentHandle != 0) {
@@ -38582,7 +39070,7 @@ diff -ur x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widg
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
-@@ -158,7 +158,7 @@
+@@ -172,7 +172,7 @@
display.setModalDialog (this);
}
int signalId = 0;
@@ -38591,9 +39079,9 @@ diff -ur x86/org/eclipse/swt/widgets/MessageBox.java x86_64/org/eclipse/swt/widg
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
signalId = OS.g_signal_lookup (OS.map, OS.GTK_TYPE_WIDGET());
hookId = OS.g_signal_add_emission_hook (signalId, 0, display.emissionProc, handle, 0);
-diff -ur x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widgets/Monitor.java
---- x86/org/eclipse/swt/widgets/Monitor.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Monitor.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widgets/Monitor.java
+--- x86/org/eclipse/swt/widgets/Monitor.java 2008-06-05 13:32:00.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Monitor.java 2009-09-17 08:48:24.000000000 -0400
@@ -22,7 +22,7 @@
* @since 3.0
*/
@@ -38603,10 +39091,10 @@ diff -ur x86/org/eclipse/swt/widgets/Monitor.java x86_64/org/eclipse/swt/widgets
int x, y, width, height;
int clientX, clientY, clientWidth, clientHeight;
-diff -ur x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/widgets/ProgressBar.java
---- x86/org/eclipse/swt/widgets/ProgressBar.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ProgressBar.java 2009-02-11 17:43:50.000000000 -0500
-@@ -160,8 +160,8 @@
+diff -urN x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/widgets/ProgressBar.java
+--- x86/org/eclipse/swt/widgets/ProgressBar.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ProgressBar.java 2009-09-17 08:48:24.000000000 -0400
+@@ -162,8 +162,8 @@
return SWT.NORMAL;
}
@@ -38617,7 +39105,7 @@ diff -ur x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wid
if (result != 0) return result;
/*
* Bug in GTK. When a progress bar has been unrealized after being
-@@ -270,7 +270,7 @@
+@@ -272,7 +272,7 @@
//NOT IMPLEMENTED
}
@@ -38626,7 +39114,7 @@ diff -ur x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wid
if (isVisible ()) OS.gtk_progress_bar_pulse (handle);
return 1;
}
-@@ -293,7 +293,7 @@
+@@ -295,7 +295,7 @@
* but unexpected. The fix is to force all
* outstanding redraws to be delivered.
*/
@@ -38635,10 +39123,10 @@ diff -ur x86/org/eclipse/swt/widgets/ProgressBar.java x86_64/org/eclipse/swt/wid
OS.gdk_window_process_updates (window, false);
OS.gdk_flush ();
}
-diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sash.java
---- x86/org/eclipse/swt/widgets/Sash.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Sash.java 2009-02-11 17:43:50.000000000 -0500
-@@ -40,7 +40,7 @@
+diff -urN x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sash.java
+--- x86/org/eclipse/swt/widgets/Sash.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Sash.java 2009-09-17 08:48:24.000000000 -0400
+@@ -41,7 +41,7 @@
public class Sash extends Control {
boolean dragging;
int startX, startY, lastX, lastY;
@@ -38647,7 +39135,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
private final static int INCREMENT = 1;
private final static int PAGE_INCREMENT = 9;
-@@ -143,12 +143,12 @@
+@@ -145,12 +145,12 @@
void drawBand (int x, int y, int width, int height) {
if ((style & SWT.SMOOTH) != 0) return;
@@ -38664,7 +39152,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
-@@ -161,8 +161,8 @@
+@@ -163,8 +163,8 @@
OS.g_object_unref (gc);
}
@@ -38675,7 +39163,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -170,7 +170,7 @@
+@@ -172,7 +172,7 @@
if (button != 1) return 0;
if (gdkEvent.type == OS.GDK_2BUTTON_PRESS) return 0;
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
@@ -38684,7 +39172,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
int [] origin_x = new int [1], origin_y = new int [1];
OS.gdk_window_get_origin (window, origin_x, origin_y);
startX = (int) (gdkEvent.x_root - origin_x [0]);
-@@ -208,8 +208,8 @@
+@@ -210,8 +210,8 @@
return result;
}
@@ -38695,7 +39183,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -238,8 +238,8 @@
+@@ -240,8 +240,8 @@
return result;
}
@@ -38706,7 +39194,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
if (result != 0) return result;
// widget could be disposed at this point
if (handle != 0) {
-@@ -249,8 +249,8 @@
+@@ -251,8 +251,8 @@
return 0;
}
@@ -38717,7 +39205,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
if (result != 0) return result;
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -285,9 +285,9 @@
+@@ -287,9 +287,9 @@
if (newX == lastX && newY == lastY) return result;
/* Ensure that the pointer image does not change */
@@ -38729,7 +39217,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
int ptrGrabResult = OS.gdk_pointer_grab (window, false, grabMask, window, gdkCursor, OS.GDK_CURRENT_TIME);
/* The event must be sent because its doit flag is used. */
-@@ -324,8 +324,8 @@
+@@ -326,8 +326,8 @@
return result;
}
@@ -38740,7 +39228,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
if (result != 0) return result;
if (!dragging) return 0;
GdkEventMotion gdkEvent = new GdkEventMotion ();
-@@ -387,7 +387,7 @@
+@@ -389,7 +389,7 @@
return result;
}
@@ -38749,7 +39237,7 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
setCursor (cursor != null ? cursor.handle : 0);
return super.gtk_realize (widget);
}
-@@ -428,7 +428,7 @@
+@@ -430,7 +430,7 @@
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -38758,10 +39246,10 @@ diff -ur x86/org/eclipse/swt/widgets/Sash.java x86_64/org/eclipse/swt/widgets/Sa
super.setCursor (cursor != 0 ? cursor : defaultCursor);
}
-diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/Scale.java
---- x86/org/eclipse/swt/widgets/Scale.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Scale.java 2009-02-11 17:43:50.000000000 -0500
-@@ -126,7 +126,7 @@
+diff -urN x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/Scale.java
+--- x86/org/eclipse/swt/widgets/Scale.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Scale.java 2009-09-17 08:48:24.000000000 -0400
+@@ -127,7 +127,7 @@
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -38770,7 +39258,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/S
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = OS.gtk_hscale_new (hAdjustment);
-@@ -158,7 +158,7 @@
+@@ -159,7 +159,7 @@
*/
public int getIncrement () {
checkWidget ();
@@ -38779,7 +39267,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/S
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
-@@ -176,7 +176,7 @@
+@@ -177,7 +177,7 @@
*/
public int getMaximum () {
checkWidget ();
@@ -38788,7 +39276,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/S
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
-@@ -194,7 +194,7 @@
+@@ -195,7 +195,7 @@
*/
public int getMinimum () {
checkWidget ();
@@ -38797,7 +39285,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/S
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
-@@ -214,7 +214,7 @@
+@@ -215,7 +215,7 @@
*/
public int getPageIncrement () {
checkWidget ();
@@ -38806,7 +39294,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/S
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
-@@ -232,13 +232,13 @@
+@@ -233,13 +233,13 @@
*/
public int getSelection () {
checkWidget ();
@@ -38822,11 +39310,11 @@ diff -ur x86/org/eclipse/swt/widgets/Scale.java x86_64/org/eclipse/swt/widgets/S
postEvent (SWT.Selection);
return 0;
}
-diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widgets/Scrollable.java
---- x86/org/eclipse/swt/widgets/Scrollable.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Scrollable.java 2009-02-11 17:43:50.000000000 -0500
-@@ -32,7 +32,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widgets/Scrollable.java
+--- x86/org/eclipse/swt/widgets/Scrollable.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Scrollable.java 2009-09-17 08:48:24.000000000 -0400
+@@ -33,7 +33,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Scrollable extends Control {
- int /*long*/ scrolledHandle;
@@ -38834,7 +39322,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
ScrollBar horizontalBar, verticalBar;
/**
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
super (parent, style);
}
@@ -38843,7 +39331,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
return handle;
}
-@@ -115,7 +115,7 @@
+@@ -116,7 +116,7 @@
trimWidth += vScrollBarWidth ();
if (scrolledHandle != 0) {
if (OS.gtk_scrolled_window_get_shadow_type (scrolledHandle) != OS.GTK_SHADOW_NONE) {
@@ -38852,7 +39340,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
int xthickness = OS.gtk_style_get_xthickness (style);
int ythickness = OS.gtk_style_get_ythickness (style);
trimX -= xthickness;
-@@ -194,7 +194,7 @@
+@@ -195,7 +195,7 @@
public Rectangle getClientArea () {
checkWidget ();
forceResize ();
@@ -38861,7 +39349,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
int x = OS.GTK_WIDGET_X (clientHandle);
int y = OS.GTK_WIDGET_Y (clientHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
-@@ -232,8 +232,8 @@
+@@ -233,8 +233,8 @@
return verticalBar;
}
@@ -38872,7 +39360,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
/*
* Feature in GTK. Scrolled windows do not scroll if the scrollbars
-@@ -267,7 +267,7 @@
+@@ -268,7 +268,7 @@
int hScrollBarWidth() {
if (horizontalBar==null) return 0;
@@ -38881,7 +39369,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
if (hBarHandle==0) return 0;
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request(hBarHandle, requisition);
-@@ -311,9 +311,9 @@
+@@ -312,9 +312,9 @@
super.redrawWidget (x, y, width, height, redrawAll, all, trim);
if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) == 0) return;
if (!trim) return;
@@ -38893,7 +39381,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
GdkRectangle rect = new GdkRectangle ();
if (redrawAll) {
rect.width = OS.GTK_WIDGET_WIDTH (topHandle);
-@@ -361,7 +361,7 @@
+@@ -362,7 +362,7 @@
if (scrolledHandle != 0) OS.gtk_widget_show (scrolledHandle);
}
@@ -38902,7 +39390,7 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
if (fixedHandle != 0) return fixedHandle;
if (scrolledHandle != 0) return scrolledHandle;
return super.topHandle ();
-@@ -373,7 +373,7 @@
+@@ -374,7 +374,7 @@
int vScrollBarWidth() {
if (verticalBar == null) return 0;
@@ -38911,10 +39399,10 @@ diff -ur x86/org/eclipse/swt/widgets/Scrollable.java x86_64/org/eclipse/swt/widg
if (vBarHandle == 0) return 0;
GtkRequisition requisition = new GtkRequisition();
OS.gtk_widget_size_request (vBarHandle, requisition);
-diff -ur x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widgets/ScrollBar.java
---- x86/org/eclipse/swt/widgets/ScrollBar.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ScrollBar.java 2009-02-11 17:43:50.000000000 -0500
-@@ -83,7 +83,7 @@
+diff -urN x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widgets/ScrollBar.java
+--- x86/org/eclipse/swt/widgets/ScrollBar.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ScrollBar.java 2009-09-17 08:48:24.000000000 -0400
+@@ -84,7 +84,7 @@
*/
public class ScrollBar extends Widget {
Scrollable parent;
@@ -38923,7 +39411,7 @@ diff -ur x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widge
int detail;
boolean dragSent;
-@@ -343,7 +343,7 @@
+@@ -344,7 +344,7 @@
*/
public boolean getVisible () {
checkWidget ();
@@ -38932,7 +39420,7 @@ diff -ur x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widge
int [] hsp = new int [1], vsp = new int [1];
OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
if ((style & SWT.HORIZONTAL) != 0) {
-@@ -353,20 +353,20 @@
+@@ -354,20 +354,20 @@
}
}
@@ -38957,7 +39445,7 @@ diff -ur x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widge
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
-@@ -394,7 +394,7 @@
+@@ -395,7 +395,7 @@
return 0;
}
@@ -38966,19 +39454,19 @@ diff -ur x86/org/eclipse/swt/widgets/ScrollBar.java x86_64/org/eclipse/swt/widge
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
-diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/Shell.java
---- x86/org/eclipse/swt/widgets/Shell.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Shell.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/Shell.java
+--- x86/org/eclipse/swt/widgets/Shell.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Shell.java 2009-09-17 08:48:24.000000000 -0400
@@ -117,7 +117,7 @@
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
public class Shell extends Decorations {
- int /*long*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;
+ long /*int*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;
- boolean mapped, moved, resized, opened, fullScreen, showWithParent;
+ boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center;
int oldX, oldY, oldWidth, oldHeight;
int minWidth, minHeight;
-@@ -245,7 +245,7 @@
+@@ -252,7 +252,7 @@
this (display, null, style, 0, false);
}
@@ -38987,7 +39475,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
super ();
checkSubclass ();
if (display == null) display = Display.getCurrent ();
-@@ -347,7 +347,7 @@
+@@ -356,7 +356,7 @@
this (parent != null ? parent.display : null, parent, style, 0, false);
}
@@ -38996,7 +39484,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
return new Shell (display, null, SWT.NO_TRIM, handle, true);
}
-@@ -368,7 +368,7 @@
+@@ -377,7 +377,7 @@
*
* @since 3.3
*/
@@ -39005,7 +39493,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
-@@ -418,7 +418,7 @@
+@@ -448,7 +448,7 @@
if (display.ignoreTrim) return;
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
@@ -39014,7 +39502,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
GdkRectangle rect = new GdkRectangle ();
OS.gdk_window_get_frame_extents (window, rect);
int trimWidth = Math.max (0, rect.width - width);
-@@ -473,7 +473,7 @@
+@@ -503,7 +503,7 @@
if (!force) {
if (activeShell == null) return;
if (!display.activePending) {
@@ -39023,7 +39511,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (focusHandle != 0 && !OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return;
}
}
-@@ -501,10 +501,10 @@
+@@ -531,10 +531,10 @@
* window. The fix is to use XSetInputFocus() to force
* the focus.
*/
@@ -39037,7 +39525,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.gdk_error_trap_push ();
/* Use CurrentTime instead of the last event time to ensure that the shell becomes active */
OS.XSetInputFocus (xDisplay, xWindow, OS.RevertToParent, OS.CurrentTime);
-@@ -534,7 +534,7 @@
+@@ -584,7 +584,7 @@
if (!opened) resized = false;
}
@@ -39046,7 +39534,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
return 0;
}
-@@ -632,7 +632,7 @@
+@@ -682,7 +682,7 @@
} else {
vboxHandle = OS.gtk_bin_get_child (shellHandle);
if (vboxHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -39055,7 +39543,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (OS.g_list_length (children) > 0) {
scrolledHandle = OS.g_list_data (children);
}
-@@ -652,7 +652,7 @@
+@@ -702,7 +702,7 @@
OS.gtk_widget_realize (shellHandle);
}
@@ -39064,7 +39552,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
int eventType = OS.X_EVENT_TYPE (xEvent);
if (eventType != OS.FocusOut && eventType != OS.FocusIn) return 0;
XFocusChangeEvent xFocusEvent = new XFocusChangeEvent();
-@@ -716,7 +716,7 @@
+@@ -766,7 +766,7 @@
OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [MAP_EVENT], 0, display.shellMapProcClosure, false);
OS.g_signal_connect_closure_by_id (shellHandle, display.signalIds [ENTER_NOTIFY_EVENT], 0, display.closures [ENTER_NOTIFY_EVENT], false);
OS.g_signal_connect_closure (shellHandle, OS.move_focus, display.closures [MOVE_FOCUS], false);
@@ -39073,7 +39561,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.gdk_window_add_filter (window, display.filterProc, shellHandle);
}
-@@ -745,7 +745,7 @@
+@@ -795,7 +795,7 @@
/* Do nothing */
}
@@ -39082,7 +39570,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
return shellHandle;
}
-@@ -776,15 +776,15 @@
+@@ -826,15 +826,15 @@
}
}
@@ -39101,7 +39589,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
}
void forceResize () {
-@@ -1004,7 +1004,7 @@
+@@ -1070,7 +1070,7 @@
return result;
}
@@ -39110,7 +39598,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
int [] x = new int [1], y = new int [1];
OS.gtk_window_get_position (shellHandle, x, y);
if (!moved || oldX != x [0] || oldY != y [0]) {
-@@ -1017,19 +1017,19 @@
+@@ -1083,19 +1083,19 @@
return 0;
}
@@ -39133,7 +39621,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
switch ((int)/*64*/directionType) {
case OS.GTK_DIR_TAB_FORWARD:
case OS.GTK_DIR_TAB_BACKWARD:
-@@ -1046,17 +1046,17 @@
+@@ -1112,17 +1112,17 @@
return super.gtk_focus (widget, directionType);
}
@@ -39154,7 +39642,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
/* Stop menu mnemonics when the shell is disabled */
if (widget == shellHandle) {
return (state & DISABLED) != 0 ? 1 : 0;
-@@ -1064,7 +1064,7 @@
+@@ -1130,7 +1130,7 @@
return super.gtk_key_press_event (widget, event);
}
@@ -39163,7 +39651,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
if (!resized || oldWidth != width || oldHeight != height) {
-@@ -1075,9 +1075,9 @@
+@@ -1141,9 +1141,9 @@
return 0;
}
@@ -39176,7 +39664,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if ((style & SWT.SHELL_TRIM) != SWT.SHELL_TRIM) {
int decorations = 0;
if ((style & SWT.NO_TRIM) == 0) {
-@@ -1103,7 +1103,7 @@
+@@ -1169,7 +1169,7 @@
return result;
}
@@ -39185,7 +39673,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
GdkEventWindowState gdkEvent = new GdkEventWindowState ();
OS.memmove (gdkEvent, event, GdkEventWindowState.sizeof);
minimized = (gdkEvent.new_window_state & OS.GDK_WINDOW_STATE_ICONIFIED) != 0;
-@@ -1342,13 +1342,13 @@
+@@ -1418,13 +1418,13 @@
return result;
}
@@ -39201,7 +39689,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.XFlush (xDisplay);
}
}
-@@ -1381,9 +1381,9 @@
+@@ -1457,9 +1457,9 @@
enableWindow = 0;
}
} else {
@@ -39213,7 +39701,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
Rectangle rect = getBounds ();
GdkWindowAttr attributes = new GdkWindowAttr ();
attributes.width = rect.width;
-@@ -1398,7 +1398,7 @@
+@@ -1474,7 +1474,7 @@
if (!OS.GDK_WINDOWING_X11 ()) {
OS.gdk_flush ();
} else {
@@ -39222,7 +39710,16 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.XFlush (xDisplay);
}
}
-@@ -1499,13 +1499,13 @@
+@@ -1548,7 +1548,7 @@
+ if ((state & FOREIGN_HANDLE) != 0) return;
+ int width = OS.gdk_screen_width () * 5 / 8;
+ int height = OS.gdk_screen_height () * 5 / 8;
+- int /*long*/ screen = OS.gdk_screen_get_default ();
++ long /*int*/ screen = OS.gdk_screen_get_default ();
+ if (screen != 0) {
+ if (OS.gdk_screen_get_n_monitors (screen) > 1) {
+ int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
+@@ -1583,13 +1583,13 @@
if (menu.parent != this) error (SWT.ERROR_INVALID_PARENT);
}
if (menuBar != null) {
@@ -39238,7 +39735,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.gtk_widget_show (menuHandle);
createAccelGroup ();
menuBar.addAccelerators (accelGroup);
-@@ -1729,7 +1729,7 @@
+@@ -1835,7 +1835,7 @@
if (mapped) setZOrder (sibling, above, false, false);
}
@@ -39247,7 +39744,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
mapped = true;
display.dispatchEvents = null;
return 0;
-@@ -1743,12 +1743,12 @@
+@@ -1849,12 +1849,12 @@
if (vboxHandle != 0) OS.gtk_widget_show (vboxHandle);
}
@@ -39262,7 +39759,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (screen != 0) {
int monitorNumber = OS.gdk_screen_get_monitor_at_point (screen, x[0], y[0]);
GdkRectangle dest = new GdkRectangle ();
-@@ -1766,7 +1766,7 @@
+@@ -1872,7 +1872,7 @@
return 0;
}
@@ -39271,7 +39768,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.gtk_widget_hide (handle);
return 0;
}
-@@ -1812,7 +1812,7 @@
+@@ -1918,7 +1918,7 @@
}
void updateModal () {
@@ -39280,7 +39777,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (display.getModalDialog () == null) {
Shell modal = getModalShell ();
int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
-@@ -1957,16 +1957,16 @@
+@@ -2072,16 +2072,16 @@
tooltipsHandle = 0;
if (group != 0) OS.g_object_unref (group);
group = modalGroup = 0;
@@ -39300,7 +39797,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
byte [] buffer = null;
if (string != null && string.length () > 0) {
-@@ -1982,12 +1982,12 @@
+@@ -2097,12 +2097,12 @@
* 2 fake GDK_MOTION_NOTIFY events (to mimic the GTK call) which
* contain the proper x and y coordinates.
*/
@@ -39317,7 +39814,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (window != 0) OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
eventPtr = OS.gdk_event_new (OS.GDK_MOTION_NOTIFY);
-@@ -2033,7 +2033,7 @@
+@@ -2148,7 +2148,7 @@
if (OS.GTK_VERSION >= OS.VERSION (2, 2, 1)) {
OS.gtk_tooltips_force_window (tooltipsHandle);
}
@@ -39326,7 +39823,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
if (tipWindow != 0 && tipWindow != tooltipWindow) {
OS.g_signal_connect (tipWindow, OS.size_allocate, display.sizeAllocateProc, shellHandle);
tooltipWindow = tipWindow;
-@@ -2049,9 +2049,9 @@
+@@ -2164,9 +2164,9 @@
if (tipWindow != 0) {
if ((OS.GTK_WIDGET_FLAGS (tipWidget) & (OS.GTK_REALIZED | OS.GTK_VISIBLE)) != 0) {
int [] x = new int [1], y = new int [1];
@@ -39338,7 +39835,7 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.gdk_window_get_user_data (window, user_data);
if (tipWidget == user_data [0]) {
/*
-@@ -2065,7 +2065,7 @@
+@@ -2180,7 +2180,7 @@
int handler_id = OS.g_signal_connect (tipWindow, OS.size_request, display.sizeRequestProc, shellHandle);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
OS.gtk_widget_hide (tipWindow);
@@ -39347,10 +39844,10 @@ diff -ur x86/org/eclipse/swt/widgets/Shell.java x86_64/org/eclipse/swt/widgets/S
OS.GTK_TOOLTIPS_SET_ACTIVE (tooltipsHandle, data);
OS.gtk_tooltips_set_tip (tooltipsHandle, tipWidget, buffer, null);
if (handler_id != 0) OS.g_signal_handler_disconnect (tipWindow, handler_id);
-diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/Slider.java
---- x86/org/eclipse/swt/widgets/Slider.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Slider.java 2009-02-11 17:43:50.000000000 -0500
-@@ -152,7 +152,7 @@
+diff -urN x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/Slider.java
+--- x86/org/eclipse/swt/widgets/Slider.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Slider.java 2009-09-17 08:48:24.000000000 -0400
+@@ -153,7 +153,7 @@
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -39359,7 +39856,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
if (hAdjustment == 0) error (SWT.ERROR_NO_HANDLES);
if ((style & SWT.HORIZONTAL) != 0) {
handle = OS.gtk_hscrollbar_new (hAdjustment);
-@@ -174,20 +174,20 @@
+@@ -175,20 +175,20 @@
OS.gtk_container_add (fixedHandle, handle);
}
@@ -39384,7 +39881,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
Event event = new Event ();
dragSent = detail == OS.GTK_SCROLL_JUMP;
switch (detail) {
-@@ -213,7 +213,7 @@
+@@ -214,7 +214,7 @@
return 0;
}
@@ -39393,7 +39890,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GdkEvent gtkEvent = new GdkEvent ();
OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
switch (gtkEvent.type) {
-@@ -246,13 +246,13 @@
+@@ -247,13 +247,13 @@
void register () {
super.register ();
@@ -39409,7 +39906,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
display.removeWidget (hAdjustment);
}
-@@ -283,7 +283,7 @@
+@@ -284,7 +284,7 @@
*/
public int getIncrement () {
checkWidget ();
@@ -39418,7 +39915,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.step_increment;
-@@ -301,7 +301,7 @@
+@@ -302,7 +302,7 @@
*/
public int getMaximum () {
checkWidget ();
@@ -39427,7 +39924,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.upper;
-@@ -319,7 +319,7 @@
+@@ -320,7 +320,7 @@
*/
public int getMinimum () {
checkWidget ();
@@ -39436,7 +39933,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.lower;
-@@ -339,7 +339,7 @@
+@@ -340,7 +340,7 @@
*/
public int getPageIncrement () {
checkWidget ();
@@ -39445,7 +39942,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_increment;
-@@ -357,7 +357,7 @@
+@@ -358,7 +358,7 @@
*/
public int getSelection () {
checkWidget ();
@@ -39454,7 +39951,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.value;
-@@ -376,7 +376,7 @@
+@@ -377,7 +377,7 @@
*/
public int getThumb () {
checkWidget ();
@@ -39463,7 +39960,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
return (int) adjustment.page_size;
-@@ -443,7 +443,7 @@
+@@ -444,7 +444,7 @@
*/
public void setMaximum (int value) {
checkWidget ();
@@ -39472,7 +39969,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int minimum = (int) adjustment.lower;
-@@ -473,7 +473,7 @@
+@@ -474,7 +474,7 @@
public void setMinimum (int value) {
checkWidget ();
if (value < 0) return;
@@ -39481,7 +39978,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int maximum = (int) adjustment.upper;
-@@ -553,7 +553,7 @@
+@@ -554,7 +554,7 @@
public void setThumb (int value) {
checkWidget ();
if (value < 1) return;
@@ -39490,7 +39987,7 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));
-@@ -594,7 +594,7 @@
+@@ -595,7 +595,7 @@
if (increment < 1) return;
if (pageIncrement < 1) return;
thumb = Math.min (thumb, maximum - minimum);
@@ -39499,11 +39996,11 @@ diff -ur x86/org/eclipse/swt/widgets/Slider.java x86_64/org/eclipse/swt/widgets/
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
-diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets/Spinner.java
---- x86/org/eclipse/swt/widgets/Spinner.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Spinner.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets/Spinner.java
+--- x86/org/eclipse/swt/widgets/Spinner.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Spinner.java 2009-09-17 08:48:24.000000000 -0400
@@ -45,7 +45,7 @@
- static final int INNER_BORDER = 2;
+ public class Spinner extends Composite {
static final int MIN_ARROW_WIDTH = 6;
int lastEventTime = 0;
- int /*long*/ gdkEventKey = 0;
@@ -39540,7 +40037,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if ((this.style & SWT.BORDER) != 0) {
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
-@@ -253,7 +253,7 @@
+@@ -251,7 +251,7 @@
xborder += property [0];
yborder += property [0];
}
@@ -39549,7 +40046,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
int fontSize = OS.pango_font_description_get_size (fontDesc);
int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);
arrowSize = arrowSize - arrowSize % 2;
-@@ -287,7 +287,7 @@
+@@ -290,7 +290,7 @@
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -39558,7 +40055,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (adjustment == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_spin_button_new (adjustment, 1, 0);
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-@@ -316,23 +316,23 @@
+@@ -319,23 +319,23 @@
void deregister () {
super.deregister ();
@@ -39587,7 +40084,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -351,7 +351,7 @@
+@@ -354,7 +354,7 @@
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -39596,7 +40093,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -367,7 +367,7 @@
+@@ -370,7 +370,7 @@
public int getBorderWidth () {
checkWidget();
@@ -39605,7 +40102,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
-@@ -391,7 +391,7 @@
+@@ -394,7 +394,7 @@
*/
public int getIncrement () {
checkWidget ();
@@ -39614,7 +40111,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -412,7 +412,7 @@
+@@ -415,7 +415,7 @@
*/
public int getMaximum () {
checkWidget ();
@@ -39623,7 +40120,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -433,7 +433,7 @@
+@@ -436,7 +436,7 @@
*/
public int getMinimum () {
checkWidget ();
@@ -39632,7 +40129,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -455,7 +455,7 @@
+@@ -458,7 +458,7 @@
*/
public int getPageIncrement () {
checkWidget ();
@@ -39641,7 +40138,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -476,7 +476,7 @@
+@@ -479,7 +479,7 @@
*/
public int getSelection () {
checkWidget ();
@@ -39650,7 +40147,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int digits = OS.gtk_spin_button_get_digits (handle);
-@@ -501,7 +501,7 @@
+@@ -504,7 +504,7 @@
*/
public String getText () {
checkWidget ();
@@ -39659,7 +40156,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (str == 0) return "";
int length = OS.strlen (str);
byte [] buffer = new byte [length];
-@@ -548,26 +548,26 @@
+@@ -551,26 +551,26 @@
}
String getDecimalSeparator () {
@@ -39692,7 +40189,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (value != adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {
-@@ -584,7 +584,7 @@
+@@ -587,7 +587,7 @@
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -39701,7 +40198,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -603,7 +603,7 @@
+@@ -606,7 +606,7 @@
return 0;
}
@@ -39710,7 +40207,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (text == 0) return 0;
if (!OS.gtk_editable_get_editable (handle)) return 0;
int length = OS.strlen (text);
-@@ -641,7 +641,7 @@
+@@ -644,7 +644,7 @@
return 0;
}
@@ -39719,7 +40216,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);
if (newText == null) {
-@@ -662,17 +662,17 @@
+@@ -665,17 +665,17 @@
return 0;
}
@@ -39740,7 +40237,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
// if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
-@@ -681,7 +681,7 @@
+@@ -684,7 +684,7 @@
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -39749,7 +40246,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
String newText = verifyText (oldText, pos [0], pos [0]);
-@@ -713,15 +713,15 @@
+@@ -716,15 +716,15 @@
return 0;
}
@@ -39768,7 +40265,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -729,7 +729,7 @@
+@@ -732,7 +732,7 @@
return 0;
}
@@ -39777,7 +40274,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
postEvent (SWT.Selection);
return 0;
}
-@@ -742,7 +742,7 @@
+@@ -745,7 +745,7 @@
OS.g_signal_connect_closure (handle, OS.value_changed, display.closures [VALUE_CHANGED], false);
OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
@@ -39786,7 +40283,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -751,13 +751,13 @@
+@@ -754,13 +754,13 @@
}
}
@@ -39804,7 +40301,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -782,7 +782,7 @@
+@@ -785,7 +785,7 @@
void register () {
super.register ();
@@ -39813,7 +40310,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -869,14 +869,14 @@
+@@ -872,14 +872,14 @@
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -39831,7 +40328,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
super.setFontDescription (font);
}
-@@ -895,7 +895,7 @@
+@@ -898,7 +898,7 @@
public void setIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -39840,7 +40337,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -921,7 +921,7 @@
+@@ -924,7 +924,7 @@
*/
public void setMaximum (int value) {
checkWidget ();
@@ -39849,7 +40346,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -948,7 +948,7 @@
+@@ -951,7 +951,7 @@
*/
public void setMinimum (int value) {
checkWidget ();
@@ -39858,7 +40355,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -975,7 +975,7 @@
+@@ -978,7 +978,7 @@
public void setPageIncrement (int value) {
checkWidget ();
if (value < 1) return;
@@ -39867,7 +40364,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
double newValue = value;
-@@ -1062,7 +1062,7 @@
+@@ -1065,7 +1065,7 @@
if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
int digits = OS.gtk_spin_button_get_digits (handle);
if (value == digits) return;
@@ -39876,7 +40373,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
int diff = Math.abs (value - digits);
-@@ -1130,9 +1130,9 @@
+@@ -1137,9 +1137,9 @@
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -39888,7 +40385,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -1151,7 +1151,7 @@
+@@ -1158,7 +1158,7 @@
event.text = string;
event.start = start;
event.end = end;
@@ -39897,7 +40394,7 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1172,7 +1172,7 @@
+@@ -1179,7 +1179,7 @@
index = 0;
}
if (string.length () > 0) {
@@ -39906,10 +40403,10 @@ diff -ur x86/org/eclipse/swt/widgets/Spinner.java x86_64/org/eclipse/swt/widgets
GtkAdjustment adjustment = new GtkAdjustment ();
OS.memmove (adjustment, hAdjustment);
if (adjustment.lower < 0 && string.charAt (0) == '-') index++;
-diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widgets/TabFolder.java
---- x86/org/eclipse/swt/widgets/TabFolder.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TabFolder.java 2009-02-11 17:43:50.000000000 -0500
-@@ -97,8 +97,8 @@
+diff -urN x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widgets/TabFolder.java
+--- x86/org/eclipse/swt/widgets/TabFolder.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TabFolder.java 2009-09-17 08:48:24.000000000 -0400
+@@ -100,8 +100,8 @@
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
@@ -39920,7 +40417,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if ((OS.gtk_rc_style_get_color_flags (rcStyle, 0) & OS.GTK_RC_BG) != 0) return 0;
OS.gtk_widget_realize (handle);
return OS.gtk_widget_get_style (handle);
-@@ -136,7 +136,7 @@
+@@ -139,7 +139,7 @@
addListener(SWT.DefaultSelection,typedListener);
}
@@ -39929,7 +40426,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1 && items [index] != null) {
return items [index].pageHandle;
-@@ -161,7 +161,7 @@
+@@ -164,7 +164,7 @@
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget();
forceResize ();
@@ -39938,7 +40435,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
int clientX = OS.GTK_WIDGET_X (clientHandle);
int clientY = OS.GTK_WIDGET_Y (clientHandle);
x -= clientX;
-@@ -198,7 +198,7 @@
+@@ -201,7 +201,7 @@
}
void createItem (TabItem item, int index) {
@@ -39947,7 +40444,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
int itemCount = 0;
if (list != 0) {
itemCount = OS.g_list_length (list);
-@@ -210,15 +210,15 @@
+@@ -213,15 +213,15 @@
System.arraycopy (items, 0, newItems, 0, items.length);
items = newItems;
}
@@ -39967,7 +40464,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (pageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, SWITCH_PAGE);
OS.gtk_notebook_insert_page (handle, pageHandle, boxHandle, index);
-@@ -280,7 +280,7 @@
+@@ -283,7 +283,7 @@
}
}
@@ -39976,7 +40473,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
return handle;
}
-@@ -302,7 +302,7 @@
+@@ -305,7 +305,7 @@
public TabItem getItem (int index) {
checkWidget();
if (!(0 <= index && index < getItemCount())) error (SWT.ERROR_INVALID_RANGE);
@@ -39985,7 +40482,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (list == 0) error (SWT.ERROR_CANNOT_GET_ITEM);
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -331,7 +331,7 @@
+@@ -334,7 +334,7 @@
public TabItem getItem(Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -39994,7 +40491,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (list == 0) return null;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -355,7 +355,7 @@
+@@ -358,7 +358,7 @@
*/
public int getItemCount () {
checkWidget();
@@ -40003,7 +40500,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -425,11 +425,11 @@
+@@ -428,11 +428,11 @@
return OS.gtk_notebook_get_current_page (handle);
}
@@ -40017,7 +40514,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
int index = OS.gtk_notebook_get_current_page (handle);
if (index != -1) {
Control control = items [index].getControl ();
-@@ -474,7 +474,7 @@
+@@ -477,7 +477,7 @@
public int indexOf (TabItem item) {
checkWidget();
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -40026,7 +40523,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (list == 0) return -1;
int count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -491,7 +491,7 @@
+@@ -494,7 +494,7 @@
Control child = children [i];
int index = 0;
int count = 0;
@@ -40035,7 +40532,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (list != 0) {
count = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -516,7 +516,7 @@
+@@ -519,7 +519,7 @@
boolean mnemonicHit (char key) {
int itemCount = getItemCount ();
for (int i=0; i<itemCount; i++) {
@@ -40044,7 +40541,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -525,7 +525,7 @@
+@@ -528,7 +528,7 @@
boolean mnemonicMatch (char key) {
int itemCount = getItemCount ();
for (int i=0; i<itemCount; i++) {
@@ -40053,7 +40550,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -599,7 +599,7 @@
+@@ -602,7 +602,7 @@
return result;
}
@@ -40062,11 +40559,11 @@ diff -ur x86/org/eclipse/swt/widgets/TabFolder.java x86_64/org/eclipse/swt/widge
super.setFontDescription (font);
TabItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-diff -ur x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets/TabItem.java
---- x86/org/eclipse/swt/widgets/TabItem.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TabItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -33,7 +33,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets/TabItem.java
+--- x86/org/eclipse/swt/widgets/TabItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TabItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -34,7 +34,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TabItem extends Item {
- int /*long*/ labelHandle, imageHandle, pageHandle;
@@ -40074,7 +40571,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets
Control control;
TabFolder parent;
String toolTipText;
-@@ -205,12 +205,12 @@
+@@ -206,12 +206,12 @@
return toolTipText;
}
@@ -40089,7 +40586,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -274,7 +274,7 @@
+@@ -281,7 +281,7 @@
if (oldControl != null) oldControl.setVisible (false);
}
@@ -40098,7 +40595,7 @@ diff -ur x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -297,7 +297,7 @@
+@@ -304,7 +304,7 @@
} else {
imageList.put (imageIndex, image);
}
@@ -40107,11 +40604,11 @@ diff -ur x86/org/eclipse/swt/widgets/TabItem.java x86_64/org/eclipse/swt/widgets
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/widgets/TableColumn.java
---- x86/org/eclipse/swt/widgets/TableColumn.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TableColumn.java 2009-02-11 17:43:50.000000000 -0500
-@@ -35,7 +35,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/widgets/TableColumn.java
+--- x86/org/eclipse/swt/widgets/TableColumn.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TableColumn.java 2009-09-17 08:48:24.000000000 -0400
+@@ -36,7 +36,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TableColumn extends Item {
- int /*long*/ labelHandle, imageHandle, buttonHandle;
@@ -40119,7 +40616,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
Table parent;
int modelIndex, lastButton, lastTime, lastX, lastWidth;
boolean customDraw, useFixedWidth;
-@@ -323,7 +323,7 @@
+@@ -324,7 +324,7 @@
return OS.gtk_tree_view_column_get_width (handle);
}
@@ -40128,7 +40625,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
/*
* There is no API to get a double click on a table column. Normally, when
* the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
-@@ -333,7 +333,7 @@
+@@ -334,7 +334,7 @@
*/
boolean doubleClick = false;
boolean postEvent = true;
@@ -40137,7 +40634,16 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
if (eventPtr != 0) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -365,11 +365,11 @@
+@@ -366,7 +366,7 @@
+ return 0;
+ }
+
+-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ switch (event.type) {
+@@ -382,11 +382,11 @@
return 0;
}
@@ -40151,7 +40657,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
useFixedWidth = false;
int x = OS.GTK_WIDGET_X (widget);
int width = OS.GTK_WIDGET_WIDTH (widget);
-@@ -418,7 +418,7 @@
+@@ -438,7 +438,7 @@
}
}
} else {
@@ -40160,7 +40666,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
do {
width = Math.max (width, parent.calculateWidth (handle, iter));
-@@ -525,7 +525,7 @@
+@@ -545,7 +545,7 @@
parent.createRenderers (handle, modelIndex, index == 0, style);
}
@@ -40169,7 +40675,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -540,7 +540,7 @@
+@@ -560,7 +560,7 @@
}
int imageIndex = headerImageList.indexOf (image);
if (imageIndex == -1) imageIndex = headerImageList.add (image);
@@ -40178,10 +40684,10 @@ diff -ur x86/org/eclipse/swt/widgets/TableColumn.java x86_64/org/eclipse/swt/wid
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widgets/TableItem.java
---- x86/org/eclipse/swt/widgets/TableItem.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TableItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -126,7 +126,7 @@
+diff -urN x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widgets/TableItem.java
+--- x86/org/eclipse/swt/widgets/TableItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TableItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -127,7 +127,7 @@
}
Color _getBackground () {
@@ -40190,7 +40696,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getBackground ();
GdkColor gdkColor = new GdkColor ();
-@@ -137,7 +137,7 @@
+@@ -138,7 +138,7 @@
Color _getBackground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getBackground ();
@@ -40199,7 +40705,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
-@@ -147,13 +147,13 @@
+@@ -148,13 +148,13 @@
}
boolean _getChecked () {
@@ -40215,7 +40721,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.FOREGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getForeground ();
GdkColor gdkColor = new GdkColor ();
-@@ -164,7 +164,7 @@
+@@ -165,7 +165,7 @@
Color _getForeground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getForeground ();
@@ -40224,7 +40730,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_FOREGROUND, ptr, -1);
if (ptr [0] == 0) return _getForeground ();
-@@ -176,7 +176,7 @@
+@@ -177,7 +177,7 @@
Image _getImage (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return null;
@@ -40233,7 +40739,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_PIXBUF, ptr, -1);
if (ptr [0] == 0) return null;
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,7 @@
String _getText (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return "";
@@ -40242,7 +40748,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Table.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return "";
-@@ -268,14 +268,14 @@
+@@ -269,14 +269,14 @@
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -40262,7 +40768,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -356,15 +356,15 @@
+@@ -357,15 +357,15 @@
public Rectangle getBounds (int index) {
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -40281,7 +40787,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -548,18 +548,18 @@
+@@ -549,18 +549,18 @@
public Rectangle getImageBounds (int index) {
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -40304,7 +40810,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
OS.gtk_tree_path_free (path);
-@@ -674,19 +674,19 @@
+@@ -675,19 +675,19 @@
if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
// TODO fully test on early and later versions of GTK
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
@@ -40329,7 +40835,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -734,12 +734,12 @@
+@@ -735,12 +735,12 @@
void redraw () {
if ((OS.GTK_WIDGET_FLAGS (parent.handle) & OS.GTK_REALIZED) != 0) {
@@ -40345,7 +40851,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
rect.x = 0;
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (window, w, h);
-@@ -844,16 +844,16 @@
+@@ -845,16 +845,16 @@
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -40366,7 +40872,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -917,7 +917,7 @@
+@@ -918,7 +918,7 @@
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
@@ -40375,7 +40881,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_list_store_set (parent.modelHandle, handle, Table.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -968,7 +968,7 @@
+@@ -969,7 +969,7 @@
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Table.FIRST_COLUMN : parent.columns [index].modelIndex;
@@ -40384,7 +40890,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_list_store_set (parent.modelHandle, handle, modelIndex + Table.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -986,16 +986,16 @@
+@@ -987,16 +987,16 @@
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -40405,7 +40911,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1091,16 +1091,16 @@
+@@ -1092,16 +1092,16 @@
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -40426,7 +40932,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1133,7 +1133,7 @@
+@@ -1134,7 +1134,7 @@
* GTK+'s "inconsistent" state does not match SWT's concept of grayed.
* Render checked+grayed as "inconsistent", unchecked+grayed as blank.
*/
@@ -40435,7 +40941,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_model_get (parent.modelHandle, handle, Table.CHECKED_COLUMN, ptr, -1);
OS.gtk_list_store_set (parent.modelHandle, handle, Table.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
cached = true;
-@@ -1163,7 +1163,7 @@
+@@ -1164,7 +1164,7 @@
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
@@ -40444,7 +40950,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1191,10 +1191,10 @@
+@@ -1192,10 +1192,10 @@
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
if (image != null) {
@@ -40458,7 +40964,7 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
-@@ -1202,7 +1202,7 @@
+@@ -1203,7 +1203,7 @@
* are relying on the fact that it is done as part of modifying
* the style.
*/
@@ -40467,11 +40973,11 @@ diff -ur x86/org/eclipse/swt/widgets/TableItem.java x86_64/org/eclipse/swt/widge
parent.modifyStyle (parentHandle, style);
}
}
-diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/Table.java
---- x86/org/eclipse/swt/widgets/Table.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Table.java 2009-02-11 17:43:50.000000000 -0500
-@@ -67,9 +67,9 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/Table.java
+--- x86/org/eclipse/swt/widgets/Table.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Table.java 2009-09-17 08:48:24.000000000 -0400
+@@ -68,9 +68,9 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Table extends Composite {
- int /*long*/ modelHandle, checkRenderer;
@@ -40482,7 +40988,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
TableItem [] items;
TableColumn [] columns;
TableItem currentItem;
-@@ -169,9 +169,9 @@
+@@ -170,9 +170,9 @@
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
@@ -40494,7 +41000,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int [] index = new int [1];
OS.memmove (index, OS.gtk_tree_path_get_indices (path), 4);
TableItem item = _getItem (index[0]);
-@@ -222,7 +222,7 @@
+@@ -223,7 +223,7 @@
setData = checkData (item);
}
}
@@ -40503,7 +41009,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (setData) {
ptr [0] = 0;
if (isPixbuf) {
-@@ -331,7 +331,7 @@
+@@ -332,7 +332,7 @@
addListener (SWT.DefaultSelection, typedListener);
}
@@ -40512,7 +41018,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
-@@ -347,11 +347,11 @@
+@@ -348,11 +348,11 @@
int [] w = new int [1];
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
@@ -40527,7 +41033,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -519,18 +519,18 @@
+@@ -524,18 +524,18 @@
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -40552,7 +41058,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
for (int j=0; j<modelLength; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -548,7 +548,7 @@
+@@ -553,7 +553,7 @@
modelHandle = newModel;
}
}
@@ -40561,7 +41067,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TableColumn checkColumn = columns [0];
-@@ -605,7 +605,7 @@
+@@ -610,7 +610,7 @@
OS.gtk_fixed_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -40570,7 +41076,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
modelHandle = OS.gtk_list_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -620,7 +620,7 @@
+@@ -625,7 +625,7 @@
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -40579,7 +41085,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -664,11 +664,11 @@
+@@ -669,11 +669,11 @@
} else {
createColumn (column, index);
}
@@ -40594,7 +41100,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -677,7 +677,7 @@
+@@ -682,7 +682,7 @@
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -40603,7 +41109,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -734,7 +734,7 @@
+@@ -748,7 +748,7 @@
items [index] = item;
}
@@ -40612,7 +41118,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -757,9 +757,9 @@
+@@ -771,9 +771,9 @@
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -40624,7 +41130,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -862,7 +862,7 @@
+@@ -877,7 +877,7 @@
checkWidget();
if (index < 0 || index >= itemCount) return;
boolean fixColumn = showFirstColumn ();
@@ -40633,7 +41139,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, _getItem (index).handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -887,7 +887,7 @@
+@@ -902,7 +902,7 @@
public void deselect (int start, int end) {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -40642,7 +41148,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int index=start; index<=end; index++) {
if (index < 0 || index >= itemCount) continue;
-@@ -918,7 +918,7 @@
+@@ -933,7 +933,7 @@
checkWidget();
if (indices == null) error (SWT.ERROR_NULL_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -40651,7 +41157,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<indices.length; i++) {
int index = indices[i];
-@@ -940,7 +940,7 @@
+@@ -955,7 +955,7 @@
public void deselectAll () {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -40660,7 +41166,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -954,7 +954,7 @@
+@@ -969,7 +969,7 @@
index++;
}
if (index == columnCount) return;
@@ -40669,7 +41175,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -962,18 +962,18 @@
+@@ -977,18 +977,18 @@
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -40694,7 +41200,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
for (int j=0; j<FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_list_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -1004,7 +1004,7 @@
+@@ -1019,7 +1019,7 @@
for (int i=0; i<itemCount; i++) {
TableItem item = items [i];
if (item != null) {
@@ -40703,7 +41209,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int modelIndex = column.modelIndex;
OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
OS.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1061,7 +1061,7 @@
+@@ -1076,7 +1076,7 @@
index++;
}
if (index == itemCount) return;
@@ -40712,7 +41218,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1073,10 +1073,10 @@
+@@ -1088,10 +1088,10 @@
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -40725,7 +41231,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1089,7 +1089,7 @@
+@@ -1104,7 +1104,7 @@
return dragDetect;
}
@@ -40734,7 +41240,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
return paintWindow ();
}
-@@ -1112,13 +1112,13 @@
+@@ -1142,13 +1142,13 @@
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -40751,7 +41257,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1183,8 +1183,8 @@
+@@ -1213,8 +1213,8 @@
return columnCount;
}
@@ -40762,7 +41268,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
// per row data
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1233,13 +1233,13 @@
+@@ -1263,13 +1263,13 @@
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -40779,7 +41285,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1289,11 +1289,11 @@
+@@ -1319,11 +1319,11 @@
}
TableItem getFocusItem () {
@@ -40793,7 +41299,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -1341,7 +1341,7 @@
+@@ -1371,7 +1371,7 @@
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -40802,7 +41308,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1350,8 +1350,8 @@
+@@ -1380,8 +1380,8 @@
return height;
}
OS.gtk_widget_realize (handle);
@@ -40813,7 +41319,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1428,11 +1428,11 @@
+@@ -1458,11 +1458,11 @@
public TableItem getItem (Point point) {
checkWidget();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -40827,7 +41333,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
TableItem item = null;
if (indices != 0) {
int [] index = new int [1];
-@@ -1472,7 +1472,7 @@
+@@ -1502,7 +1502,7 @@
public int getItemHeight () {
checkWidget();
if (itemCount == 0) {
@@ -40836,7 +41342,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1480,11 +1480,11 @@
+@@ -1510,11 +1510,11 @@
return h [0];
} else {
int height = 0;
@@ -40850,7 +41356,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1546,14 +1546,14 @@
+@@ -1577,14 +1577,14 @@
return OS.gtk_tree_view_get_rules_hint (handle);
}
@@ -40869,7 +41375,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1582,7 +1582,7 @@
+@@ -1613,7 +1613,7 @@
*/
public TableItem [] getSelection () {
checkWidget();
@@ -40878,7 +41384,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
-@@ -1596,15 +1596,15 @@
+@@ -1627,15 +1627,15 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -40898,7 +41404,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1632,7 +1632,7 @@
+@@ -1663,7 +1663,7 @@
*/
public int getSelectionCount () {
checkWidget();
@@ -40907,7 +41413,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -1658,25 +1658,25 @@
+@@ -1689,25 +1689,25 @@
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
@@ -40939,7 +41445,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
OS.memmove (index, indices, 4);
break;
-@@ -1706,7 +1706,7 @@
+@@ -1737,7 +1737,7 @@
*/
public int [] getSelectionIndices () {
checkWidget();
@@ -40948,7 +41454,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [itemCount];
-@@ -1721,15 +1721,15 @@
+@@ -1752,15 +1752,15 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -40968,7 +41474,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1787,14 +1787,14 @@
+@@ -1818,14 +1818,14 @@
return sortDirection;
}
@@ -40987,7 +41493,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1819,22 +1819,22 @@
+@@ -1850,22 +1850,22 @@
*/
public int getTopIndex () {
checkWidget();
@@ -41014,7 +41520,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select table view, when multiple items are already
-@@ -1846,10 +1846,10 @@
+@@ -1877,10 +1877,10 @@
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -41027,7 +41533,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1864,10 +1864,10 @@
+@@ -1895,10 +1895,10 @@
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -41040,7 +41546,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1887,13 +1887,13 @@
+@@ -1918,13 +1918,13 @@
return result;
}
@@ -41057,7 +41563,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
TableItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1903,8 +1903,8 @@
+@@ -1934,8 +1934,8 @@
return 0;
}
@@ -41068,7 +41574,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -1928,8 +1928,8 @@
+@@ -1959,8 +1959,8 @@
return result;
}
@@ -41079,7 +41585,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -1942,15 +1942,15 @@
+@@ -1973,15 +1973,15 @@
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -41099,7 +41605,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int [] index = new int []{-1};
OS.memmove (index, indices, 4);
-@@ -1962,10 +1962,10 @@
+@@ -2007,10 +2007,10 @@
return 0;
}
@@ -41113,7 +41619,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -1980,7 +1980,7 @@
+@@ -2025,7 +2025,7 @@
return 0;
}
@@ -41122,7 +41628,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -1991,17 +1991,17 @@
+@@ -2036,17 +2036,17 @@
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -41143,7 +41649,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2014,13 +2014,13 @@
+@@ -2059,13 +2059,13 @@
}
void hideFirstColumn () {
@@ -41159,7 +41665,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
if (checkRenderer != 0) {
-@@ -2106,9 +2106,9 @@
+@@ -2155,9 +2155,9 @@
*/
public boolean isSelected (int index) {
checkWidget();
@@ -41171,7 +41677,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
boolean answer = OS.gtk_tree_selection_path_is_selected (selection, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -2116,7 +2116,7 @@
+@@ -2165,7 +2165,7 @@
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -41180,7 +41686,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2124,13 +2124,13 @@
+@@ -2173,13 +2173,13 @@
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -41196,7 +41702,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2219,7 +2219,7 @@
+@@ -2269,7 +2269,7 @@
public void remove (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) error (SWT.ERROR_ITEM_NOT_REMOVED);
@@ -41205,7 +41711,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
TableItem item = items [index];
boolean disposed = false;
if (item != null) {
-@@ -2232,7 +2232,7 @@
+@@ -2282,7 +2282,7 @@
OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
}
if (!disposed) {
@@ -41214,7 +41720,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, iter);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2264,8 +2264,8 @@
+@@ -2314,8 +2314,8 @@
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -41222,10 +41728,10 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, start);
- int index = start;
- while (index <= end) {
-@@ -2308,9 +2308,9 @@
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+@@ -2367,9 +2367,9 @@
if (!(0 <= start && start <= end && end < itemCount)) {
error (SWT.ERROR_INVALID_RANGE);
}
@@ -41234,19 +41740,19 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int last = -1;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- for (int i=0; i<newIndices.length; i++) {
- int index = newIndices [i];
- if (index != last) {
-@@ -2356,7 +2356,7 @@
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+@@ -2423,7 +2423,7 @@
}
items = new TableItem [4];
itemCount = 0;
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
- OS.gtk_list_store_clear (modelHandle);
- OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2411,16 +2411,16 @@
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+@@ -2485,16 +2485,16 @@
eventTable.unhook (SWT.DefaultSelection,listener);
}
@@ -41268,7 +41774,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int [] buffer = new int [1];
OS.memmove (buffer, OS.gtk_tree_path_get_indices (path), 4);
int index = buffer [0];
-@@ -2430,7 +2430,7 @@
+@@ -2504,7 +2504,7 @@
if (item != null) {
int columnIndex = 0;
if (columnCount > 0) {
@@ -41277,7 +41783,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2469,18 +2469,18 @@
+@@ -2543,18 +2543,18 @@
return result;
}
@@ -41300,7 +41806,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2494,7 +2494,7 @@
+@@ -2568,7 +2568,7 @@
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
@@ -41309,7 +41815,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_model_get (modelHandle, item.handle, Table.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Table.FIRST_COLUMN : columns [columnIndex].modelIndex;
-@@ -2505,7 +2505,7 @@
+@@ -2579,7 +2579,7 @@
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -41318,7 +41824,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2549,7 +2549,7 @@
+@@ -2623,7 +2623,7 @@
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
@@ -41327,7 +41833,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2560,7 +2560,7 @@
+@@ -2634,7 +2634,7 @@
}
}
}
@@ -41336,7 +41842,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2570,7 +2570,7 @@
+@@ -2644,7 +2644,7 @@
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -41345,7 +41851,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2582,7 +2582,7 @@
+@@ -2656,7 +2656,7 @@
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
@@ -41354,7 +41860,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
ignoreSize = true;
-@@ -2633,8 +2633,8 @@
+@@ -2707,8 +2707,8 @@
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -41365,7 +41871,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2658,12 +2658,12 @@
+@@ -2732,12 +2732,12 @@
checkWidget();
if (!(0 <= index && index < itemCount)) return;
boolean fixColumn = showFirstColumn ();
@@ -41380,7 +41886,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2701,13 +2701,13 @@
+@@ -2775,13 +2775,13 @@
start = Math.max (0, start);
end = Math.min (end, itemCount - 1);
boolean fixColumn = showFirstColumn ();
@@ -41396,7 +41902,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2745,7 +2745,7 @@
+@@ -2819,7 +2819,7 @@
int length = indices.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -41405,7 +41911,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
for (int i=0; i<length; i++) {
int index = indices [i];
-@@ -2753,7 +2753,7 @@
+@@ -2827,7 +2827,7 @@
TableItem item = _getItem (index);
OS.gtk_tree_selection_select_iter (selection, item.handle);
if ((style & SWT.SINGLE) != 0) {
@@ -41414,7 +41920,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
OS.gtk_tree_path_free (path);
}
-@@ -2777,7 +2777,7 @@
+@@ -2851,7 +2851,7 @@
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -41423,7 +41929,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2792,8 +2792,8 @@
+@@ -2866,8 +2866,8 @@
*/
if (!(0 <= index && index < itemCount)) return;
TableItem item = _getItem (index);
@@ -41434,7 +41940,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
/*
-@@ -2815,9 +2815,9 @@
+@@ -2889,9 +2889,9 @@
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -41446,7 +41952,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);
}
-@@ -2881,13 +2881,13 @@
+@@ -2955,13 +2955,13 @@
seen [index] = true;
}
for (int i=0; i<order.length; i++) {
@@ -41463,16 +41969,16 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
super.setFontDescription (font);
TableColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -2942,7 +2942,7 @@
+@@ -3016,7 +3016,7 @@
System.arraycopy (items, 0, newItems, 0, itemCount);
items = newItems;
if (isVirtual) {
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
- for (int i=itemCount; i<count; i++) {
- OS.gtk_list_store_append (modelHandle, iter);
-@@ -2980,12 +2980,12 @@
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+@@ -3065,12 +3065,12 @@
void setParentBackground () {
super.setParentBackground ();
@@ -41488,7 +41994,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_widget_set_parent_window (widget, window);
}
-@@ -3003,7 +3003,7 @@
+@@ -3088,7 +3088,7 @@
}
}
@@ -41497,7 +42003,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (columnCount != 0 || currentItem == item) return;
/*
* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2
-@@ -3260,7 +3260,7 @@
+@@ -3345,7 +3345,7 @@
public void setTopIndex (int index) {
checkWidget();
if (!(0 <= index && index < itemCount)) return;
@@ -41506,7 +42012,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
/*
-@@ -3334,10 +3334,10 @@
+@@ -3419,10 +3419,10 @@
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -41519,7 +42025,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3368,8 +3368,8 @@
+@@ -3453,8 +3453,8 @@
showItem (item.handle);
}
@@ -41530,7 +42036,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
/*
* This code intentionally commented.
* Bug in GTK. According to the documentation, gtk_tree_view_scroll_to_cell
-@@ -3422,9 +3422,9 @@
+@@ -3507,9 +3507,9 @@
showItem (item.handle);
}
@@ -41542,7 +42048,7 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (indices != 0) {
int [] index = new int [1];
OS.memmove (index, indices, 4);
-@@ -3443,12 +3443,12 @@
+@@ -3528,12 +3528,12 @@
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -41559,11 +42065,11 @@ diff -ur x86/org/eclipse/swt/widgets/Table.java x86_64/org/eclipse/swt/widgets/T
if (widget != 0) OS.gtk_widget_queue_resize (widget);
temp = OS.g_list_next (temp);
}
-diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Text.java
---- x86/org/eclipse/swt/widgets/Text.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Text.java 2009-02-11 17:43:50.000000000 -0500
-@@ -46,9 +46,9 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Text.java
+--- x86/org/eclipse/swt/widgets/Text.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Text.java 2009-09-17 08:48:24.000000000 -0400
+@@ -56,9 +56,9 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Text extends Scrollable {
- int /*long*/ bufferHandle;
@@ -41574,7 +42080,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
int fixStart = -1, fixEnd = -1;
boolean doubleClick;
String message = "";
-@@ -299,7 +299,7 @@
+@@ -325,7 +325,7 @@
OS.gtk_text_buffer_get_end_iter (bufferHandle, position);
OS.gtk_text_buffer_insert (bufferHandle, position, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -41583,7 +42089,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -319,8 +319,8 @@
+@@ -345,8 +345,8 @@
OS.gtk_editable_select_region (handle, position, position);
} else {
byte [] position = new byte [ITER_SIZEOF];
@@ -41594,7 +42100,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, insertMark);
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, position);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, position);
-@@ -334,13 +334,13 @@
+@@ -360,13 +360,13 @@
int[] w = new int [1], h = new int [1];
if ((style & SWT.SINGLE) != 0) {
OS.gtk_widget_realize (handle);
@@ -41611,7 +42117,16 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.g_free (text);
OS.pango_layout_set_width (layout, wHint * OS.PANGO_SCALE);
OS.pango_layout_get_size (layout, w, h);
-@@ -369,7 +369,7 @@
+@@ -376,7 +376,7 @@
+ int height = OS.PANGO_PIXELS (h [0]);
+ if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
+- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
++ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+ OS.pango_layout_get_size (layout, w, h);
+ OS.g_object_unref (layout);
+ width = Math.max (width, OS.PANGO_PIXELS (w [0]));
+@@ -395,7 +395,7 @@
int xborder = 0, yborder = 0;
if ((style & SWT.SINGLE) != 0) {
if ((style & SWT.BORDER) != 0) {
@@ -41620,7 +42135,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
}
-@@ -410,7 +410,7 @@
+@@ -440,7 +440,7 @@
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_copy_clipboard (handle);
} else {
@@ -41629,7 +42144,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_copy_clipboard (bufferHandle, clipboard);
}
}
-@@ -432,7 +432,7 @@
+@@ -462,7 +462,7 @@
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_cut_clipboard (handle);
} else {
@@ -41638,7 +42153,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_cut_clipboard (bufferHandle, clipboard, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -440,7 +440,7 @@
+@@ -470,7 +470,7 @@
void deregister () {
super.deregister ();
if (bufferHandle != 0) display.removeWidget (bufferHandle);
@@ -41647,7 +42162,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (imContext != 0) display.removeWidget (imContext);
}
-@@ -468,9 +468,9 @@
+@@ -498,9 +498,9 @@
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -41659,7 +42174,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
-@@ -489,15 +489,15 @@
+@@ -519,15 +519,15 @@
return super.dragDetect (x, y, filter, consume);
}
@@ -41678,7 +42193,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (imContext != 0) {
return OS.gtk_im_context_filter_keypress (imContext, event);
}
-@@ -516,7 +516,7 @@
+@@ -546,7 +546,7 @@
* filter has to be called by SWT.
*/
if (gdkEventKey != 0 && gdkEventKey != -1) {
@@ -41687,7 +42202,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (imContext != 0) {
OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
gdkEventKey = -1;
-@@ -533,7 +533,7 @@
+@@ -563,7 +563,7 @@
public int getBorderWidth () {
checkWidget();
if ((style & SWT.MULTI) != 0) return super.getBorderWidth ();
@@ -41696,16 +42211,16 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if ((this.style & SWT.BORDER) != 0) {
return OS.gtk_style_get_xthickness (style);
}
-@@ -557,7 +557,7 @@
+@@ -587,7 +587,7 @@
checkWidget ();
- if ((style & SWT.SINGLE) != 0) return 1;
+ if ((style & SWT.SINGLE) != 0) return 0;
byte [] position = new byte [ITER_SIZEOF];
- int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
+ long /*int*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_line (position);
}
-@@ -585,7 +585,7 @@
+@@ -615,7 +615,7 @@
}
int [] offset_x = new int [1], offset_y = new int [1];
OS.gtk_entry_get_layout_offsets (handle, offset_x, offset_y);
@@ -41714,7 +42229,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
PangoRectangle pos = new PangoRectangle ();
OS.pango_layout_index_to_pos (layout, index, pos);
int x = offset_x [0] + OS.PANGO_PIXELS (pos.x) - getBorderWidth ();
-@@ -593,7 +593,7 @@
+@@ -623,7 +623,7 @@
return new Point (x, y);
}
byte [] position = new byte [ITER_SIZEOF];
@@ -41723,7 +42238,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_text_view_get_iter_location (handle, position, rect);
-@@ -622,7 +622,7 @@
+@@ -652,7 +652,7 @@
return OS.gtk_editable_get_position (handle);
}
byte [] position = new byte [ITER_SIZEOF];
@@ -41732,7 +42247,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
return OS.gtk_text_iter_get_offset (position);
}
-@@ -640,7 +640,7 @@
+@@ -670,7 +670,7 @@
public int getCharCount () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) {
@@ -41741,7 +42256,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
return (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
return OS.gtk_text_buffer_get_char_count (bufferHandle);
-@@ -812,9 +812,9 @@
+@@ -839,9 +839,9 @@
if ((style & SWT.SINGLE) != 0) {
int [] index = new int [1];
int [] trailing = new int [1];
@@ -41753,7 +42268,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
position = (int)/*64*/OS.g_utf8_pointer_to_offset (ptr, ptr + index[0]) + trailing[0];
} else {
byte [] p = new byte [ITER_SIZEOF];
-@@ -910,7 +910,7 @@
+@@ -937,7 +937,7 @@
int getTabWidth (int tabs) {
byte[] buffer = Converter.wcsToMbcs(null, " ", true);
@@ -41762,7 +42277,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
int [] width = new int [1];
int [] height = new int [1];
OS.pango_layout_get_size (layout, width, height);
-@@ -934,7 +934,7 @@
+@@ -961,7 +961,7 @@
*/
public String getText () {
checkWidget ();
@@ -41771,16 +42286,16 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if ((style & SWT.SINGLE) != 0) {
address = OS.gtk_entry_get_text (handle);
} else {
-@@ -973,7 +973,7 @@
+@@ -999,7 +999,7 @@
+ public String getText (int start, int end) {
checkWidget ();
if (!(start <= end && 0 <= end)) return "";
- start = Math.max (0, start);
- int /*long*/ address;
+ long /*int*/ address;
if ((style & SWT.SINGLE) != 0) {
+ start = Math.max (0, start);
address = OS.gtk_editable_get_chars (handle, start, end + 1);
- } else {
-@@ -1071,13 +1071,13 @@
+@@ -1100,13 +1100,13 @@
return lineTop [0];
}
@@ -41797,7 +42312,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (result != 0) return result;
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
-@@ -1092,7 +1092,7 @@
+@@ -1121,7 +1121,7 @@
}
@@ -41806,7 +42321,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
/*
* Feature in GTK. When the user types, GTK positions
* the caret after sending the changed signal. This
-@@ -1101,7 +1101,7 @@
+@@ -1130,7 +1130,7 @@
* is to post the modify event when the user is typing.
*/
boolean keyPress = false;
@@ -41815,7 +42330,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-@@ -1120,7 +1120,7 @@
+@@ -1149,7 +1149,7 @@
return 0;
}
@@ -41824,7 +42339,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (text == 0) return 0;
if ((style & SWT.SINGLE) != 0) {
if (!OS.gtk_editable_get_editable (handle)) return 0;
-@@ -1162,7 +1162,7 @@
+@@ -1191,7 +1191,7 @@
return 0;
}
@@ -41833,7 +42348,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
-@@ -1198,7 +1198,7 @@
+@@ -1227,7 +1227,7 @@
return 0;
}
@@ -41842,7 +42357,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
String newText = verifyText ("", (int)/*64*/start_pos, (int)/*64*/end_pos);
if (newText == null) {
-@@ -1226,7 +1226,7 @@
+@@ -1255,7 +1255,7 @@
return 0;
}
@@ -41851,7 +42366,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (cursor != null) setCursor (cursor.handle);
/*
* Feature in GTK. The gtk-entry-select-on-focus property is a global
-@@ -1242,7 +1242,7 @@
+@@ -1271,7 +1271,7 @@
GdkEventFocus gdkEventFocus = new GdkEventFocus ();
OS.memmove (gdkEventFocus, gdkEvent, GdkEventFocus.sizeof);
if (gdkEventFocus.in == 0) {
@@ -41860,10 +42375,60 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.g_object_set (settings, OS.gtk_entry_select_on_focus, true, 0);
}
break;
-@@ -1251,13 +1251,13 @@
+@@ -1280,29 +1280,29 @@
return super.gtk_event_after (widget, gdkEvent);
}
+-int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
++long /*int*/ gtk_expose_event (long /*int*/ widget, long /*int*/ event) {
+ if ((state & OBSCURED) != 0) return 0;
+- int /*long*/ result = super.gtk_expose_event (widget, event);
++ long /*int*/ result = super.gtk_expose_event (widget, event);
+ if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
+- int /*long*/ str = OS.gtk_entry_get_text (handle);
++ long /*int*/ str = OS.gtk_entry_get_text (handle);
+ if (!OS.GTK_WIDGET_HAS_FOCUS (handle) && OS.strlen (str) == 0) {
+ GdkEventExpose gdkEvent = new GdkEventExpose ();
+ OS.memmove (gdkEvent, event, GdkEventExpose.sizeof);
+- int /*long*/ window = paintWindow ();
++ long /*int*/ window = paintWindow ();
+ int [] w = new int [1], h = new int [1];
+ OS.gdk_drawable_get_size (window, w, h);
+ GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
+ int width = w [0] - innerBorder.left - innerBorder.right;
+ int height = h [0] - innerBorder.top - innerBorder.bottom;
+- int /*long*/ context = OS.gtk_widget_get_pango_context (handle);
+- int /*long*/ lang = OS.pango_context_get_language (context);
+- int /*long*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);
++ long /*int*/ context = OS.gtk_widget_get_pango_context (handle);
++ long /*int*/ lang = OS.pango_context_get_language (context);
++ long /*int*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);
+ int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
+ int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
+ OS.pango_font_metrics_unref (metrics);
+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
+- int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+- int /*long*/ line = OS.pango_layout_get_line (layout, 0);
++ long /*int*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
++ long /*int*/ line = OS.pango_layout_get_line (layout, 0);
+ PangoRectangle rect = new PangoRectangle ();
+ OS.pango_layout_line_get_extents (line, null, rect);
+ rect.y = OS.PANGO_PIXELS (rect.y);
+@@ -1325,8 +1325,8 @@
+ case SWT.CENTER: x = (width - rect.width) / 2; break;
+ case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;
+ }
+- int /*long*/ gc = OS.gdk_gc_new (window);
+- int /*long*/ style = OS.gtk_widget_get_style (handle);
++ long /*int*/ gc = OS.gdk_gc_new (window);
++ long /*int*/ style = OS.gtk_widget_get_style (handle);
+ GdkColor textColor = new GdkColor ();
+ OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
+ GdkColor baseColor = new GdkColor ();
+@@ -1339,13 +1339,13 @@
+ return result;
+ }
+
-int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_focus_out_event (long /*int*/ widget, long /*int*/ event) {
fixIM ();
@@ -41877,7 +42442,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
/*
* Feature in GTK. GtkEntry widgets select their text on focus in,
* clearing the previous selection. This behavior is controlled by
-@@ -1266,13 +1266,13 @@
+@@ -1354,13 +1354,13 @@
* the entry has done focus in processing.
*/
if ((style & SWT.SINGLE) != 0 && display.entrySelectOnFocus) {
@@ -41893,7 +42458,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
if (new_text == 0 || new_text_length == 0) return 0;
byte [] buffer = new byte [(int)/*64*/new_text_length];
-@@ -1281,7 +1281,7 @@
+@@ -1369,7 +1369,7 @@
int [] pos = new int [1];
OS.memmove (pos, position, 4);
if (pos [0] == -1) {
@@ -41902,7 +42467,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
pos [0] = (int)/*64*/OS.g_utf8_strlen (ptr, -1);
}
/* Use the selection when the text was deleted */
-@@ -1320,15 +1320,15 @@
+@@ -1408,15 +1408,15 @@
return 0;
}
@@ -41921,7 +42486,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if ((style & SWT.RIGHT_TO_LEFT) != 0) {
OS.gtk_widget_set_direction (menu, OS.GTK_TEXT_DIR_RTL);
OS.gtk_container_forall (menu, display.setDirectionProc, OS.GTK_TEXT_DIR_RTL);
-@@ -1336,7 +1336,7 @@
+@@ -1424,7 +1424,7 @@
return 0;
}
@@ -41930,7 +42495,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
byte [] position = new byte [ITER_SIZEOF];
OS.memmove (position, iter, position.length);
-@@ -1380,7 +1380,7 @@
+@@ -1468,7 +1468,7 @@
OS.g_signal_connect_closure (bufferHandle, OS.delete_range, display.closures [DELETE_RANGE], false);
OS.g_signal_connect_closure (handle, OS.populate_popup, display.closures [POPULATE_POPUP], false);
}
@@ -41939,7 +42504,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (imContext != 0) {
OS.g_signal_connect_closure (imContext, OS.commit, display.closures [COMMIT], false);
int id = OS.g_signal_lookup (OS.commit, OS.gtk_im_context_get_type ());
-@@ -1389,7 +1389,7 @@
+@@ -1477,7 +1477,7 @@
}
}
@@ -41948,7 +42513,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if ((style & SWT.SINGLE) != 0) {
return OS.gtk_editable_get_editable (handle) ? OS.GTK_ENTRY_IM_CONTEXT (handle) : 0;
}
-@@ -1430,15 +1430,15 @@
+@@ -1518,15 +1518,15 @@
}
OS.gtk_text_buffer_insert (bufferHandle, start, buffer, buffer.length);
OS.gtk_text_buffer_place_cursor (bufferHandle, start);
@@ -41968,7 +42533,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (children != 0) window = OS.g_list_data (children);
OS.g_list_free (children);
return window;
-@@ -1464,7 +1464,7 @@
+@@ -1552,7 +1552,7 @@
if ((style & SWT.SINGLE) != 0) {
OS.gtk_editable_paste_clipboard (handle);
} else {
@@ -41977,7 +42542,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -1472,7 +1472,7 @@
+@@ -1560,7 +1560,7 @@
void register () {
super.register ();
if (bufferHandle != 0) display.addWidget (bufferHandle, this);
@@ -41986,7 +42551,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (imContext != 0) display.addWidget (imContext, this);
}
-@@ -1487,7 +1487,7 @@
+@@ -1575,7 +1575,7 @@
* it around until ownership of the clipboard is lost.
*/
if ((style & SWT.MULTI) != 0) {
@@ -41995,7 +42560,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_paste_clipboard (bufferHandle, clipboard, null, OS.gtk_text_view_get_editable (handle));
}
}
-@@ -1584,8 +1584,8 @@
+@@ -1672,8 +1672,8 @@
byte [] end = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, start, 0);
OS.gtk_text_buffer_get_end_iter (bufferHandle, end);
@@ -42006,7 +42571,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, start);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, end);
}
-@@ -1596,8 +1596,8 @@
+@@ -1684,8 +1684,8 @@
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -42017,7 +42582,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (cursor == 0) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);
super.setCursor (cursor != 0 ? cursor : defaultCursor);
if (cursor == 0) OS.gdk_cursor_destroy (defaultCursor);
-@@ -1676,7 +1676,7 @@
+@@ -1764,7 +1764,7 @@
}
}
@@ -42026,7 +42591,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
super.setFontDescription (font);
setTabStops (tabs);
}
-@@ -1761,7 +1761,7 @@
+@@ -1847,7 +1847,7 @@
byte [] position = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, start);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -42035,7 +42600,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
}
-@@ -1801,8 +1801,8 @@
+@@ -1887,8 +1887,8 @@
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, endIter, end);
@@ -42046,7 +42611,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_buffer_move_mark (bufferHandle, selectionMark, startIter);
OS.gtk_text_buffer_move_mark (bufferHandle, insertMark, endIter);
}
-@@ -1868,7 +1868,7 @@
+@@ -1954,7 +1954,7 @@
void setTabStops (int tabs) {
if ((style & SWT.SINGLE) != 0) return;
int tabWidth = getTabWidth (tabs);
@@ -42055,7 +42620,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.pango_tab_array_set_tab (tabArray, 0, OS.PANGO_TAB_LEFT, tabWidth);
OS.gtk_text_view_set_tabs (handle, tabArray);
OS.pango_tab_array_free (tabArray);
-@@ -1922,7 +1922,7 @@
+@@ -2008,7 +2008,7 @@
OS.g_signal_handlers_unblock_matched (bufferHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEXT_BUFFER_INSERT_TEXT);
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, position, 0);
OS.gtk_text_buffer_place_cursor (bufferHandle, position);
@@ -42064,7 +42629,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
}
sendEvent (SWT.Modify);
-@@ -1994,7 +1994,7 @@
+@@ -2080,7 +2080,7 @@
public void showSelection () {
checkWidget ();
if ((style & SWT.SINGLE) != 0) return;
@@ -42073,7 +42638,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_view_scroll_mark_onscreen (handle, mark);
-@@ -2005,9 +2005,9 @@
+@@ -2091,9 +2091,9 @@
switch (key) {
case OS.GDK_KP_Enter:
case OS.GDK_Return: {
@@ -42085,7 +42650,7 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
OS.gtk_im_context_get_preedit_string (imContext, preeditString, null, null);
if (preeditString [0] != 0) {
int length = OS.strlen (preeditString [0]);
-@@ -2041,7 +2041,7 @@
+@@ -2127,7 +2127,7 @@
event.text = string;
event.start = start;
event.end = end;
@@ -42094,11 +42659,11 @@ diff -ur x86/org/eclipse/swt/widgets/Text.java x86_64/org/eclipse/swt/widgets/Te
if (eventPtr != 0) {
GdkEventKey gdkEvent = new GdkEventKey ();
OS.memmove (gdkEvent, eventPtr, GdkEventKey.sizeof);
-diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets/ToolBar.java
---- x86/org/eclipse/swt/widgets/ToolBar.java 2009-06-24 21:13:56.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ToolBar.java 2009-02-11 17:43:50.000000000 -0500
-@@ -142,11 +142,11 @@
- return computeNativeSize (handle, wHint, hHint, changed);
+diff -urN x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets/ToolBar.java
+--- x86/org/eclipse/swt/widgets/ToolBar.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ToolBar.java 2009-09-17 08:48:24.000000000 -0400
+@@ -188,11 +188,11 @@
+ return result;
}
-int /*long*/ eventHandle () {
@@ -42111,7 +42676,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
return handle;
}
-@@ -164,7 +164,7 @@
+@@ -210,7 +210,7 @@
}
}
@@ -42120,7 +42685,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
if (lastFocus != null && lastFocus.setFocus ()) return true;
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-@@ -233,7 +233,7 @@
+@@ -279,7 +279,7 @@
*/
public int getItemCount () {
checkWidget();
@@ -42129,23 +42694,24 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
if (list == 0) return 0;
int itemCount = OS.g_list_length (list);
OS.g_list_free (list);
-@@ -258,12 +258,12 @@
- */
- public ToolItem [] getItems () {
- checkWidget();
+@@ -308,13 +308,13 @@
+ }
+
+ ToolItem [] _getItems () {
- int /*long*/ list = OS.gtk_container_get_children (handle);
+ long /*int*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return new ToolItem [0];
int count = OS.g_list_length (list);
- ToolItem [] result = new ToolItem [count];
+ ToolItem [] items = new ToolItem [count];
+ int index = 0;
for (int i=0; i<count; i++) {
- int /*long*/ data = OS.g_list_nth_data (list, i);
+ long /*int*/ data = OS.g_list_nth_data (list, i);
Widget widget = display.getWidget (data);
- result [i] = (ToolItem) widget;
+ if (widget != null) items [index++] = (ToolItem) widget;
}
-@@ -290,9 +290,9 @@
- return 1;
+@@ -364,9 +364,9 @@
+ return tabItemList;
}
-int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
@@ -42156,7 +42722,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
if (result != 0) return result;
ToolItem [] items = getItems ();
int length = items.length;
-@@ -313,7 +313,7 @@
+@@ -387,7 +387,7 @@
if ((item.style & SWT.DROP_DOWN) != 0) {
Event event = new Event ();
event.detail = SWT.ARROW;
@@ -42165,7 +42731,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
event.x = OS.GTK_WIDGET_X (topHandle);
event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);
if ((style & SWT.MIRRORED) != 0) event.x = getClientWidth() - OS.GTK_WIDGET_WIDTH(topHandle) - event.x;
-@@ -375,7 +375,7 @@
+@@ -449,7 +449,7 @@
boolean mnemonicHit (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -42174,7 +42740,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -384,7 +384,7 @@
+@@ -458,7 +458,7 @@
boolean mnemonicMatch (char key) {
ToolItem [] items = getItems ();
for (int i=0; i<items.length; i++) {
@@ -42183,7 +42749,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
if (labelHandle != 0 && mnemonicMatch (labelHandle, key)) return true;
}
return false;
-@@ -430,7 +430,7 @@
+@@ -504,7 +504,7 @@
return result;
}
@@ -42192,11 +42758,11 @@ diff -ur x86/org/eclipse/swt/widgets/ToolBar.java x86_64/org/eclipse/swt/widgets
super.setFontDescription (font);
ToolItem [] items = getItems ();
for (int i = 0; i < items.length; i++) {
-diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widgets/ToolItem.java
---- x86/org/eclipse/swt/widgets/ToolItem.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ToolItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -37,7 +37,7 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widgets/ToolItem.java
+--- x86/org/eclipse/swt/widgets/ToolItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ToolItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -38,7 +38,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ToolItem extends Item {
- int /*long*/ boxHandle, arrowHandle, arrowBoxHandle, separatorHandle, labelHandle, imageHandle;
@@ -42204,7 +42770,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
ToolBar parent;
Control control;
Image hotImage, disabledImage;
-@@ -245,11 +245,11 @@
+@@ -246,11 +246,11 @@
}
OS.GTK_WIDGET_UNSET_FLAGS (handle, OS.GTK_CAN_FOCUS);
// This code is intentionally commented.
@@ -42219,7 +42785,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
// setForegroundColor (color);
// setFontDescription (font);
if ((parent.state & FOREGROUND) != 0) {
-@@ -292,7 +292,7 @@
+@@ -306,7 +306,7 @@
public Rectangle getBounds () {
checkWidget();
parent.forceResize ();
@@ -42228,7 +42794,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
int x, y, width, height;
/*
* Bug in GTK. Toolbar items are only allocated their minimum size
-@@ -381,7 +381,7 @@
+@@ -395,7 +395,7 @@
*/
public boolean getEnabled () {
checkWidget();
@@ -42237,7 +42803,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
return OS.GTK_WIDGET_SENSITIVE (topHandle);
}
-@@ -471,11 +471,11 @@
+@@ -485,11 +485,11 @@
public int getWidth () {
checkWidget();
parent.forceResize ();
@@ -42251,7 +42817,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -483,14 +483,14 @@
+@@ -497,14 +497,14 @@
double y = gdkEvent.y;
gdkEvent.y += OS.GTK_WIDGET_Y (handle);
OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -42268,7 +42834,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, event, GdkEventButton.sizeof);
double x = gdkEvent.x;
-@@ -498,17 +498,17 @@
+@@ -512,17 +512,17 @@
double y = gdkEvent.y;
gdkEvent.y += OS.GTK_WIDGET_Y (handle);
OS.memmove (event, gdkEvent, GdkEventButton.sizeof);
@@ -42289,7 +42855,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
if (eventPtr != 0) {
GdkEvent gdkEvent = new GdkEvent ();
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
-@@ -524,7 +524,7 @@
+@@ -538,7 +538,7 @@
if ((((parent.style & SWT.RIGHT_TO_LEFT) == 0) && x <= (int)x_win [0])
|| (((parent.style & SWT.RIGHT_TO_LEFT) != 0) && (int)x_win [0] <= x + width)) {
event.detail = SWT.ARROW;
@@ -42298,7 +42864,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
event.x = OS.GTK_WIDGET_X (topHandle);
if ((parent.style & SWT.MIRRORED) != 0) event.x = parent.getClientWidth () - OS.GTK_WIDGET_WIDTH (topHandle) - event.x;
event.y = OS.GTK_WIDGET_Y (topHandle) + OS.GTK_WIDGET_HEIGHT (topHandle);
-@@ -544,7 +544,7 @@
+@@ -558,7 +558,7 @@
return 0;
}
@@ -42307,7 +42873,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
parent.gtk_enter_notify_event (widget, event);
drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;
if (drawHotImage && imageHandle != 0) {
-@@ -552,7 +552,7 @@
+@@ -566,7 +566,7 @@
if (imageList != null) {
int index = imageList.indexOf (hotImage);
if (index != -1) {
@@ -42316,7 +42882,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
}
}
-@@ -560,7 +560,7 @@
+@@ -574,7 +574,7 @@
return 0;
}
@@ -42325,7 +42891,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
switch (event.type) {
-@@ -576,13 +576,13 @@
+@@ -590,13 +590,13 @@
return 0;
}
@@ -42341,7 +42907,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
parent.gtk_leave_notify_event (widget, event);
if (drawHotImage) {
drawHotImage = false;
-@@ -591,7 +591,7 @@
+@@ -605,7 +605,7 @@
if (imageList != null) {
int index = imageList.indexOf (image);
if (index != -1) {
@@ -42350,7 +42916,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
}
}
-@@ -600,12 +600,12 @@
+@@ -614,12 +614,12 @@
return 0;
}
@@ -42365,7 +42931,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
return parent.gtk_mnemonic_activate (widget, arg1);
}
-@@ -642,7 +642,7 @@
+@@ -656,7 +656,7 @@
OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_RELEASE_EVENT], 0, display.closures [BUTTON_RELEASE_EVENT], false);
OS.g_signal_connect_closure_by_id (handle, display.signalIds [EVENT_AFTER], 0, display.closures[EVENT_AFTER], false);
@@ -42374,7 +42940,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
OS.g_signal_connect_closure_by_id (topHandle, display.signalIds [MAP], 0, display.closures [MAP], true);
}
-@@ -812,7 +812,7 @@
+@@ -840,7 +840,7 @@
*/
public void setEnabled (boolean enabled) {
checkWidget();
@@ -42383,7 +42949,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_set_sensitive (topHandle, enabled);
if (enabled) {
/*
-@@ -840,7 +840,7 @@
+@@ -868,7 +868,7 @@
return result;
}
@@ -42392,7 +42958,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_modify_font (handle, font);
if (labelHandle != 0) OS.gtk_widget_modify_font (labelHandle, font);
if (imageHandle != 0) OS.gtk_widget_modify_font (imageHandle, font);
-@@ -899,7 +899,7 @@
+@@ -927,7 +927,7 @@
} else {
imageList.put (imageIndex, image);
}
@@ -42401,10 +42967,10 @@ diff -ur x86/org/eclipse/swt/widgets/ToolItem.java x86_64/org/eclipse/swt/widget
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets/ToolTip.java
---- x86/org/eclipse/swt/widgets/ToolTip.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/ToolTip.java 2009-02-11 17:43:50.000000000 -0500
-@@ -46,7 +46,7 @@
+diff -urN x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets/ToolTip.java
+--- x86/org/eclipse/swt/widgets/ToolTip.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/ToolTip.java 2009-09-17 08:48:24.000000000 -0400
+@@ -47,7 +47,7 @@
String text, message;
TrayItem item;
int x, y, timerId;
@@ -42413,7 +42979,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
int [] borderPolygon;
boolean spikeAbove, autohide;
-@@ -132,7 +132,7 @@
+@@ -135,7 +135,7 @@
}
void configure () {
@@ -42422,7 +42988,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (handle);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (handle));
GdkRectangle dest = new GdkRectangle ();
-@@ -246,9 +246,9 @@
+@@ -249,9 +249,9 @@
OS.gtk_window_move (handle, Math.min(dest.width - w, x - w + 17), y - h - TIP_HEIGHT);
}
}
@@ -42434,7 +43000,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.gdk_window_shape_combine_region (window, rgn, 0, 0);
OS.gdk_region_destroy (rgn);
}
-@@ -287,13 +287,13 @@
+@@ -291,13 +291,13 @@
void deregister () {
super.deregister ();
if ((style & SWT.BALLOON) == 0) {
@@ -42447,22 +43013,28 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
void destroyWidget () {
- int /*long*/ topHandle = topHandle ();
+ long /*int*/ topHandle = topHandle ();
+ if (parent != null) parent.removeTooTip (this);
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
- if ((style & SWT.BALLOON) != 0) {
-@@ -325,9 +325,9 @@
+@@ -330,7 +330,7 @@
int x = this.x;
int y = this.y;
if (item != null) {
- int /*long*/ itemHandle = item.handle;
+ long /*int*/ itemHandle = item.handle;
- OS.gtk_widget_realize (itemHandle);
-- int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
-+ long /*int*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
- int [] px = new int [1], py = new int [1];
- OS.gdk_window_get_origin (window, px, py);
- x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
-@@ -446,19 +446,19 @@
+ if(OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ GdkRectangle area = new GdkRectangle ();
+ OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
+@@ -338,7 +338,7 @@
+ y = area.y + area.height / 2;
+ } else {
+ OS.gtk_widget_realize (itemHandle);
+- int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
+ int [] px = new int [1], py = new int [1];
+ OS.gdk_window_get_origin (window, px, py);
+ x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
+@@ -458,19 +458,19 @@
public boolean getVisible () {
checkWidget ();
if ((style & SWT.BALLOON) != 0) return OS.GTK_WIDGET_VISIBLE (handle);
@@ -42487,7 +43059,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.gdk_draw_polygon (window, gdkGC, 0, borderPolygon, borderPolygon.length / 2);
int x = BORDER + PADDING;
int y = BORDER + PADDING;
-@@ -472,8 +472,8 @@
+@@ -484,8 +484,8 @@
case SWT.ICON_WARNING: buffer = Converter.wcsToMbcs (null, "gtk-dialog-warning", true); break;
}
if (buffer != null) {
@@ -42498,7 +43070,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.gtk_icon_factory_lookup_default (buffer),
style,
OS.GTK_TEXT_DIR_NONE,
-@@ -499,11 +499,11 @@
+@@ -511,11 +511,11 @@
return 0;
}
@@ -42512,7 +43084,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_realize (widget);
int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, OS.GTK_WIDGET_WINDOW (widget));
GdkRectangle dest = new GdkRectangle ();
-@@ -522,7 +522,7 @@
+@@ -534,7 +534,7 @@
OS.gtk_widget_add_events (handle, OS.GDK_BUTTON_PRESS_MASK);
OS.g_signal_connect_closure (handle, OS.button_press_event, display.closures [BUTTON_PRESS_EVENT], false);
} else {
@@ -42521,7 +43093,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
if (tipWindow != 0) {
OS.g_signal_connect_closure (tipWindow, OS.size_allocate, display.closures [SIZE_ALLOCATE], false);
OS.gtk_widget_add_events (tipWindow, OS.GDK_BUTTON_PRESS_MASK);
-@@ -553,7 +553,7 @@
+@@ -565,7 +565,7 @@
void register () {
super.register ();
if ((style & SWT.BALLOON) == 0) {
@@ -42530,7 +43102,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
if (tipWindow != 0) display.addWidget (tipWindow, this);
}
}
-@@ -640,7 +640,7 @@
+@@ -652,7 +652,7 @@
if ((style & SWT.BALLOON) != 0) {
if (OS.GTK_WIDGET_VISIBLE (handle)) configure ();
} else {
@@ -42539,7 +43111,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
if (OS.GTK_WIDGET_VISIBLE (tipWindow)) {
OS.gtk_window_move (tipWindow, x, y);
}
-@@ -732,13 +732,13 @@
+@@ -744,13 +744,13 @@
if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
OS.pango_layout_set_auto_dir (layoutText, false);
}
@@ -42555,7 +43127,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.pango_attr_list_insert (attrList, boldAttr);
OS.pango_layout_set_attributes (layoutText, attrList);
OS.pango_attr_list_unref (attrList);
-@@ -771,13 +771,13 @@
+@@ -784,13 +784,13 @@
configure ();
OS.gtk_widget_show (handle);
} else {
@@ -42571,7 +43143,7 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.GTK_TOOLTIPS_SET_ACTIVE (handle, data);
OS.gtk_tooltips_set_tip (handle, vboxHandle, buffer, null);
}
-@@ -786,17 +786,17 @@
+@@ -799,17 +799,17 @@
if ((style & SWT.BALLOON) != 0) {
OS.gtk_widget_hide (handle);
} else {
@@ -42592,10 +43164,10 @@ diff -ur x86/org/eclipse/swt/widgets/ToolTip.java x86_64/org/eclipse/swt/widgets
OS.gtk_widget_hide (tipWindow);
}
return 0;
-diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets/Tracker.java
---- x86/org/eclipse/swt/widgets/Tracker.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Tracker.java 2009-02-11 17:43:50.000000000 -0500
-@@ -41,7 +41,7 @@
+diff -urN x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets/Tracker.java
+--- x86/org/eclipse/swt/widgets/Tracker.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Tracker.java 2009-09-17 08:48:24.000000000 -0400
+@@ -42,7 +42,7 @@
public class Tracker extends Widget {
Composite parent;
Cursor cursor;
@@ -42604,7 +43176,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
boolean tracking, cancelled, grabbed, stippled;
Rectangle [] rectangles = new Rectangle [0], proportions = rectangles;
Rectangle bounds;
-@@ -303,14 +303,14 @@
+@@ -305,14 +305,14 @@
}
void drawRectangles (Rectangle [] rects) {
@@ -42622,7 +43194,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
GdkColor color = new GdkColor ();
OS.gdk_color_white (colormap, color);
OS.gdk_gc_set_foreground (gc, color);
-@@ -363,17 +363,17 @@
+@@ -365,17 +365,17 @@
}
boolean grab () {
@@ -42644,7 +43216,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
if (result != 0) return result;
GdkEventKey keyEvent = new GdkEventKey ();
OS.memmove (keyEvent, eventPtr, GdkEventKey.sizeof);
-@@ -507,8 +507,8 @@
+@@ -509,8 +509,8 @@
return result;
}
@@ -42655,7 +43227,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
if (cursor != lastCursor) {
ungrab ();
grabbed = grab ();
-@@ -517,7 +517,7 @@
+@@ -519,7 +519,7 @@
return gtk_mouse (OS.GDK_MOTION_NOTIFY, widget, eventPtr);
}
@@ -42664,7 +43236,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
int [] newX = new int [1], newY = new int [1];
OS.gdk_window_get_pointer (window, newX, newY, null);
if (oldX != newX [0] || oldY != newY [0]) {
-@@ -707,7 +707,7 @@
+@@ -709,7 +709,7 @@
GdkEvent gdkEvent = new GdkEvent();
while (tracking) {
if (parent != null && parent.isDisposed ()) break;
@@ -42673,7 +43245,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
while (true) {
eventPtr = OS.gdk_event_get ();
if (eventPtr != 0) {
-@@ -717,7 +717,7 @@
+@@ -719,7 +719,7 @@
}
}
OS.memmove (gdkEvent, eventPtr, GdkEvent.sizeof);
@@ -42682,10 +43254,10 @@ diff -ur x86/org/eclipse/swt/widgets/Tracker.java x86_64/org/eclipse/swt/widgets
switch (gdkEvent.type) {
case OS.GDK_MOTION_NOTIFY: gtk_motion_notify_event (widget, eventPtr); break;
case OS.GDK_BUTTON_RELEASE: gtk_button_release_event (widget, eventPtr); break;
-diff -ur x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widgets/TrayItem.java
---- x86/org/eclipse/swt/widgets/TrayItem.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TrayItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -39,8 +39,8 @@
+diff -urN x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widgets/TrayItem.java
+--- x86/org/eclipse/swt/widgets/TrayItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TrayItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -40,8 +40,8 @@
Tray parent;
ToolTip toolTip;
String toolTipText;
@@ -42696,54 +43268,76 @@ diff -ur x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widget
ImageList imageList;
/**
-@@ -157,20 +157,20 @@
- OS.gtk_container_add (handle, imageHandle);
- OS.gtk_widget_show (handle);
- OS.gtk_widget_show (imageHandle);
-- int /*long*/ id = OS.gtk_plug_get_id (handle);
-+ long /*int*/ id = OS.gtk_plug_get_id (handle);
- int monitor = 0;
-- int /*long*/ screen = OS.gdk_screen_get_default ();
-+ long /*int*/ screen = OS.gdk_screen_get_default ();
- if (screen != 0) {
- monitor = OS.gdk_screen_get_number (screen);
- }
- byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
-- int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
-- int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
-- int /*long*/ xDisplay = OS.GDK_DISPLAY ();
-- int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
-+ long /*int*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
-+ long /*int*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
-+ long /*int*/ xDisplay = OS.GDK_DISPLAY ();
-+ long /*int*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
- byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
-- int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
-- int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
-+ long /*int*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
-+ long /*int*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
- XClientMessageEvent event = new XClientMessageEvent ();
- event.type = OS.ClientMessage;
- event.window = trayWindow;
-@@ -179,7 +179,7 @@
- event.data [0] = OS.GDK_CURRENT_TIME;
- event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
- event.data [2] = id;
-- int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
-+ long /*int*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
- OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
- OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
- OS.g_free (clientEvent);
-@@ -246,7 +246,7 @@
+@@ -164,20 +164,20 @@
+ OS.gtk_container_add (handle, imageHandle);
+ OS.gtk_widget_show (handle);
+ OS.gtk_widget_show (imageHandle);
+- int /*long*/ id = OS.gtk_plug_get_id (handle);
++ long /*int*/ id = OS.gtk_plug_get_id (handle);
+ int monitor = 0;
+- int /*long*/ screen = OS.gdk_screen_get_default ();
++ long /*int*/ screen = OS.gdk_screen_get_default ();
+ if (screen != 0) {
+ monitor = OS.gdk_screen_get_number (screen);
+ }
+ byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
+- int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
+- int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
+- int /*long*/ xDisplay = OS.GDK_DISPLAY ();
+- int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
++ long /*int*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
++ long /*int*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
++ long /*int*/ xDisplay = OS.GDK_DISPLAY ();
++ long /*int*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
+ byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
+- int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
+- int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
++ long /*int*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
++ long /*int*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
+ XClientMessageEvent event = new XClientMessageEvent ();
+ event.type = OS.ClientMessage;
+ event.window = trayWindow;
+@@ -186,7 +186,7 @@
+ event.data [0] = OS.GDK_CURRENT_TIME;
+ event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
+ event.data [2] = id;
+- int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
++ long /*int*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
+ OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
+ OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
+ OS.g_free (clientEvent);
+@@ -254,7 +254,7 @@
return toolTipText;
}
+-int /*long*/ gtk_activate (int /*long*/ widget) {
++long /*int*/ gtk_activate (long /*int*/ widget) {
+ postEvent (SWT.Selection);
+ /*
+ * Feature in GTK. GTK will generate a single-click event before sending
+@@ -262,10 +262,10 @@
+ * the single-click as the current event and for the double-click in the
+ * event queue.
+ */
+- int /*long*/ nextEvent = OS.gdk_event_peek ();
++ long /*int*/ nextEvent = OS.gdk_event_peek ();
+ if (nextEvent != 0) {
+ int nextEventType = OS.GDK_EVENT_TYPE (nextEvent);
+- int /*long*/ currEvent = OS.gtk_get_current_event ();
++ long /*int*/ currEvent = OS.gtk_get_current_event ();
+ int currEventType = 0;
+ if (currEvent != 0) {
+ currEventType = OS.GDK_EVENT_TYPE (currEvent);
+@@ -279,7 +279,7 @@
+ return 0;
+ }
+
-int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
+long /*int*/ gtk_button_press_event (long /*int*/ widget, long /*int*/ eventPtr) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
if (gdkEvent.type == OS.GDK_3BUTTON_PRESS) return 0;
-@@ -262,13 +262,13 @@
+@@ -295,13 +295,13 @@
return 0;
}
@@ -42759,7 +43353,7 @@ diff -ur x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widget
if (gdkImagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkImage gdkImage = new GdkImage();
OS.memmove (gdkImage, gdkImagePtr);
-@@ -287,7 +287,7 @@
+@@ -320,7 +320,7 @@
}
}
OS.gtk_widget_realize (handle);
@@ -42768,20 +43362,29 @@ diff -ur x86/org/eclipse/swt/widgets/TrayItem.java x86_64/org/eclipse/swt/widget
OS.gdk_window_shape_combine_region (window, region.handle, 0, 0);
region.dispose ();
}
-@@ -418,7 +418,7 @@
+@@ -328,7 +328,7 @@
+ return 0;
+ }
+
+-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ widget, int /*long*/ button, int /*long*/ activate_time) {
++long /*int*/ gtk_status_icon_popup_menu (long /*int*/ widget, long /*int*/ button, long /*int*/ activate_time) {
+ sendEvent (SWT.MenuDetect);
+ return 0;
+ }
+@@ -468,7 +468,7 @@
} else {
imageList.put (imageIndex, image);
}
- int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
+ long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
- } else {
-diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widgets/TreeColumn.java
---- x86/org/eclipse/swt/widgets/TreeColumn.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TreeColumn.java 2009-02-11 17:43:50.000000000 -0500
-@@ -37,7 +37,7 @@
- * @since 3.1
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
+ OS.gtk_status_icon_set_visible (handle, true);
+diff -urN x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widgets/TreeColumn.java
+--- x86/org/eclipse/swt/widgets/TreeColumn.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TreeColumn.java 2009-09-17 08:48:24.000000000 -0400
+@@ -38,7 +38,7 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TreeColumn extends Item {
- int /*long*/ labelHandle, imageHandle, buttonHandle;
@@ -42789,7 +43392,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
Tree parent;
int modelIndex, lastButton, lastTime, lastX, lastWidth;
boolean customDraw, useFixedWidth;
-@@ -325,7 +325,7 @@
+@@ -326,7 +326,7 @@
return OS.gtk_tree_view_column_get_width (handle);
}
@@ -42798,7 +43401,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
/*
* There is no API to get a double click on a table column. Normally, when
* the mouse is double clicked, this is indicated by GDK_2BUTTON_PRESS
-@@ -335,7 +335,7 @@
+@@ -336,7 +336,7 @@
*/
boolean doubleClick = false;
boolean postEvent = true;
@@ -42807,7 +43410,16 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
if (eventPtr != 0) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
-@@ -367,11 +367,11 @@
+@@ -368,7 +368,7 @@
+ return 0;
+ }
+
+-int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
++long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ switch (event.type) {
+@@ -384,11 +384,11 @@
return 0;
}
@@ -42821,7 +43433,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
useFixedWidth = false;
int x = OS.GTK_WIDGET_X (widget);
int width = OS.GTK_WIDGET_WIDTH (widget);
-@@ -415,7 +415,7 @@
+@@ -435,7 +435,7 @@
if ((parent.style & SWT.VIRTUAL) != 0) {
//NOT DONE
} else {
@@ -42830,7 +43442,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
if (OS.gtk_tree_model_get_iter_first (parent.modelHandle, iter)) {
do {
width = Math.max (width, parent.calculateWidth (handle, iter, true));
-@@ -522,7 +522,7 @@
+@@ -542,7 +542,7 @@
parent.createRenderers (handle, modelIndex, index == 0, style);
}
@@ -42839,7 +43451,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
OS.gtk_widget_modify_font (labelHandle, font);
OS.gtk_widget_modify_font (imageHandle, font);
}
-@@ -537,7 +537,7 @@
+@@ -557,7 +557,7 @@
}
int imageIndex = headerImageList.indexOf (image);
if (imageIndex == -1) imageIndex = headerImageList.add (image);
@@ -42848,10 +43460,10 @@ diff -ur x86/org/eclipse/swt/widgets/TreeColumn.java x86_64/org/eclipse/swt/widg
OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
OS.gtk_widget_show (imageHandle);
} else {
-diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widgets/TreeItem.java
---- x86/org/eclipse/swt/widgets/TreeItem.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/TreeItem.java 2009-02-11 17:43:50.000000000 -0500
-@@ -180,7 +180,7 @@
+diff -urN x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widgets/TreeItem.java
+--- x86/org/eclipse/swt/widgets/TreeItem.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/TreeItem.java 2009-09-17 08:48:24.000000000 -0400
+@@ -181,7 +181,7 @@
this (checkNull (parentItem).parent, parentItem.handle, style, checkIndex (index), true);
}
@@ -42860,7 +43472,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
super (parent, style);
this.parent = parent;
if (create) {
-@@ -211,7 +211,7 @@
+@@ -212,7 +212,7 @@
}
Color _getBackground () {
@@ -42869,7 +43481,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getBackground ();
GdkColor gdkColor = new GdkColor ();
-@@ -222,7 +222,7 @@
+@@ -223,7 +223,7 @@
Color _getBackground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getBackground ();
@@ -42878,7 +43490,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_BACKGROUND, ptr, -1);
if (ptr [0] == 0) return _getBackground ();
-@@ -232,13 +232,13 @@
+@@ -233,13 +233,13 @@
}
boolean _getChecked () {
@@ -42894,7 +43506,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.FOREGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) return parent.getForeground ();
GdkColor gdkColor = new GdkColor ();
-@@ -249,7 +249,7 @@
+@@ -250,7 +250,7 @@
Color _getForeground (int index) {
int count = Math.max (1, parent.columnCount);
if (0 > index || index > count - 1) return _getForeground ();
@@ -42903,7 +43515,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_FOREGROUND, ptr, -1);
if (ptr [0] == 0) return _getForeground ();
-@@ -261,7 +261,7 @@
+@@ -262,7 +262,7 @@
Image _getImage (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return null;
@@ -42912,7 +43524,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_PIXBUF, ptr, -1);
if (ptr [0] == 0) return null;
-@@ -274,7 +274,7 @@
+@@ -275,7 +275,7 @@
String _getText (int index) {
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return "";
@@ -42921,7 +43533,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
OS.gtk_tree_model_get (parent.modelHandle, handle, modelIndex + Tree.CELL_TEXT, ptr, -1);
if (ptr [0] == 0) return ""; //$NON-NLS-1$
-@@ -422,15 +422,15 @@
+@@ -423,15 +423,15 @@
// TODO fully test on early and later versions of GTK
checkWidget();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -42940,7 +43552,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (parentHandle);
GdkRectangle rect = new GdkRectangle ();
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
-@@ -493,14 +493,14 @@
+@@ -494,14 +494,14 @@
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -42960,7 +43572,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -593,7 +593,7 @@
+@@ -594,7 +594,7 @@
*/
public boolean getExpanded () {
checkWidget();
@@ -42969,7 +43581,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
boolean answer = OS.gtk_tree_view_row_expanded (parent.handle, path);
OS.gtk_tree_path_free (path);
return answer;
-@@ -745,18 +745,18 @@
+@@ -746,18 +746,18 @@
// TODO fully test on early and later versions of GTK
checkWidget ();
if (!parent.checkData (this)) error (SWT.ERROR_WIDGET_DISPOSED);
@@ -42992,7 +43604,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (parentHandle);
OS.gtk_tree_view_get_cell_area (parentHandle, path, column, rect);
if ((parent.getStyle () & SWT.MIRRORED) != 0) rect.x = parent.getClientWidth () - rect.width - rect.x;
-@@ -907,12 +907,12 @@
+@@ -908,12 +908,12 @@
*/
public TreeItem getParentItem () {
checkWidget();
@@ -43007,7 +43619,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
if (OS.gtk_tree_model_get_iter (parent.modelHandle, iter, path)) {
item = parent._getItem (iter);
}
-@@ -970,19 +970,19 @@
+@@ -971,19 +971,19 @@
if (0 > index || index > count - 1) return new Rectangle (0, 0, 0, 0);
// TODO fully test on early and later versions of GTK
// shifted a bit too far right on later versions of GTK - however, old Tree also had this problem
@@ -43032,7 +43644,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_widget_realize (parentHandle);
boolean isExpander = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle) > 0;
-@@ -1065,8 +1065,8 @@
+@@ -1066,8 +1066,8 @@
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
boolean isParent = false;
@@ -43043,7 +43655,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
int depth = OS.gtk_tree_path_get_depth (parentPath);
if (depth > 1 && OS.gtk_tree_path_up(parentPath)) {
if (OS.gtk_tree_path_compare(currentPath, parentPath) == 0) isParent = true;
-@@ -1074,9 +1074,9 @@
+@@ -1075,9 +1075,9 @@
OS.gtk_tree_path_free (currentPath);
OS.gtk_tree_path_free (parentPath);
if (!isParent) return index;
@@ -43055,7 +43667,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
if (indices != 0) {
int[] temp = new int[depth];
OS.memmove (temp, indices, 4 * temp.length);
-@@ -1088,13 +1088,13 @@
+@@ -1089,13 +1089,13 @@
}
void redraw () {
@@ -43072,16 +43684,26 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
rect.x = 0;
int [] w = new int [1], h = new int [1];
OS.gdk_drawable_get_size (window, w, h);
-@@ -1137,7 +1137,7 @@
+@@ -1136,15 +1136,15 @@
+ */
+ public void removeAll () {
checkWidget ();
- int length = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
+- int /*long*/ modelHandle = parent.modelHandle;
++ long /*int*/ modelHandle = parent.modelHandle;
+ int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);
if (length == 0) return;
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int [] index = new int [1];
- while (OS.gtk_tree_model_iter_children (parent.modelHandle, iter, handle)) {
- OS.gtk_tree_model_get (parent.modelHandle, iter, Tree.ID_COLUMN, index, -1);
-@@ -1236,16 +1236,16 @@
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (parent.fixAccessibility ()) {
+ parent.ignoreAccessibility = true;
+ }
+- int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
++ long /*int*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
+ int [] value = new int [1];
+ while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
+ OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
+@@ -1249,16 +1249,16 @@
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -43102,7 +43724,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1296,7 +1296,7 @@
+@@ -1309,7 +1309,7 @@
*/
public void setExpanded (boolean expanded) {
checkWidget();
@@ -43111,7 +43733,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
if (expanded) {
OS.g_signal_handlers_block_matched (parent.handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, TEST_EXPAND_ROW);
OS.gtk_tree_view_expand_row (parent.handle, path, false);
-@@ -1338,7 +1338,7 @@
+@@ -1351,7 +1351,7 @@
if (oldFont == font) return;
this.font = font;
if (oldFont != null && oldFont.equals (font)) return;
@@ -43120,7 +43742,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.FONT_COLUMN, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -1389,7 +1389,7 @@
+@@ -1402,7 +1402,7 @@
if (oldFont != null && oldFont.equals (font)) return;
int modelIndex = parent.columnCount == 0 ? Tree.FIRST_COLUMN : parent.columns [index].modelIndex;
@@ -43129,7 +43751,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_store_set (parent.modelHandle, handle, modelIndex + Tree.CELL_FONT, fontHandle, -1);
/*
* Bug in GTK. When using fixed-height-mode,
-@@ -1407,16 +1407,16 @@
+@@ -1420,16 +1420,16 @@
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -43150,7 +43772,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1516,16 +1516,16 @@
+@@ -1529,16 +1529,16 @@
boolean customDraw = (parent.columnCount == 0) ? parent.firstCustomDraw : parent.columns [index].customDraw;
if (!customDraw) {
if ((parent.style & SWT.VIRTUAL) == 0) {
@@ -43171,7 +43793,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, display.cellDataProc, parentHandle, 0);
OS.gtk_tree_view_column_set_cell_data_func (column, imageRenderer, display.cellDataProc, parentHandle, 0);
}
-@@ -1558,7 +1558,7 @@
+@@ -1571,7 +1571,7 @@
* GTK+'s "inconsistent" state does not match SWT's concept of grayed.
* Render checked+grayed as "inconsistent", unchecked+grayed as blank.
*/
@@ -43180,7 +43802,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_model_get (parent.modelHandle, handle, Tree.CHECKED_COLUMN, ptr, -1);
OS.gtk_tree_store_set (parent.modelHandle, handle, Tree.GRAYED_COLUMN, ptr [0] == 0 ? false : grayed, -1);
cached = true;
-@@ -1590,7 +1590,7 @@
+@@ -1603,7 +1603,7 @@
}
int count = Math.max (1, parent.getColumnCount ());
if (0 > index || index > count - 1) return;
@@ -43189,7 +43811,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList == null) imageList = parent.imageList = new ImageList ();
-@@ -1620,10 +1620,10 @@
+@@ -1633,10 +1633,10 @@
if ((parent.style & SWT.VIRTUAL) != 0 && parent.currentItem == null) {
if (OS.GTK_VERSION >= OS.VERSION (2, 3, 2)) {
if (image != null) {
@@ -43203,7 +43825,7 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
OS.gtk_tree_view_column_cell_get_position (column, pixbufRenderer, null, w);
if (w[0] < image.getBounds().width) {
/*
-@@ -1631,7 +1631,7 @@
+@@ -1644,7 +1644,7 @@
* are relying on the fact that it is done as part of modifying
* the style.
*/
@@ -43212,11 +43834,11 @@ diff -ur x86/org/eclipse/swt/widgets/TreeItem.java x86_64/org/eclipse/swt/widget
parent.modifyStyle (parentHandle, style);
}
}
-diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tree.java
---- x86/org/eclipse/swt/widgets/Tree.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Tree.java 2009-02-11 17:43:50.000000000 -0500
-@@ -74,9 +74,9 @@
- * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+diff -urN x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tree.java
+--- x86/org/eclipse/swt/widgets/Tree.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Tree.java 2009-09-17 08:48:24.000000000 -0400
+@@ -75,9 +75,9 @@
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Tree extends Composite {
- int /*long*/ modelHandle, checkRenderer;
@@ -43227,7 +43849,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
TreeItem[] items;
TreeColumn [] columns;
TreeColumn sortColumn;
-@@ -154,14 +154,14 @@
+@@ -155,14 +155,14 @@
}
}
@@ -43245,7 +43867,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (depth > 1) {
OS.gtk_tree_path_up (path);
parentIter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
-@@ -173,8 +173,8 @@
+@@ -174,8 +174,8 @@
return items [id];
}
@@ -43256,7 +43878,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int id = getId (iter, true);
OS.g_free (iter);
-@@ -182,7 +182,7 @@
+@@ -183,7 +183,7 @@
return items [id] = new TreeItem (this, parentIter, SWT.NONE, index, false);
}
@@ -43265,7 +43887,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (queryModel) {
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
-@@ -218,7 +218,7 @@
+@@ -219,7 +219,7 @@
return checkBits (style, SWT.SINGLE, SWT.MULTI, 0, 0, 0, 0);
}
@@ -43274,7 +43896,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (cell == ignoreCell) return 0;
TreeItem item = _getItem (iter);
if (item != null) OS.g_object_set_qdata (cell, Display.SWT_OBJECT_INDEX2, item.handle);
-@@ -245,7 +245,7 @@
+@@ -246,7 +246,7 @@
* fix is to only provide the data if the row is visible.
*/
if (OS.GTK_VERSION < OS.VERSION (2, 3, 2)) {
@@ -43283,7 +43905,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_widget_realize (handle);
GdkRectangle visible = new GdkRectangle ();
OS.gtk_tree_view_get_visible_rect (handle, visible);
-@@ -267,7 +267,7 @@
+@@ -268,7 +268,7 @@
setData = checkData (item);
}
}
@@ -43292,7 +43914,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (setData) {
if (isPixbuf) {
ptr [0] = 0;
-@@ -405,7 +405,7 @@
+@@ -406,7 +406,7 @@
addListener (SWT.Collapse, typedListener);
}
@@ -43301,7 +43923,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
/*
* Bug in GTK. The width calculated by gtk_tree_view_column_cell_get_size()
-@@ -419,7 +419,7 @@
+@@ -420,7 +420,7 @@
int width = 0;
int [] w = new int [1];
@@ -43310,7 +43932,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_view_get_expander_column (handle) == column) {
/* indent */
-@@ -434,11 +434,11 @@
+@@ -435,11 +435,11 @@
}
OS.gtk_widget_style_get(handle, OS.focus_line_width, w, 0);
width += 2 * w [0];
@@ -43325,7 +43947,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (renderer != 0) {
OS.gtk_cell_renderer_get_size (renderer, handle, null, null, null, w, null);
width += w [0];
-@@ -451,7 +451,7 @@
+@@ -452,7 +452,7 @@
if (path == 0) path = OS.gtk_tree_model_get_path (modelHandle, iter);
boolean expanded = OS.gtk_tree_view_row_expanded (handle, path);
if (expanded) {
@@ -43334,7 +43956,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, childIter, iter);
while (valid) {
width = Math.max (width, calculateWidth (column, childIter, true));
-@@ -493,8 +493,8 @@
+@@ -498,8 +498,8 @@
clear (0, index, all);
}
@@ -43345,7 +43967,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_model_iter_nth_child(modelHandle, iter, parentIter, index);
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
-@@ -529,10 +529,10 @@
+@@ -534,10 +534,10 @@
checkWidget ();
clearAll (all, 0);
}
@@ -43358,7 +43980,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
int[] value = new int[1];
while (valid) {
-@@ -558,13 +558,13 @@
+@@ -563,13 +563,13 @@
return size;
}
@@ -43376,7 +43998,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (newItem == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (newModel, newItem, newParent);
int [] index = new int [1];
-@@ -573,9 +573,9 @@
+@@ -578,9 +578,9 @@
if (index [0] != -1) {
item = items [index [0]];
if (item != null) {
@@ -43388,7 +44010,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
for (int j = 0; j < FIRST_COLUMN; j++) {
OS.gtk_tree_model_get (oldModel, oldItem, j, ptr, -1);
OS.gtk_tree_store_set (newModel, newItem, j, ptr [0], -1);
-@@ -600,7 +600,7 @@
+@@ -605,7 +605,7 @@
}
} while (OS.gtk_tree_model_iter_next(oldModel, iter));
for (int i = 0; i < oldItems.length; i++) {
@@ -43397,7 +44019,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (oldItem != 0) {
OS.gtk_tree_store_remove (oldModel, oldItem);
OS.g_free (oldItem);
-@@ -633,17 +633,17 @@
+@@ -638,17 +638,17 @@
modelIndex++;
}
if (modelIndex == modelLength) {
@@ -43420,7 +44042,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (columnHandle == 0) error (SWT.ERROR_NO_HANDLES);
if (index == 0 && columnCount > 0) {
TreeColumn checkColumn = columns [0];
-@@ -700,7 +700,7 @@
+@@ -705,7 +705,7 @@
OS.gtk_fixed_set_has_window (fixedHandle, true);
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -43429,7 +44051,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
modelHandle = OS.gtk_tree_store_newv (types.length, types);
if (modelHandle == 0) error (SWT.ERROR_NO_HANDLES);
handle = OS.gtk_tree_view_new_with_model (modelHandle);
-@@ -715,7 +715,7 @@
+@@ -720,7 +720,7 @@
OS.gtk_container_add (scrolledHandle, handle);
int mode = (style & SWT.MULTI) != 0 ? OS.GTK_SELECTION_MULTIPLE : OS.GTK_SELECTION_BROWSE;
@@ -43438,7 +44060,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_selection_set_mode (selectionHandle, mode);
OS.gtk_tree_view_set_headers_visible (handle, false);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
-@@ -764,11 +764,11 @@
+@@ -769,11 +769,11 @@
} else {
createColumn (column, index);
}
@@ -43453,7 +44075,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_container_add (boxHandle, imageHandle);
OS.gtk_container_add (boxHandle, labelHandle);
-@@ -777,7 +777,7 @@
+@@ -782,7 +782,7 @@
column.labelHandle = labelHandle;
column.imageHandle = imageHandle;
OS.gtk_tree_view_column_set_widget (column.handle, boxHandle);
@@ -43462,7 +44084,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
while (widget != handle) {
if (OS.GTK_IS_BUTTON (widget)) {
column.buttonHandle = widget;
-@@ -811,7 +811,7 @@
+@@ -816,7 +816,7 @@
}
}
@@ -43471,7 +44093,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int count = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (index == -1) index = count;
if (!(0 <= index && index <= count)) error (SWT.ERROR_INVALID_RANGE);
-@@ -831,7 +831,7 @@
+@@ -836,7 +836,7 @@
modelChanged = true;
}
@@ -43480,7 +44102,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_column_clear (columnHandle);
if ((style & SWT.CHECK) != 0 && check) {
OS.gtk_tree_view_column_pack_start (columnHandle, checkRenderer, false);
-@@ -854,9 +854,9 @@
+@@ -859,9 +859,9 @@
OS.g_object_set_qdata (checkRenderer, Display.SWT_OBJECT_INDEX1, columnHandle);
}
}
@@ -43492,7 +44114,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (textRenderer == 0) error (SWT.ERROR_NO_HANDLES);
if (ownerDraw) {
-@@ -965,7 +965,7 @@
+@@ -971,7 +971,7 @@
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -43501,7 +44123,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -983,7 +983,7 @@
+@@ -989,7 +989,7 @@
public void deselectAll() {
checkWidget();
boolean fixColumn = showFirstColumn ();
@@ -43510,7 +44132,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_unselect_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -997,7 +997,7 @@
+@@ -1003,7 +1003,7 @@
index++;
}
if (index == columnCount) return;
@@ -43519,7 +44141,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (columnCount == 1) {
firstCustomDraw = column.customDraw;
}
-@@ -1005,11 +1005,11 @@
+@@ -1011,11 +1011,11 @@
columns [columnCount] = null;
OS.gtk_tree_view_remove_column (handle, columnHandle);
if (columnCount == 0) {
@@ -43535,7 +44157,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_set_model (handle, newModel);
OS.g_object_unref (oldModel);
modelHandle = newModel;
-@@ -1019,7 +1019,7 @@
+@@ -1025,7 +1025,7 @@
for (int i=0; i<items.length; i++) {
TreeItem item = items [i];
if (item != null) {
@@ -43544,7 +44166,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int modelIndex = column.modelIndex;
OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, 0, -1);
OS.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, 0, -1);
-@@ -1084,7 +1084,7 @@
+@@ -1090,7 +1090,7 @@
if (OS.GTK_VERSION < OS.VERSION (2, 0, 6)) {
int length = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (length > 0) {
@@ -43553,7 +44175,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, 0);
while (valid) {
if (item.handle == iter) {
-@@ -1096,7 +1096,7 @@
+@@ -1102,7 +1102,7 @@
OS.g_free (iter);
}
}
@@ -43562,7 +44184,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_store_remove (modelHandle, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1106,10 +1106,10 @@
+@@ -1112,10 +1112,10 @@
boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean selected = false;
if (filter) {
@@ -43575,7 +44197,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) selected = true;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1122,7 +1122,7 @@
+@@ -1128,7 +1128,7 @@
return dragDetect;
}
@@ -43584,7 +44206,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
return paintWindow ();
}
-@@ -1145,13 +1145,13 @@
+@@ -1166,13 +1166,13 @@
checkWidget ();
forceResize ();
OS.gtk_widget_realize (handle);
@@ -43601,7 +44223,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
int height = (state & ZERO_HEIGHT) != 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
return new Rectangle (fixedX [0] - binX [0], fixedY [0] - binY [0], width, height);
-@@ -1251,13 +1251,13 @@
+@@ -1272,13 +1272,13 @@
public int [] getColumnOrder () {
checkWidget ();
if (columnCount == 0) return new int [0];
@@ -43618,7 +44240,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (column != 0) {
for (int j=0; j<columnCount; j++) {
if (columns [j].handle == column) {
-@@ -1272,8 +1272,8 @@
+@@ -1293,8 +1293,8 @@
return order;
}
@@ -43629,7 +44251,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
// per row data
types [ID_COLUMN] = OS.G_TYPE_INT ();
types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
-@@ -1329,11 +1329,11 @@
+@@ -1350,11 +1350,11 @@
}
TreeItem getFocusItem () {
@@ -43643,7 +44265,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1384,7 +1384,7 @@
+@@ -1405,7 +1405,7 @@
GtkRequisition requisition = new GtkRequisition ();
int height = 0;
for (int i=0; i<columnCount; i++) {
@@ -43652,7 +44274,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (buttonHandle != 0) {
OS.gtk_widget_size_request (buttonHandle, requisition);
height = Math.max (height, requisition.height);
-@@ -1393,8 +1393,8 @@
+@@ -1414,8 +1414,8 @@
return height;
}
OS.gtk_widget_realize (handle);
@@ -43663,7 +44285,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int [] binY = new int [1];
OS.gdk_window_get_origin (binWindow, null, binY);
int [] fixedY = new int [1];
-@@ -1477,13 +1477,13 @@
+@@ -1498,13 +1498,13 @@
public TreeItem getItem (Point point) {
checkWidget ();
if (point == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -43680,7 +44302,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
boolean overExpander = false;
if (OS.gtk_tree_view_get_expander_column (handle) == columnHandle [0]) {
-@@ -1540,7 +1540,7 @@
+@@ -1561,7 +1561,7 @@
checkWidget ();
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, 0);
if (itemCount == 0) {
@@ -43689,7 +44311,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int [] w = new int [1], h = new int [1];
ignoreSize = true;
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1548,11 +1548,11 @@
+@@ -1569,11 +1569,11 @@
return h [0];
} else {
int height = 0;
@@ -43703,7 +44325,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_column_cell_set_cell_data (column, modelHandle, iter, false, false);
int [] w = new int [1], h = new int [1];
OS.gtk_tree_view_column_cell_get_size (column, null, null, null, w, h);
-@@ -1585,7 +1585,7 @@
+@@ -1606,7 +1606,7 @@
return getItems (0);
}
@@ -43712,7 +44334,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int length = OS.gtk_tree_model_iter_n_children (modelHandle, parent);
TreeItem[] result = new TreeItem [length];
if (length == 0) return result;
-@@ -1596,7 +1596,7 @@
+@@ -1617,7 +1617,7 @@
} else {
int i = 0;
int[] index = new int [1];
@@ -43721,7 +44343,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parent);
while (valid) {
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1649,14 +1649,14 @@
+@@ -1671,14 +1671,14 @@
return null;
}
@@ -43740,7 +44362,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.GTK_IS_CELL_RENDERER_PIXBUF (renderer)) {
pixbufRenderer = renderer;
break;
-@@ -1685,7 +1685,7 @@
+@@ -1707,7 +1707,7 @@
*/
public TreeItem[] getSelection () {
checkWidget();
@@ -43749,7 +44371,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = new int [items.length];
-@@ -1699,15 +1699,15 @@
+@@ -1721,15 +1721,15 @@
* in versions smaller than 2.2.4 if the model is NULL. The fix is
* to give a valid pointer instead.
*/
@@ -43769,7 +44391,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_model_get_iter (modelHandle, iter, data)) {
treeSelection [length] = _getItem (iter);
length++;
-@@ -1737,7 +1737,7 @@
+@@ -1759,7 +1759,7 @@
*/
public int getSelectionCount () {
checkWidget();
@@ -43778,7 +44400,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.GTK_VERSION < OS.VERSION (2, 2, 0)) {
display.treeSelectionLength = 0;
display.treeSelection = null;
-@@ -1789,14 +1789,14 @@
+@@ -1811,14 +1811,14 @@
return sortDirection;
}
@@ -43797,7 +44419,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.GTK_IS_CELL_RENDERER_TEXT (renderer)) {
textRenderer = renderer;
break;
-@@ -1823,12 +1823,12 @@
+@@ -1845,12 +1845,12 @@
*/
public TreeItem getTopItem () {
checkWidget ();
@@ -43812,7 +44434,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path [0])) {
item = _getItem (iter);
}
-@@ -1837,11 +1837,11 @@
+@@ -1859,11 +1859,11 @@
return item;
}
@@ -43826,7 +44448,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (result != 0) return result;
/*
* Feature in GTK. In a multi-select tree view, when multiple items are already
-@@ -1853,10 +1853,10 @@
+@@ -1875,10 +1875,10 @@
*/
int button = gdkEvent.button;
if (button == 3 && gdkEvent.type == OS.GDK_BUTTON_PRESS) {
@@ -43839,7 +44461,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_selection_path_is_selected (selection, path [0])) result = 1;
OS.gtk_tree_path_free (path [0]);
}
-@@ -1871,10 +1871,10 @@
+@@ -1893,10 +1893,10 @@
* widget from automatically selecting the first item.
*/
if ((style & SWT.SINGLE) != 0 && getSelectionCount () == 0) {
@@ -43852,7 +44474,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_view_set_cursor (handle, path [0], 0, false);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -1894,13 +1894,13 @@
+@@ -1916,13 +1916,13 @@
return result;
}
@@ -43869,7 +44491,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
TreeItem item = getFocusItem ();
if (item != null) {
Event event = new Event ();
-@@ -1910,14 +1910,14 @@
+@@ -1932,14 +1932,14 @@
return 0;
}
@@ -43887,7 +44509,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (result != 0) return result;
if (OS.GTK_VERSION < OS.VERSION (2, 2 ,0)) {
/*
-@@ -1941,14 +1941,14 @@
+@@ -1963,14 +1963,14 @@
return result;
}
@@ -43906,7 +44528,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
/*
* Bug in GTK. The context menu for the typeahead in GtkTreeViewer
* opens in the bottom right corner of the screen when Shift+F10
-@@ -1961,10 +1961,10 @@
+@@ -1983,10 +1983,10 @@
return OS.GTK_VERSION < OS.VERSION (2, 6, 5) ? 1 : result;
}
@@ -43919,7 +44541,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -1977,7 +1977,7 @@
+@@ -2013,7 +2013,7 @@
return 0;
}
@@ -43928,7 +44550,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2015,7 +2015,7 @@
+@@ -2051,7 +2051,7 @@
return 0;
}
@@ -43937,7 +44559,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
TreeItem item = items [index [0]];
-@@ -2057,11 +2057,11 @@
+@@ -2093,11 +2093,11 @@
return 0;
}
@@ -43952,7 +44574,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (OS.gtk_tree_model_get_iter (modelHandle, iter, path)) {
item = _getItem (iter);
}
-@@ -2077,7 +2077,7 @@
+@@ -2113,7 +2113,7 @@
return 0;
}
@@ -43961,7 +44583,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
/*
* Bug in GTK. For some reason, gtk_widget_size_request() fails
* to include the height of the tree view items when there are
-@@ -2088,17 +2088,17 @@
+@@ -2124,17 +2124,17 @@
super.gtk_widget_size_request (widget, requisition);
return;
}
@@ -43982,7 +44604,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (fixVisible) {
columnHandle = OS.g_list_data (columns);
OS.gtk_tree_view_column_set_visible (columnHandle, true);
-@@ -2111,13 +2111,13 @@
+@@ -2147,13 +2147,13 @@
}
void hideFirstColumn () {
@@ -43998,7 +44620,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_connect_closure (selection, OS.changed, display.closures [CHANGED], false);
OS.g_signal_connect_closure (handle, OS.row_activated, display.closures [ROW_ACTIVATED], false);
OS.g_signal_connect_closure (handle, OS.test_expand_row, display.closures [TEST_EXPAND_ROW], false);
-@@ -2181,10 +2181,10 @@
+@@ -2221,10 +2221,10 @@
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
int index = -1;
@@ -44011,7 +44633,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (indices != 0) {
int[] temp = new int[1];
OS.memmove (temp, indices, 4);
-@@ -2197,7 +2197,7 @@
+@@ -2237,7 +2237,7 @@
boolean mnemonicHit (char key) {
for (int i=0; i<columnCount; i++) {
@@ -44020,7 +44642,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (labelHandle != 0 && mnemonicHit (labelHandle, key)) return true;
}
return false;
-@@ -2205,13 +2205,13 @@
+@@ -2245,13 +2245,13 @@
boolean mnemonicMatch (char key) {
for (int i=0; i<columnCount; i++) {
@@ -44036,7 +44658,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_widget_realize (handle);
return OS.gtk_tree_view_get_bin_window (handle);
}
-@@ -2257,9 +2257,9 @@
+@@ -2298,9 +2298,9 @@
items [index [0]] = null;
}
@@ -44048,7 +44670,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
boolean valid = OS.gtk_tree_model_iter_children (modelHandle, iter, parentIter);
while (valid) {
releaseItems (iter);
-@@ -2309,14 +2309,14 @@
+@@ -2350,14 +2350,14 @@
currentItem = null;
}
@@ -44063,19 +44685,19 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int index = start;
- for (int i = start; i <= end; i++) {
- OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parentIter, index);
-@@ -2349,7 +2349,7 @@
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+@@ -2397,7 +2397,7 @@
if (item != null && !item.isDisposed ()) item.release (false);
}
items = new TreeItem[4];
- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
+ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
- OS.gtk_tree_store_clear (modelHandle);
- OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2427,19 +2427,19 @@
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+@@ -2482,19 +2482,19 @@
eventTable.unhook (SWT.Collapse, listener);
}
@@ -44100,7 +44722,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
for (int i = 0; i < columnCount; i++) {
if (columns [i].handle == columnHandle) {
columnIndex = i;
-@@ -2478,11 +2478,11 @@
+@@ -2533,11 +2533,11 @@
return result;
}
@@ -44115,7 +44737,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int columnIndex = 0;
if (columnCount > 0) {
for (int i = 0; i < columnCount; i++) {
-@@ -2496,7 +2496,7 @@
+@@ -2551,7 +2551,7 @@
if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
drawFlags = (int)/*64*/flags;
drawState = SWT.FOREGROUND;
@@ -44124,7 +44746,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_model_get (modelHandle, item.handle, Tree.BACKGROUND_COLUMN, ptr, -1);
if (ptr [0] == 0) {
int modelIndex = columnCount == 0 ? Tree.FIRST_COLUMN : columns [columnIndex].modelIndex;
-@@ -2507,7 +2507,7 @@
+@@ -2562,7 +2562,7 @@
if ((flags & OS.GTK_CELL_RENDERER_FOCUSED) != 0) drawState |= SWT.FOCUSED;
GdkRectangle rect = new GdkRectangle ();
@@ -44133,7 +44755,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_get_background_area (handle, path, columnHandle, rect);
OS.gtk_tree_path_free (path);
-@@ -2551,7 +2551,7 @@
+@@ -2606,7 +2606,7 @@
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
if ((drawState & SWT.SELECTED) != 0) {
@@ -44142,7 +44764,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
//TODO - parity and sorted
byte[] detail = Converter.wcsToMbcs (null, "cell_odd", true);
OS.gtk_paint_flat_box (style, window, OS.GTK_STATE_SELECTED, OS.GTK_SHADOW_NONE, rect, widget, detail, rect.x, rect.y, rect.width, rect.height);
-@@ -2562,7 +2562,7 @@
+@@ -2617,7 +2617,7 @@
}
}
}
@@ -44151,7 +44773,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if ((drawState & SWT.BACKGROUND) != 0 && (drawState & SWT.SELECTED) == 0) {
GC gc = new GC (this);
gc.setBackground (item.getBackground (columnIndex));
-@@ -2572,7 +2572,7 @@
+@@ -2627,7 +2627,7 @@
gc.dispose ();
}
if ((drawState & SWT.FOREGROUND) != 0 || OS.GTK_IS_CELL_RENDERER_TOGGLE (cell)) {
@@ -44160,16 +44782,16 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
GtkCellRendererClass klass = new GtkCellRendererClass ();
OS.memmove (klass, g_class);
if (drawForeground != null && OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
-@@ -2584,7 +2584,7 @@
- if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
+@@ -2640,7 +2640,7 @@
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
+ GdkRectangle clipRect = new GdkRectangle ();
- int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
+ long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
+ OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);
OS.gtk_tree_path_free (path);
- if (OS.GTK_VERSION < OS.VERSION (2, 8, 18) && OS.gtk_tree_view_get_expander_column (handle) == columnHandle) {
-@@ -2644,8 +2644,8 @@
+@@ -2704,8 +2704,8 @@
for (int i=0; i<end; i++) {
boolean customDraw = columnCount != 0 ? columns [i].customDraw : firstCustomDraw;
if (customDraw) {
@@ -44180,7 +44802,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_column_set_cell_data_func (column, textRenderer, 0, 0, 0);
if (columnCount != 0) columns [i].customDraw = false;
}
-@@ -2679,7 +2679,7 @@
+@@ -2739,7 +2739,7 @@
if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
Rectangle rect = item.getBounds();
@@ -44189,7 +44811,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_widget_realize (handle);
if (!OS.gtk_tree_view_get_path_at_pos(handle, rect.x, rect.y, path, null, null, null)) return;
if (path [0] == 0) return;
-@@ -2688,7 +2688,7 @@
+@@ -2748,7 +2748,7 @@
OS.gtk_tree_path_free (path [0]);
}
@@ -44198,16 +44820,16 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
int itemCount = OS.gtk_tree_model_iter_n_children (modelHandle, parentIter);
if (count == itemCount) return;
boolean isVirtual = (style & SWT.VIRTUAL) != 0;
-@@ -2696,7 +2696,7 @@
- remove (parentIter, count, itemCount - 1);
- if (isVirtual) {
+@@ -2759,7 +2759,7 @@
+ ignoreAccessibility = true;
+ }
for (int i=itemCount; i<count; i++) {
- int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ long /*int*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_tree_store_append (modelHandle, iter, parentIter);
OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
-@@ -2751,7 +2751,7 @@
+@@ -2818,7 +2818,7 @@
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
boolean fixColumn = showFirstColumn ();
@@ -44216,7 +44838,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_iter (selection, item.handle);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2773,7 +2773,7 @@
+@@ -2840,7 +2840,7 @@
checkWidget();
if ((style & SWT.SINGLE) != 0) return;
boolean fixColumn = showFirstColumn ();
@@ -44225,7 +44847,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_tree_selection_select_all (selection);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
-@@ -2785,9 +2785,9 @@
+@@ -2852,9 +2852,9 @@
OS.gtk_widget_modify_base (handle, 0, color);
}
@@ -44237,7 +44859,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (window != 0) OS.gdk_window_set_back_pixmap (window, 0, true);
}
-@@ -2852,15 +2852,15 @@
+@@ -2919,15 +2919,15 @@
if (seen [index]) error (SWT.ERROR_INVALID_ARGUMENT);
seen [index] = true;
}
@@ -44256,7 +44878,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
super.setFontDescription (font);
TreeColumn[] columns = getColumns ();
for (int i = 0; i < columns.length; i++) {
-@@ -2918,16 +2918,16 @@
+@@ -2989,16 +2989,16 @@
void setParentBackground () {
super.setParentBackground ();
@@ -44277,7 +44899,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (columnCount != 0 || currentItem == item) return;
/*
* Use GTK_TREE_VIEW_COLUMN_GROW_ONLY on GTK versions < 2.3.2
-@@ -2996,7 +2996,7 @@
+@@ -3067,7 +3067,7 @@
int length = items.length;
if (length == 0 || ((style & SWT.SINGLE) != 0 && length > 1)) return;
boolean fixColumn = showFirstColumn ();
@@ -44286,7 +44908,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
boolean first = true;
for (int i = 0; i < length; i++) {
-@@ -3004,7 +3004,7 @@
+@@ -3075,7 +3075,7 @@
if (item == null) continue;
if (item.isDisposed ()) break;
if (item.parent != this) continue;
@@ -44295,7 +44917,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
showItem (path, false);
if (first) {
OS.gtk_tree_view_set_cursor (handle, path, 0, false);
-@@ -3097,7 +3097,7 @@
+@@ -3168,7 +3168,7 @@
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -44304,7 +44926,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
showItem (path, false);
OS.gtk_tree_view_scroll_to_cell (handle, path, 0, true, 0f, 0f);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 0)) {
-@@ -3172,10 +3172,10 @@
+@@ -3243,10 +3243,10 @@
*/
int columnCount = Math.max (1, this.columnCount);
for (int i=0; i<columnCount; i++) {
@@ -44317,7 +44939,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
OS.gtk_tree_view_column_set_visible (firstColumn, true);
return true;
}
-@@ -3198,13 +3198,13 @@
+@@ -3269,13 +3269,13 @@
if (items.length != 0 && items [0] != null) showItem (items [0]);
}
@@ -44334,7 +44956,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
for (int i=0; i<indices.length; i++) {
OS.gtk_tree_path_append_index (tempPath, indices [i]);
OS.gtk_tree_view_expand_row (handle, tempPath, false);
-@@ -3276,12 +3276,12 @@
+@@ -3347,12 +3347,12 @@
if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
if (item.parent != this) return;
@@ -44349,7 +44971,7 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (selection != null) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
-@@ -3299,12 +3299,12 @@
+@@ -3370,12 +3370,12 @@
* The fix is to queue a resize event for each child to
* force the position to be corrected.
*/
@@ -44366,9 +44988,9 @@ diff -ur x86/org/eclipse/swt/widgets/Tree.java x86_64/org/eclipse/swt/widgets/Tr
if (widget != 0) OS.gtk_widget_queue_resize (widget);
temp = OS.g_list_next (temp);
}
-diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/Widget.java
---- x86/org/eclipse/swt/widgets/Widget.java 2009-06-24 21:13:58.000000000 -0400
-+++ x86_64/org/eclipse/swt/widgets/Widget.java 2009-02-11 17:43:50.000000000 -0500
+diff -urN x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/Widget.java
+--- x86/org/eclipse/swt/widgets/Widget.java 2009-05-29 17:30:04.000000000 -0400
++++ x86_64/org/eclipse/swt/widgets/Widget.java 2009-09-17 08:48:24.000000000 -0400
@@ -54,7 +54,7 @@
* platforms and should never be accessed from application code.
* </p>
@@ -44378,7 +45000,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
int style, state;
Display display;
EventTable eventTable;
-@@ -265,7 +265,7 @@
+@@ -269,7 +269,7 @@
addListener (SWT.Dispose, typedListener);
}
@@ -44387,7 +45009,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -281,7 +281,7 @@
+@@ -285,7 +285,7 @@
return style;
}
@@ -44396,7 +45018,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -402,7 +402,7 @@
+@@ -406,7 +406,7 @@
}
void destroyWidget () {
@@ -44405,7 +45027,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
OS.gtk_widget_destroy (topHandle);
-@@ -596,253 +596,253 @@
+@@ -600,269 +600,269 @@
}
@@ -44454,6 +45076,11 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
+-int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {
++long /*int*/ gtk_day_selected_double_click (long /*int*/ widget) {
+ return 0;
+ }
+
-int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) {
+long /*int*/ gtk_delete_event (long /*int*/ widget, long /*int*/ event) {
return 0;
@@ -44608,6 +45235,16 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
+-int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
++long /*int*/ gtk_row_deleted (long /*int*/ model, long /*int*/ path) {
+ return 0;
+ }
+
+-int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
++long /*int*/ gtk_row_inserted (long /*int*/ model, long /*int*/ path, long /*int*/ iter) {
+ return 0;
+ }
+
-int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) {
+long /*int*/ gtk_scroll_child (long /*int*/ widget, long /*int*/ scrollType, long /*int*/ horizontal) {
return 0;
@@ -44638,6 +45275,11 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
+-int /*long*/ gtk_status_icon_popup_menu (int /*long*/ handle, int /*long*/ button, int /*long*/ activate_time) {
++long /*int*/ gtk_status_icon_popup_menu (long /*int*/ handle, long /*int*/ button, long /*int*/ activate_time) {
+ return 0;
+ }
+
-int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {
+long /*int*/ gtk_style_set (long /*int*/ widget, long /*int*/ previousStyle) {
return 0;
@@ -44722,7 +45364,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -850,11 +850,11 @@
+@@ -870,11 +870,11 @@
return display.filters (eventType);
}
@@ -44736,7 +45378,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return OS.Call (Display.oldFixedSizeAllocateProc, widget, allocationPtr);
}
-@@ -955,15 +955,15 @@
+@@ -973,15 +973,15 @@
return eventTable.hooks (eventType);
}
@@ -44755,7 +45397,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
if (!mnemonicMatch (mnemonicHandle, key)) return false;
OS.g_signal_handlers_block_matched (mnemonicHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, MNEMONIC_ACTIVATE);
boolean result = OS.gtk_widget_mnemonic_activate (mnemonicHandle, false);
-@@ -971,13 +971,13 @@
+@@ -989,13 +989,13 @@
return result;
}
@@ -44771,7 +45413,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
OS.gtk_widget_modify_style (handle, style);
}
-@@ -1120,11 +1120,11 @@
+@@ -1138,11 +1138,11 @@
eventTable.unhook (eventType, handler);
}
@@ -44785,7 +45427,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -1211,7 +1211,7 @@
+@@ -1229,7 +1229,7 @@
char [] sendIMKeyEvent (int type, GdkEventKey keyEvent, char [] chars) {
int index = 0, count = 0, state = 0;
@@ -44794,7 +45436,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
if (keyEvent == null) {
ptr = OS.gtk_get_current_event ();
if (ptr != 0) {
-@@ -1366,8 +1366,8 @@
+@@ -1384,8 +1384,8 @@
}
}
@@ -44805,8 +45447,8 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_NORMAL, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_ACTIVE, color);
OS.gtk_rc_style_set_fg (style, OS.GTK_STATE_PRELIGHT, color);
-@@ -1447,15 +1447,15 @@
- void setOrientation () {
+@@ -1473,15 +1473,15 @@
+ return false;
}
-int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
@@ -44824,7 +45466,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -1474,15 +1474,15 @@
+@@ -1500,15 +1500,15 @@
return getName () + " {" + string + "}";
}
@@ -44843,7 +45485,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
return 0;
}
-@@ -1490,7 +1490,7 @@
+@@ -1516,7 +1516,7 @@
return false;
}
@@ -44852,7 +45494,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
switch ((int)/*64*/user_data) {
case ACTIVATE: return gtk_activate (handle);
case CHANGED: return gtk_changed (handle);
-@@ -1513,13 +1513,13 @@
+@@ -1540,13 +1540,13 @@
}
}
@@ -44869,7 +45511,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
if (window != paintWindow) return 0;
return (state & OBSCURED) != 0 ? 1 : 0;
}
-@@ -1561,7 +1561,7 @@
+@@ -1589,7 +1589,7 @@
}
}
@@ -44878,7 +45520,7 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
switch ((int)/*64*/user_data) {
case DELETE_RANGE: return gtk_delete_range (handle, arg0, arg1);
case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1);
-@@ -1574,7 +1574,7 @@
+@@ -1604,7 +1604,7 @@
}
}
@@ -44887,23718 +45529,3 @@ diff -ur x86/org/eclipse/swt/widgets/Widget.java x86_64/org/eclipse/swt/widgets/
switch ((int)/*64*/user_data) {
case CHANGE_VALUE: return gtk_change_value (handle, arg0, arg1, arg2);
case EXPAND_COLLAPSE_CURSOR_ROW: return gtk_expand_collapse_cursor_row (handle, arg0, arg1, arg2);
-diff -ur x86/os.c x86_64/os.c
---- x86/os.c 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/os.c 2009-02-11 17:53:48.000000000 -0500
-@@ -21,7 +21,7 @@
-
- #ifndef NO_Call
- JNIEXPORT jint JNICALL OS_NATIVE(Call)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, Call_FUNC);
-@@ -33,7 +33,7 @@
-
- #ifndef NO_GDK_1EVENT_1TYPE
- JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GDK_1EVENT_1TYPE_FUNC);
-@@ -44,12 +44,12 @@
- #endif
-
- #ifndef NO_GDK_1EVENT_1WINDOW
--JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GDK_1EVENT_1WINDOW_FUNC);
-- rc = (jint)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
-+ rc = (jlong)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
- OS_NATIVE_EXIT(env, that, GDK_1EVENT_1WINDOW_FUNC);
- return rc;
- }
-@@ -80,12 +80,12 @@
- #endif
-
- #ifndef NO_GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
-- rc = (jint)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
-+ rc = (jlong)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
- return rc;
- }
-@@ -93,7 +93,7 @@
-
- #ifndef NO_GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING
- JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
- GTK_ACCEL_LABEL_SET_ACCEL_STRING((GtkAccelLabel *)arg0, (gchar *)arg1);
-@@ -102,24 +102,24 @@
- #endif
-
- #ifndef NO_GTK_1ENTRY_1IM_1CONTEXT
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
-- rc = (jint)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
-+ rc = (jlong)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_GTK_1SCROLLED_1WINDOW_1HSCROLLBAR
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC);
-- rc = (jint)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
-+ rc = (jlong)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC);
- return rc;
- }
-@@ -127,7 +127,7 @@
-
- #ifndef NO_GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING_FUNC);
-@@ -138,24 +138,24 @@
- #endif
-
- #ifndef NO_GTK_1SCROLLED_1WINDOW_1VSCROLLBAR
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC);
-- rc = (jint)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
-+ rc = (jlong)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
-- rc = (jint)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
-+ rc = (jlong)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
- return rc;
- }
-@@ -163,7 +163,7 @@
-
- #ifndef NO_GTK_1TOOLTIPS_1SET_1ACTIVE
- JNIEXPORT void JNICALL OS_NATIVE(GTK_1TOOLTIPS_1SET_1ACTIVE)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, GTK_1TOOLTIPS_1SET_1ACTIVE_FUNC);
- GTK_TOOLTIPS_SET_ACTIVE((GtkTooltips *)arg0, (GtkTooltipsData *)arg1);
-@@ -172,12 +172,12 @@
- #endif
-
- #ifndef NO_GTK_1TOOLTIPS_1TIP_1WINDOW
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1TOOLTIPS_1TIP_1WINDOW_FUNC);
-- rc = (jint)GTK_TOOLTIPS_TIP_WINDOW((GtkTooltips *)arg0);
-+ rc = (jlong)GTK_TOOLTIPS_TIP_WINDOW((GtkTooltips *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1TOOLTIPS_1TIP_1WINDOW_FUNC);
- return rc;
- }
-@@ -185,7 +185,7 @@
-
- #ifndef NO_GTK_1WIDGET_1HEIGHT
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1HEIGHT_FUNC);
-@@ -197,7 +197,7 @@
-
- #ifndef NO_GTK_1WIDGET_1REQUISITION_1HEIGHT
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
-@@ -209,7 +209,7 @@
-
- #ifndef NO_GTK_1WIDGET_1REQUISITION_1WIDTH
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
-@@ -221,7 +221,7 @@
-
- #ifndef NO_GTK_1WIDGET_1SET_1HEIGHT
- JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1HEIGHT)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1HEIGHT_FUNC);
- GTK_WIDGET_SET_HEIGHT((GtkWidget *)arg0, arg1);
-@@ -231,7 +231,7 @@
-
- #ifndef NO_GTK_1WIDGET_1SET_1WIDTH
- JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1WIDTH)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1WIDTH_FUNC);
- GTK_WIDGET_SET_WIDTH((GtkWidget *)arg0, arg1);
-@@ -241,7 +241,7 @@
-
- #ifndef NO_GTK_1WIDGET_1SET_1X
- JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1X)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1X_FUNC);
- GTK_WIDGET_SET_X((GtkWidget *)arg0, arg1);
-@@ -251,7 +251,7 @@
-
- #ifndef NO_GTK_1WIDGET_1SET_1Y
- JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1Y)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1Y_FUNC);
- GTK_WIDGET_SET_Y((GtkWidget *)arg0, arg1);
-@@ -261,7 +261,7 @@
-
- #ifndef NO_GTK_1WIDGET_1WIDTH
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1WIDTH_FUNC);
-@@ -272,12 +272,12 @@
- #endif
-
- #ifndef NO_GTK_1WIDGET_1WINDOW
--JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1WINDOW_FUNC);
-- rc = (jint)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
-+ rc = (jlong)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1WINDOW_FUNC);
- return rc;
- }
-@@ -285,7 +285,7 @@
-
- #ifndef NO_GTK_1WIDGET_1X
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1X_FUNC);
-@@ -297,7 +297,7 @@
-
- #ifndef NO_GTK_1WIDGET_1Y
- JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1Y)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1Y_FUNC);
-@@ -1017,7 +1017,7 @@
-
- #ifndef NO_X_1EVENT_1TYPE
- JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, X_1EVENT_1TYPE_FUNC);
-@@ -1028,12 +1028,12 @@
- #endif
-
- #ifndef NO_X_1EVENT_1WINDOW
--JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, X_1EVENT_1WINDOW_FUNC);
-- rc = (jint)X_EVENT_WINDOW((XAnyEvent *)arg0);
-+ rc = (jlong)X_EVENT_WINDOW((XAnyEvent *)arg0);
- OS_NATIVE_EXIT(env, that, X_1EVENT_1WINDOW_FUNC);
- return rc;
- }
-@@ -1041,7 +1041,7 @@
-
- #ifndef NO__1Call
- JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1Call_FUNC);
-@@ -1053,7 +1053,7 @@
-
- #ifndef NO__1FcConfigAppFontAddFile
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- jboolean rc = 0;
-@@ -1065,7 +1065,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint, jbyte *);
-+ typedef jboolean (*FPTR)(jlong, jbyte *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -1085,60 +1085,60 @@
- #endif
-
- #ifndef NO__1GDK_1DISPLAY
--JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1DISPLAY)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GDK_1DISPLAY)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GDK_1DISPLAY_FUNC);
-- rc = (jint)GDK_DISPLAY();
-+ rc = (jlong)GDK_DISPLAY();
- OS_NATIVE_EXIT(env, that, _1GDK_1DISPLAY_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GDK_1PIXMAP_1XID
--JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GDK_1PIXMAP_1XID_FUNC);
-- rc = (jint)GDK_PIXMAP_XID((GdkPixmap *)arg0);
-+ rc = (jlong)GDK_PIXMAP_XID((GdkPixmap *)arg0);
- OS_NATIVE_EXIT(env, that, _1GDK_1PIXMAP_1XID_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GDK_1ROOT_1PARENT
--JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1ROOT_1PARENT)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GDK_1ROOT_1PARENT)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GDK_1ROOT_1PARENT_FUNC);
-- rc = (jint)GDK_ROOT_PARENT();
-+ rc = (jlong)GDK_ROOT_PARENT();
- OS_NATIVE_EXIT(env, that, _1GDK_1ROOT_1PARENT_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GDK_1TYPE_1COLOR
--JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1COLOR_FUNC);
-- rc = (jint)GDK_TYPE_COLOR;
-+ rc = (jlong)GDK_TYPE_COLOR;
- OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1COLOR_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GDK_1TYPE_1PIXBUF
--JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
-- rc = (jint)GDK_TYPE_PIXBUF;
-+ rc = (jlong)GDK_TYPE_PIXBUF;
- OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
- return rc;
- }
-@@ -1146,7 +1146,7 @@
-
- #ifndef NO__1GTK_1IS_1BUTTON
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1BUTTON)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1BUTTON_FUNC);
-@@ -1158,7 +1158,7 @@
-
- #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1PIXBUF
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
-@@ -1170,7 +1170,7 @@
-
- #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TEXT
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
-@@ -1182,7 +1182,7 @@
-
- #ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TOGGLE
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
-@@ -1194,7 +1194,7 @@
-
- #ifndef NO__1GTK_1IS_1CONTAINER
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CONTAINER)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CONTAINER_FUNC);
-@@ -1206,7 +1206,7 @@
-
- #ifndef NO__1GTK_1IS_1IMAGE_1MENU_1ITEM
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
-@@ -1218,7 +1218,7 @@
-
- #ifndef NO__1GTK_1IS_1MENU_1ITEM
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1MENU_1ITEM)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
-@@ -1230,7 +1230,7 @@
-
- #ifndef NO__1GTK_1IS_1PLUG
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1PLUG)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1PLUG_FUNC);
-@@ -1242,7 +1242,7 @@
-
- #ifndef NO__1GTK_1IS_1WINDOW
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1WINDOW)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1IS_1WINDOW_FUNC);
-@@ -1253,96 +1253,96 @@
- #endif
-
- #ifndef NO__1GTK_1STOCK_1CANCEL
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
-- rc = (jint)GTK_STOCK_CANCEL;
-+ rc = (jlong)GTK_STOCK_CANCEL;
- OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1STOCK_1OK
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1OK_FUNC);
-- rc = (jint)GTK_STOCK_OK;
-+ rc = (jlong)GTK_STOCK_OK;
- OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1OK_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
-- rc = (jint)GTK_TYPE_CELL_RENDERER_PIXBUF;
-+ rc = (jlong)GTK_TYPE_CELL_RENDERER_PIXBUF;
- OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TEXT
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
-- rc = (jint)GTK_TYPE_CELL_RENDERER_TEXT;
-+ rc = (jlong)GTK_TYPE_CELL_RENDERER_TEXT;
- OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
-- rc = (jint)GTK_TYPE_CELL_RENDERER_TOGGLE;
-+ rc = (jlong)GTK_TYPE_CELL_RENDERER_TOGGLE;
- OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1TYPE_1FIXED
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1FIXED_FUNC);
-- rc = (jint)GTK_TYPE_FIXED;
-+ rc = (jlong)GTK_TYPE_FIXED;
- OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1FIXED_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1TYPE_1MENU
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1MENU_FUNC);
-- rc = (jint)GTK_TYPE_MENU;
-+ rc = (jlong)GTK_TYPE_MENU;
- OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1MENU_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1GTK_1TYPE_1WIDGET
--JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
-- rc = (jint)GTK_TYPE_WIDGET;
-+ rc = (jlong)GTK_TYPE_WIDGET;
- OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
- return rc;
- }
-@@ -1350,7 +1350,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1FLAGS
- JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1FLAGS)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1FLAGS_FUNC);
-@@ -1362,7 +1362,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1HAS_1DEFAULT
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1DEFAULT)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1HAS_1DEFAULT_FUNC);
-@@ -1374,7 +1374,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1HAS_1FOCUS
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1FOCUS)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1HAS_1FOCUS_FUNC);
-@@ -1386,7 +1386,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1IS_1SENSITIVE
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1IS_1SENSITIVE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1IS_1SENSITIVE_FUNC);
-@@ -1398,7 +1398,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1MAPPED
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1MAPPED)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1MAPPED_FUNC);
-@@ -1410,7 +1410,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1SENSITIVE
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1SENSITIVE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SENSITIVE_FUNC);
-@@ -1422,7 +1422,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1SET_1FLAGS
- JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
- GTK_WIDGET_SET_FLAGS(arg0, arg1);
-@@ -1432,7 +1432,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1STATE
- JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1STATE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1STATE_FUNC);
-@@ -1444,7 +1444,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1UNSET_1FLAGS
- JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
- GTK_WIDGET_UNSET_FLAGS(arg0, arg1);
-@@ -1454,7 +1454,7 @@
-
- #ifndef NO__1GTK_1WIDGET_1VISIBLE
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1VISIBLE)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1VISIBLE_FUNC);
-@@ -1465,84 +1465,84 @@
- #endif
-
- #ifndef NO__1G_1OBJECT_1CLASS
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1CLASS_FUNC);
-- rc = (jint)G_OBJECT_CLASS(arg0);
-+ rc = (jlong)G_OBJECT_CLASS(arg0);
- OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1CLASS_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1G_1OBJECT_1GET_1CLASS
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
-- rc = (jint)G_OBJECT_GET_CLASS(arg0);
-+ rc = (jlong)G_OBJECT_GET_CLASS(arg0);
- OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1G_1OBJECT_1TYPE
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_FUNC);
-- rc = (jint)G_OBJECT_TYPE(arg0);
-+ rc = (jlong)G_OBJECT_TYPE(arg0);
- OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1G_1OBJECT_1TYPE_1NAME
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
-- rc = (jint)G_OBJECT_TYPE_NAME(arg0);
-+ rc = (jlong)G_OBJECT_TYPE_NAME(arg0);
- OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1G_1TYPE_1BOOLEAN
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1TYPE_1BOOLEAN_FUNC);
-- rc = (jint)G_TYPE_BOOLEAN;
-+ rc = (jlong)G_TYPE_BOOLEAN;
- OS_NATIVE_EXIT(env, that, _1G_1TYPE_1BOOLEAN_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1G_1TYPE_1INT
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1INT)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1TYPE_1INT)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1TYPE_1INT_FUNC);
-- rc = (jint)G_TYPE_INT;
-+ rc = (jlong)G_TYPE_INT;
- OS_NATIVE_EXIT(env, that, _1G_1TYPE_1INT_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1G_1TYPE_1STRING
--JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1G_1TYPE_1STRING_FUNC);
-- rc = (jint)G_TYPE_STRING;
-+ rc = (jlong)G_TYPE_STRING;
- OS_NATIVE_EXIT(env, that, _1G_1TYPE_1STRING_FUNC);
- return rc;
- }
-@@ -1561,12 +1561,12 @@
- #endif
-
- #ifndef NO__1PANGO_1TYPE_1FONT_1DESCRIPTION
--JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
-- rc = (jint)PANGO_TYPE_FONT_DESCRIPTION;
-+ rc = (jlong)PANGO_TYPE_FONT_DESCRIPTION;
- OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
- return rc;
- }
-@@ -1574,7 +1574,7 @@
-
- #ifndef NO__1XCheckIfEvent
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC);
-@@ -1586,7 +1586,7 @@
-
- #ifndef NO__1XCheckMaskEvent
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckMaskEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1XCheckMaskEvent_FUNC);
-@@ -1598,7 +1598,7 @@
-
- #ifndef NO__1XCheckWindowEvent
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckWindowEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1XCheckWindowEvent_FUNC);
-@@ -1609,12 +1609,12 @@
- #endif
-
- #ifndef NO__1XDefaultRootWindow
--JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultRootWindow)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XDefaultRootWindow)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XDefaultRootWindow_FUNC);
-- rc = (jint)XDefaultRootWindow((Display *)arg0);
-+ rc = (jlong)XDefaultRootWindow((Display *)arg0);
- OS_NATIVE_EXIT(env, that, _1XDefaultRootWindow_FUNC);
- return rc;
- }
-@@ -1622,7 +1622,7 @@
-
- #ifndef NO__1XDefaultScreen
- JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XDefaultScreen_FUNC);
-@@ -1634,7 +1634,7 @@
-
- #ifndef NO__1XFlush
- JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1XFlush_FUNC);
- XFlush((Display *)arg0);
-@@ -1644,7 +1644,7 @@
-
- #ifndef NO__1XFree
- JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1XFree_FUNC);
- XFree((void *)arg0);
-@@ -1653,26 +1653,26 @@
- #endif
-
- #ifndef NO__1XGetSelectionOwner
--JNIEXPORT jint JNICALL OS_NATIVE(_1XGetSelectionOwner)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XGetSelectionOwner)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XGetSelectionOwner_FUNC);
-- rc = (jint)XGetSelectionOwner((Display *)arg0, (Atom)arg1);
-+ rc = (jlong)XGetSelectionOwner((Display *)arg0, (Atom)arg1);
- OS_NATIVE_EXIT(env, that, _1XGetSelectionOwner_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1XInternAtom
--JNIEXPORT jint JNICALL OS_NATIVE(_1XInternAtom)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jboolean arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XInternAtom)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jboolean arg2)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XInternAtom_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)XInternAtom((Display *)arg0, (char *)lparg1, (Bool)arg2);
-+ rc = (jlong)XInternAtom((Display *)arg0, (char *)lparg1, (Bool)arg2);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1XInternAtom_FUNC);
-@@ -1682,7 +1682,7 @@
-
- #ifndef NO__1XKeysymToKeycode
- JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XKeysymToKeycode_FUNC);
-@@ -1693,14 +1693,14 @@
- #endif
-
- #ifndef NO__1XListProperties
--JNIEXPORT jint JNICALL OS_NATIVE(_1XListProperties)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XListProperties)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2)
- {
- jint *lparg2=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XListProperties_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-- rc = (jint)XListProperties((Display *)arg0, (Window)arg1, (int *)lparg2);
-+ rc = (jlong)XListProperties((Display *)arg0, (Window)arg1, (int *)lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1XListProperties_FUNC);
-@@ -1710,10 +1710,10 @@
-
- #ifndef NO__1XQueryPointer
- JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
- jint *lparg4=NULL;
- jint *lparg5=NULL;
- jint *lparg6=NULL;
-@@ -1721,8 +1721,8 @@
- jint *lparg8=NULL;
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XQueryPointer_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 (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-@@ -1735,8 +1735,8 @@
- if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
- if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1XQueryPointer_FUNC);
- return rc;
- }
-@@ -1744,24 +1744,24 @@
-
- #ifndef NO__1XQueryTree
- JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryTree)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jintArray arg5)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XQueryTree_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;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
- rc = (jint)XQueryTree((Display *)arg0, (Window)arg1, (Window *)lparg2, (Window *)lparg3, (Window **)lparg4, (unsigned int *)lparg5);
- fail:
- if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1XQueryTree_FUNC);
- return rc;
- }
-@@ -1769,7 +1769,7 @@
-
- #ifndef NO__1XReconfigureWMWindow
- JNIEXPORT jint JNICALL OS_NATIVE(_1XReconfigureWMWindow)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4)
- {
- XWindowChanges _arg4, *lparg4=NULL;
- jint rc = 0;
-@@ -1784,7 +1784,7 @@
-
- #ifndef NO__1XRenderComposite
- JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
- {
- OS_NATIVE_ENTER(env, that, _1XRenderComposite_FUNC);
- /*
-@@ -1793,7 +1793,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
-+ typedef void (*FPTR)(jlong, jint, jlong, jlong, jlong, jint, jint, jint, jint, jint, jint, jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderComposite_LIB, RTLD_LAZY);
-@@ -1809,20 +1809,20 @@
- #endif
-
- #ifndef NO__1XRenderCreatePicture
--JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderCreatePicture)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XRenderCreatePicture)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jobject arg4)
- {
- XRenderPictureAttributes _arg4, *lparg4=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XRenderCreatePicture_FUNC);
- if (arg4) if ((lparg4 = getXRenderPictureAttributesFields(env, arg4, &_arg4)) == NULL) goto fail;
- /*
-- rc = (jint)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
-+ rc = (jlong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, jint, jint, jint, XRenderPictureAttributes *);
-+ typedef jlong (*FPTR)(jlong, jlong, jlong, jlong, XRenderPictureAttributes *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -1831,7 +1831,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, arg1, arg2, arg3, lparg4);
-+ rc = (jlong)(*fptr)(arg0, arg1, arg2, arg3, lparg4);
- }
- }
- fail:
-@@ -1841,18 +1841,18 @@
- #endif
-
- #ifndef NO__1XRenderFindStandardFormat
--JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XRenderFindStandardFormat_FUNC);
- /*
-- rc = (jint)XRenderFindStandardFormat(arg0, arg1);
-+ rc = (jlong)XRenderFindStandardFormat(arg0, arg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, jint);
-+ typedef jlong (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -1861,7 +1861,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, arg1);
-+ rc = (jlong)(*fptr)(arg0, arg1);
- }
- }
- OS_NATIVE_EXIT(env, that, _1XRenderFindStandardFormat_FUNC);
-@@ -1870,18 +1870,18 @@
- #endif
-
- #ifndef NO__1XRenderFindVisualFormat
--JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XRenderFindVisualFormat_FUNC);
- /*
-- rc = (jint)XRenderFindVisualFormat(arg0, arg1);
-+ rc = (jlong)XRenderFindVisualFormat(arg0, arg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, jint);
-+ typedef jlong (*FPTR)(jlong, jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -1890,7 +1890,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, arg1);
-+ rc = (jlong)(*fptr)(arg0, arg1);
- }
- }
- OS_NATIVE_EXIT(env, that, _1XRenderFindVisualFormat_FUNC);
-@@ -1900,7 +1900,7 @@
-
- #ifndef NO__1XRenderFreePicture
- JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1XRenderFreePicture_FUNC);
- /*
-@@ -1909,7 +1909,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderFreePicture_LIB, RTLD_LAZY);
-@@ -1926,7 +1926,7 @@
-
- #ifndef NO__1XRenderQueryExtension
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -1940,7 +1940,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint, jint *, jint *);
-+ typedef jboolean (*FPTR)(jlong, jint *, jint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -1962,7 +1962,7 @@
-
- #ifndef NO__1XRenderQueryVersion
- JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -1976,7 +1976,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, jint *, jint *);
-+ typedef jint (*FPTR)(jlong, jint *, jint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -1998,7 +1998,7 @@
-
- #ifndef NO__1XRenderSetPictureClipRectangles
- JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
- {
- jshort *lparg4=NULL;
- OS_NATIVE_ENTER(env, that, _1XRenderSetPictureClipRectangles_FUNC);
-@@ -2009,7 +2009,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, jint, jint, jshort *, jint);
-+ typedef void (*FPTR)(jlong, jlong, jint, jint, jshort *, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderSetPictureClipRectangles_LIB, RTLD_LAZY);
-@@ -2028,7 +2028,7 @@
-
- #ifndef NO__1XRenderSetPictureTransform
- JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2)
- {
- jint *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1XRenderSetPictureTransform_FUNC);
-@@ -2039,7 +2039,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, jint *);
-+ typedef void (*FPTR)(jlong, jlong, jint *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderSetPictureTransform_LIB, RTLD_LAZY);
-@@ -2058,7 +2058,7 @@
-
- #ifndef NO__1XSendEvent
- JNIEXPORT jint JNICALL OS_NATIVE(_1XSendEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jlong arg3, jlong arg4)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XSendEvent_FUNC);
-@@ -2069,24 +2069,24 @@
- #endif
-
- #ifndef NO__1XSetErrorHandler
--JNIEXPORT jint JNICALL OS_NATIVE(_1XSetErrorHandler)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XSetErrorHandler)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XSetErrorHandler_FUNC);
-- rc = (jint)XSetErrorHandler((XErrorHandler)arg0);
-+ rc = (jlong)XSetErrorHandler((XErrorHandler)arg0);
- OS_NATIVE_EXIT(env, that, _1XSetErrorHandler_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1XSetIOErrorHandler
--JNIEXPORT jint JNICALL OS_NATIVE(_1XSetIOErrorHandler)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XSetIOErrorHandler)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XSetIOErrorHandler_FUNC);
-- rc = (jint)XSetIOErrorHandler((XIOErrorHandler)arg0);
-+ rc = (jlong)XSetIOErrorHandler((XIOErrorHandler)arg0);
- OS_NATIVE_EXIT(env, that, _1XSetIOErrorHandler_FUNC);
- return rc;
- }
-@@ -2094,7 +2094,7 @@
-
- #ifndef NO__1XSetInputFocus
- JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XSetInputFocus_FUNC);
-@@ -2106,7 +2106,7 @@
-
- #ifndef NO__1XSetTransientForHint
- JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XSetTransientForHint_FUNC);
-@@ -2117,12 +2117,12 @@
- #endif
-
- #ifndef NO__1XSynchronize
--JNIEXPORT jint JNICALL OS_NATIVE(_1XSynchronize)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1XSynchronize)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1XSynchronize_FUNC);
-- rc = (jint)XSynchronize((Display *)arg0, arg1);
-+ rc = (jlong)XSynchronize((Display *)arg0, arg1);
- OS_NATIVE_EXIT(env, that, _1XSynchronize_FUNC);
- return rc;
- }
-@@ -2130,7 +2130,7 @@
-
- #ifndef NO__1XTestFakeButtonEvent
- JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeButtonEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2, jlong arg3)
- {
- OS_NATIVE_ENTER(env, that, _1XTestFakeButtonEvent_FUNC);
- XTestFakeButtonEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
-@@ -2140,7 +2140,7 @@
-
- #ifndef NO__1XTestFakeKeyEvent
- JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2, jlong arg3)
- {
- OS_NATIVE_ENTER(env, that, _1XTestFakeKeyEvent_FUNC);
- XTestFakeKeyEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
-@@ -2150,7 +2150,7 @@
-
- #ifndef NO__1XTestFakeMotionEvent
- JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeMotionEvent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4)
- {
- OS_NATIVE_ENTER(env, that, _1XTestFakeMotionEvent_FUNC);
- XTestFakeMotionEvent((Display *)arg0, arg1, arg2, arg3, (unsigned long)arg4);
-@@ -2160,7 +2160,7 @@
-
- #ifndef NO__1XWarpPointer
- JNIEXPORT jint JNICALL OS_NATIVE(_1XWarpPointer)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1XWarpPointer_FUNC);
-@@ -2172,7 +2172,7 @@
-
- #ifndef NO__1atk_1object_1add_1relationship
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1atk_1object_1add_1relationship_FUNC);
-@@ -2200,12 +2200,12 @@
- #endif
-
- #ifndef NO__1call
--JNIEXPORT jint JNICALL OS_NATIVE(_1call)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1call)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1call_FUNC);
-- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- OS_NATIVE_EXIT(env, that, _1call_FUNC);
- return rc;
- }
-@@ -2213,7 +2213,7 @@
-
- #ifndef NO__1dlclose
- JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1dlclose_FUNC);
-@@ -2224,14 +2224,14 @@
- #endif
-
- #ifndef NO__1dlopen
--JNIEXPORT jint JNICALL OS_NATIVE(_1dlopen)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1dlopen)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1dlopen_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)dlopen((const char *)lparg0, arg1);
-+ rc = (jlong)dlopen((const char *)lparg0, arg1);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1dlopen_FUNC);
-@@ -2240,14 +2240,14 @@
- #endif
-
- #ifndef NO__1dlsym
--JNIEXPORT jint JNICALL OS_NATIVE(_1dlsym)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1dlsym)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1dlsym_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)dlsym((void *)arg0, (const char *)lparg1);
-+ rc = (jlong)dlsym((void *)arg0, (const char *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1dlsym_FUNC);
-@@ -2256,24 +2256,24 @@
- #endif
-
- #ifndef NO__1g_1cclosure_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1cclosure_1new)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1cclosure_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1cclosure_1new_FUNC);
-- rc = (jint)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
-+ rc = (jlong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
- OS_NATIVE_EXIT(env, that, _1g_1cclosure_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1closure_1ref
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1closure_1ref)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1closure_1ref)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1closure_1ref_FUNC);
-- rc = (jint)g_closure_ref((GClosure *)arg0);
-+ rc = (jlong)g_closure_ref((GClosure *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1closure_1ref_FUNC);
- return rc;
- }
-@@ -2281,7 +2281,7 @@
-
- #ifndef NO__1g_1closure_1unref
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1closure_1unref_FUNC);
- g_closure_unref((GClosure *)arg0);
-@@ -2290,79 +2290,79 @@
- #endif
-
- #ifndef NO__1g_1filename_1from_1uri
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2)
- {
-- jint *lparg1=NULL;
-- jint *lparg2=NULL;
-- jint rc = 0;
-+ jlong *lparg1=NULL;
-+ jlong *lparg2=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_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 = (jint)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ rc = (jlong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1uri_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1filename_1from_1utf8
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_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 = (jint)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ rc = (jlong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
- fail:
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1utf8_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1filename_1to_1uri
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-- jint rc = 0;
-+ jlong *lparg2=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-- rc = (jint)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ rc = (jlong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1uri_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1filename_1to_1utf8
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_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 = (jint)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ rc = (jlong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
- fail:
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1utf8_FUNC);
- return rc;
- }
-@@ -2370,7 +2370,7 @@
-
- #ifndef NO__1g_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1free_FUNC);
- g_free((gpointer)arg0);
-@@ -2380,7 +2380,7 @@
-
- #ifndef NO__1g_1idle_1add
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1idle_1add_FUNC);
-@@ -2391,24 +2391,24 @@
- #endif
-
- #ifndef NO__1g_1list_1append
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1append)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1append)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
-- rc = (jint)g_list_append((GList *)arg0, (gpointer)arg1);
-+ rc = (jlong)g_list_append((GList *)arg0, (gpointer)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1data
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1data)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1data)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1data_FUNC);
-- rc = (jint)g_list_data((GList *)arg0);
-+ rc = (jlong)g_list_data((GList *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1list_1data_FUNC);
- return rc;
- }
-@@ -2416,7 +2416,7 @@
-
- #ifndef NO__1g_1list_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
- g_list_free((GList *)arg0);
-@@ -2426,7 +2426,7 @@
-
- #ifndef NO__1g_1list_1free_11
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1list_1free_11_FUNC);
- g_list_free_1((GList *)arg0);
-@@ -2436,7 +2436,7 @@
-
- #ifndef NO__1g_1list_1length
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1length_FUNC);
-@@ -2447,84 +2447,84 @@
- #endif
-
- #ifndef NO__1g_1list_1next
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1next)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1next)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
-- rc = (jint)g_list_next(arg0);
-+ rc = (jlong)g_list_next(arg0);
- OS_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1nth
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1nth)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1nth)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1nth_FUNC);
-- rc = (jint)g_list_nth((GList *)arg0, (guint)arg1);
-+ rc = (jlong)g_list_nth((GList *)arg0, (guint)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1list_1nth_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1nth_1data
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1nth_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1nth_1data)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1nth_1data_FUNC);
-- rc = (jint)g_list_nth_data((GList *)arg0, (guint)arg1);
-+ rc = (jlong)g_list_nth_data((GList *)arg0, (guint)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1list_1nth_1data_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1prepend
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1prepend)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1prepend)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1prepend_FUNC);
-- rc = (jint)g_list_prepend((GList *)arg0, (gpointer)arg1);
-+ rc = (jlong)g_list_prepend((GList *)arg0, (gpointer)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1list_1prepend_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1previous
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1previous)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1previous)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1previous_FUNC);
-- rc = (jint)g_list_previous(arg0);
-+ rc = (jlong)g_list_previous(arg0);
- OS_NATIVE_EXIT(env, that, _1g_1list_1previous_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1remove_1link
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1remove_1link)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1remove_1link)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1remove_1link_FUNC);
-- rc = (jint)g_list_remove_link((GList *)arg0, (GList *)arg1);
-+ rc = (jlong)g_list_remove_link((GList *)arg0, (GList *)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1list_1remove_1link_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1list_1reverse
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1reverse)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1list_1reverse)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1list_1reverse_FUNC);
-- rc = (jint)g_list_reverse((GList *)arg0);
-+ rc = (jlong)g_list_reverse((GList *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1list_1reverse_FUNC);
- return rc;
- }
-@@ -2532,7 +2532,7 @@
-
- #ifndef NO__1g_1list_1set_1next
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1g_1list_1set_1next_FUNC);
- g_list_set_next((GList *)arg0, (GList *)arg1);
-@@ -2542,7 +2542,7 @@
-
- #ifndef NO__1g_1list_1set_1previous
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1g_1list_1set_1previous_FUNC);
- g_list_set_previous((GList *)arg0, (GList *)arg1);
-@@ -2551,44 +2551,44 @@
- #endif
-
- #ifndef NO__1g_1locale_1from_1utf8
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1locale_1from_1utf8)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1locale_1from_1utf8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1locale_1from_1utf8_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 = (jint)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ rc = (jlong)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
- fail:
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1g_1locale_1from_1utf8_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1locale_1to_1utf8
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1locale_1to_1utf8)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1locale_1to_1utf8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1locale_1to_1utf8_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 = (jint)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ rc = (jlong)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
- fail:
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1g_1locale_1to_1utf8_FUNC);
- return rc;
- }
-@@ -2596,7 +2596,7 @@
-
- #ifndef NO__1g_1log_1default_1handler
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3)
- {
- OS_NATIVE_ENTER(env, that, _1g_1log_1default_1handler_FUNC);
- g_log_default_handler((gchar *)arg0, (GLogLevelFlags)arg1, (gchar *)arg2, (gpointer)arg3);
-@@ -2620,7 +2620,7 @@
-
- #ifndef NO__1g_1log_1set_1handler
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1log_1set_1handler)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jlong arg2, jlong arg3)
- {
- jbyte *lparg0=NULL;
- jint rc = 0;
-@@ -2636,7 +2636,7 @@
-
- #ifndef NO__1g_1main_1context_1acquire
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1acquire_FUNC);
-@@ -2648,7 +2648,7 @@
-
- #ifndef NO__1g_1main_1context_1check
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1check_FUNC);
-@@ -2659,24 +2659,24 @@
- #endif
-
- #ifndef NO__1g_1main_1context_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1main_1context_1default)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1default_FUNC);
-- rc = (jint)g_main_context_default();
-+ rc = (jlong)g_main_context_default();
- OS_NATIVE_EXIT(env, that, _1g_1main_1context_1default_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1main_1context_1get_1poll_1func
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
-- rc = (jint)g_main_context_get_poll_func((GMainContext *)arg0);
-+ rc = (jlong)g_main_context_get_poll_func((GMainContext *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
- return rc;
- }
-@@ -2684,7 +2684,7 @@
-
- #ifndef NO__1g_1main_1context_1iteration
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1iteration_FUNC);
-@@ -2696,7 +2696,7 @@
-
- #ifndef NO__1g_1main_1context_1pending
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1pending)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1pending_FUNC);
-@@ -2708,7 +2708,7 @@
-
- #ifndef NO__1g_1main_1context_1prepare
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1)
- {
- jint *lparg1=NULL;
- jboolean rc = 0;
-@@ -2724,7 +2724,7 @@
-
- #ifndef NO__1g_1main_1context_1query
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1query)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jlong arg3, jint arg4)
- {
- jint *lparg2=NULL;
- jint rc = 0;
-@@ -2740,7 +2740,7 @@
-
- #ifndef NO__1g_1main_1context_1release
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1main_1context_1release_FUNC);
- g_main_context_release((GMainContext *)arg0);
-@@ -2749,12 +2749,12 @@
- #endif
-
- #ifndef NO__1g_1malloc
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1malloc)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1malloc)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1malloc_FUNC);
-- rc = (jint)g_malloc((gulong)arg0);
-+ rc = (jlong)g_malloc((gulong)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1malloc_FUNC);
- return rc;
- }
-@@ -2762,7 +2762,7 @@
-
- #ifndef NO__1g_1object_1get
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintArray arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -2778,117 +2778,117 @@
- #endif
-
- #ifndef NO__1g_1object_1get_1qdata
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1object_1get_1qdata_FUNC);
-- rc = (jint)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
-+ rc = (jlong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1object_1get_1qdata_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1object_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1new)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1object_1new_FUNC);
-- rc = (jint)g_object_new((GType)arg0, (const gchar *)arg1);
-+ rc = (jlong)g_object_new((GType)arg0, (const gchar *)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1object_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1object_1ref
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1ref)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1object_1ref)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1object_1ref_FUNC);
-- rc = (jint)g_object_ref((gpointer)arg0);
-+ rc = (jlong)g_object_ref((gpointer)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1object_1ref_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1g_1object_1set__I_3BFI
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jfloat arg2, jint arg3)
-+#ifndef NO__1g_1object_1set__J_3BFJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jfloat arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1object_1set__I_3BII
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+#ifndef NO__1g_1object_1set__J_3BIJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1object_1set__I_3BJI
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jlong arg2, jint arg3)
-+#ifndef NO__1g_1object_1set__J_3BJJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jint arg3)
-+#ifndef NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
- GdkColor _arg2, *lparg2=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
- g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
- fail:
- if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1object_1set__I_3BZI
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jboolean arg2, jint arg3)
-+#ifndef NO__1g_1object_1set__J_3BZJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jboolean arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC);
- }
- #endif
-
- #ifndef NO__1g_1object_1set_1qdata
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1g_1object_1set_1qdata_FUNC);
- g_object_set_qdata((GObject *)arg0, (GQuark)arg1, (gpointer)arg2);
-@@ -2898,7 +2898,7 @@
-
- #ifndef NO__1g_1object_1unref
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1unref)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
- g_object_unref((gpointer)arg0);
-@@ -2937,12 +2937,12 @@
- #endif
-
- #ifndef NO__1g_1signal_1add_1emission_1hook
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
-+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
-- rc = (jint)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
-+ rc = (jlong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
- OS_NATIVE_EXIT(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
- return rc;
- }
-@@ -2950,7 +2950,7 @@
-
- #ifndef NO__1g_1signal_1connect
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
- jint rc = 0;
-@@ -2966,7 +2966,7 @@
-
- #ifndef NO__1g_1signal_1connect_1after
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1after)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
- jint rc = 0;
-@@ -2982,7 +2982,7 @@
-
- #ifndef NO__1g_1signal_1connect_1closure
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jboolean arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jboolean arg3)
- {
- jbyte *lparg1=NULL;
- jint rc = 0;
-@@ -2998,7 +2998,7 @@
-
- #ifndef NO__1g_1signal_1connect_1closure_1by_1id
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlong arg3, jboolean arg4)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
-@@ -3008,68 +3008,68 @@
- }
- #endif
-
--#ifndef NO__1g_1signal_1emit_1by_1name__I_3B
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+#ifndef NO__1g_1signal_1emit_1by_1name__J_3B
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1signal_1emit_1by_1name__I_3BI
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+#ifndef NO__1g_1signal_1emit_1by_1name__J_3BJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1signal_1emit_1by_1name__I_3BII
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+#ifndef NO__1g_1signal_1emit_1by_1name__J_3BJJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
- }
- #endif
-
--#ifndef NO__1g_1signal_1emit_1by_1name__I_3B_3B
--JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
-+#ifndef NO__1g_1signal_1emit_1by_1name__J_3B_3B
-+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-- OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
-- OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
- }
- #endif
-
- #ifndef NO__1g_1signal_1handler_1disconnect
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1disconnect_FUNC);
- g_signal_handler_disconnect((gpointer)arg0, (gulong)arg1);
-@@ -3079,7 +3079,7 @@
-
- #ifndef NO__1g_1signal_1handlers_1block_1matched
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
-@@ -3091,7 +3091,7 @@
-
- #ifndef NO__1g_1signal_1handlers_1disconnect_1matched
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1disconnect_1matched)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1disconnect_1matched_FUNC);
-@@ -3103,7 +3103,7 @@
-
- #ifndef NO__1g_1signal_1handlers_1unblock_1matched
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
-@@ -3115,7 +3115,7 @@
-
- #ifndef NO__1g_1signal_1lookup
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1lookup)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1)
- {
- jbyte *lparg0=NULL;
- jint rc = 0;
-@@ -3131,7 +3131,7 @@
-
- #ifndef NO__1g_1signal_1remove_1emission_1hook
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
- g_signal_remove_emission_hook((guint)arg0, (gulong)arg1);
-@@ -3141,7 +3141,7 @@
-
- #ifndef NO__1g_1signal_1stop_1emission_1by_1name
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1stop_1emission_1by_1name)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
-@@ -3154,12 +3154,12 @@
- #endif
-
- #ifndef NO__1g_1slist_1data
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1data)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1slist_1data)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1slist_1data_FUNC);
-- rc = (jint)g_slist_data((GSList *)arg0);
-+ rc = (jlong)g_slist_data((GSList *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1slist_1data_FUNC);
- return rc;
- }
-@@ -3167,7 +3167,7 @@
-
- #ifndef NO__1g_1slist_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1slist_1free_FUNC);
- g_slist_free((GSList *)arg0);
-@@ -3177,7 +3177,7 @@
-
- #ifndef NO__1g_1slist_1length
- JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1slist_1length_FUNC);
-@@ -3188,12 +3188,12 @@
- #endif
-
- #ifndef NO__1g_1slist_1next
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1next)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1slist_1next)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1slist_1next_FUNC);
-- rc = (jint)g_slist_next((GSList *)arg0);
-+ rc = (jlong)g_slist_next((GSList *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1slist_1next_FUNC);
- return rc;
- }
-@@ -3201,7 +3201,7 @@
-
- #ifndef NO__1g_1source_1remove
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1source_1remove_FUNC);
-@@ -3213,7 +3213,7 @@
-
- #ifndef NO__1g_1strfreev
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1strfreev_FUNC);
- g_strfreev((gchar **)arg0);
-@@ -3223,15 +3223,15 @@
-
- #ifndef NO__1g_1strtod
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1strtod_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jdouble)g_strtod((const gchar *)arg0, (gchar **)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1g_1strtod_FUNC);
- return rc;
- }
-@@ -3239,7 +3239,7 @@
-
- #ifndef NO__1g_1thread_1init
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
- g_thread_init((GThreadFunctions *)arg0);
-@@ -3261,7 +3261,7 @@
-
- #ifndef NO__1g_1type_1add_1interface_1static
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1g_1type_1add_1interface_1static_FUNC);
- g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2);
-@@ -3270,38 +3270,38 @@
- #endif
-
- #ifndef NO__1g_1type_1class_1peek
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1class_1peek)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1class_1peek)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_FUNC);
-- rc = (jint)g_type_class_peek((GType)arg0);
-+ rc = (jlong)g_type_class_peek((GType)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1type_1class_1peek_1parent
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_1parent_FUNC);
-- rc = (jint)g_type_class_peek_parent((gpointer)arg0);
-+ rc = (jlong)g_type_class_peek_parent((gpointer)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_1parent_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1type_1from_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1from_1name)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1from_1name)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1from_1name_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)g_type_from_name((const gchar *)lparg0);
-+ rc = (jlong)g_type_from_name((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1from_1name_FUNC);
-@@ -3310,12 +3310,12 @@
- #endif
-
- #ifndef NO__1g_1type_1interface_1peek_1parent
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
-- rc = (jint)g_type_interface_peek_parent((gpointer)arg0);
-+ rc = (jlong)g_type_interface_peek_parent((gpointer)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
- return rc;
- }
-@@ -3323,7 +3323,7 @@
-
- #ifndef NO__1g_1type_1is_1a
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1is_1a_FUNC);
-@@ -3334,24 +3334,24 @@
- #endif
-
- #ifndef NO__1g_1type_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1name_FUNC);
-- rc = (jint)g_type_name((GType)arg0);
-+ rc = (jlong)g_type_name((GType)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1name_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1type_1parent
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1parent)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1parent)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1parent_FUNC);
-- rc = (jint)g_type_parent((GType)arg0);
-+ rc = (jlong)g_type_parent((GType)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1parent_FUNC);
- return rc;
- }
-@@ -3359,7 +3359,7 @@
-
- #ifndef NO__1g_1type_1query
- JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1g_1type_1query_FUNC);
- g_type_query((GType)arg0, (GTypeQuery *)arg1);
-@@ -3368,14 +3368,14 @@
- #endif
-
- #ifndef NO__1g_1type_1register_1static
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1register_1static)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1type_1register_1static)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1type_1register_1static_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
-+ rc = (jlong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1g_1type_1register_1static_FUNC);
-@@ -3384,14 +3384,14 @@
- #endif
-
- #ifndef NO__1g_1utf16_1to_1utf8
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
-- (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
-+ (JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
- jchar *lparg0=NULL;
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3403,11 +3403,11 @@
- #endif
- {
- if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- 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;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- }
-- rc = (jint)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
-+ rc = (jlong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
- fail:
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3418,9 +3418,9 @@
- } else
- #endif
- {
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, JNI_ABORT);
- }
- OS_NATIVE_EXIT(env, that, _1g_1utf16_1to_1utf8_FUNC);
-@@ -3429,50 +3429,50 @@
- #endif
-
- #ifndef NO__1g_1utf8_1offset_1to_1pointer
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC);
-- rc = (jint)g_utf8_offset_to_pointer((const gchar *)arg0, arg1);
-+ rc = (jlong)g_utf8_offset_to_pointer((const gchar *)arg0, arg1);
- OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1utf8_1pointer_1to_1offset
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
-- rc = (jint)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
-+ rc = (jlong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
- OS_NATIVE_EXIT(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1utf8_1strlen
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1strlen)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1strlen)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1utf8_1strlen_FUNC);
-- rc = (jint)g_utf8_strlen((const gchar *)arg0, arg1);
-+ rc = (jlong)g_utf8_strlen((const gchar *)arg0, arg1);
- OS_NATIVE_EXIT(env, that, _1g_1utf8_1strlen_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1g_1utf8_1to_1utf16__II_3I_3I_3I
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+#ifndef NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-- OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-@@ -3481,11 +3481,11 @@
- } else
- #endif
- {
-- 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;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- }
-- rc = (jint)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
-+ rc = (jlong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
- fail:
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3495,25 +3495,25 @@
- } else
- #endif
- {
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- }
-- OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+#ifndef NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
- jbyte *lparg0=NULL;
-- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-- jint rc = 0;
-- OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
-+ jlong *lparg2=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
-+ jlong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
- if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
-@@ -3524,11 +3524,11 @@
- #endif
- {
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- 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;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- }
-- rc = (jint)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
-+ rc = (jlong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
- fail:
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3539,34 +3539,34 @@
- } else
- #endif
- {
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
- }
-- OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1g_1value_1peek_1pointer
--JNIEXPORT jint JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1g_1value_1peek_1pointer_FUNC);
-- rc = (jint)g_value_peek_pointer((const GValue *)arg0);
-+ rc = (jlong)g_value_peek_pointer((const GValue *)arg0);
- OS_NATIVE_EXIT(env, that, _1g_1value_1peek_1pointer_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1atom_1intern
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1intern)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1atom_1intern)
- (JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3576,7 +3576,7 @@
- {
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- }
-- rc = (jint)gdk_atom_intern((const gchar *)lparg0, arg1);
-+ rc = (jlong)gdk_atom_intern((const gchar *)lparg0, arg1);
- fail:
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3592,12 +3592,12 @@
- #endif
-
- #ifndef NO__1gdk_1atom_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1atom_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1atom_1name_FUNC);
-- rc = (jint)gdk_atom_name((GdkAtom)arg0);
-+ rc = (jlong)gdk_atom_name((GdkAtom)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1atom_1name_FUNC);
- return rc;
- }
-@@ -3614,11 +3614,11 @@
- #endif
-
- #ifndef NO__1gdk_1bitmap_1create_1from_1data
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jint arg3)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3628,7 +3628,7 @@
- {
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- }
-- rc = (jint)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
-+ rc = (jlong)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
- fail:
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -3645,7 +3645,7 @@
-
- #ifndef NO__1gdk_1cairo_1region
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_FUNC);
- /*
-@@ -3654,7 +3654,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_cairo_region_LIB, RTLD_LAZY);
-@@ -3671,7 +3671,7 @@
-
- #ifndef NO__1gdk_1cairo_1set_1source_1color
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
-@@ -3682,7 +3682,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, GdkColor *);
-+ typedef void (*FPTR)(jlong, GdkColor *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_cairo_set_source_color_LIB, RTLD_LAZY);
-@@ -3701,7 +3701,7 @@
-
- #ifndef NO__1gdk_1color_1white
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1white)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- jboolean rc = 0;
-@@ -3717,7 +3717,7 @@
-
- #ifndef NO__1gdk_1colormap_1alloc_1color
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1colormap_1alloc_1color)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2, jboolean arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jboolean arg2, jboolean arg3)
- {
- GdkColor _arg1, *lparg1=NULL;
- jboolean rc = 0;
-@@ -3733,7 +3733,7 @@
-
- #ifndef NO__1gdk_1colormap_1free_1colors
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1free_1colors)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1free_1colors_FUNC);
-@@ -3745,12 +3745,12 @@
- #endif
-
- #ifndef NO__1gdk_1colormap_1get_1system
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1get_1system_FUNC);
-- rc = (jint)gdk_colormap_get_system();
-+ rc = (jlong)gdk_colormap_get_system();
- OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1get_1system_FUNC);
- return rc;
- }
-@@ -3758,7 +3758,7 @@
-
- #ifndef NO__1gdk_1colormap_1query_1color
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1query_1color)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1query_1color_FUNC);
-@@ -3772,7 +3772,7 @@
-
- #ifndef NO__1gdk_1cursor_1destroy
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1destroy_FUNC);
- gdk_cursor_destroy((GdkCursor *)arg0);
-@@ -3781,30 +3781,30 @@
- #endif
-
- #ifndef NO__1gdk_1cursor_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1cursor_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_FUNC);
-- rc = (jint)gdk_cursor_new((GdkCursorType)arg0);
-+ rc = (jlong)gdk_cursor_new((GdkCursorType)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1cursor_1new_1from_1pixbuf
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
- /*
-- rc = (jint)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
-+ rc = (jlong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, jint, jint, jint);
-+ typedef jlong (*FPTR)(jlong, jlong, jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -3813,7 +3813,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, arg1, arg2, arg3);
-+ rc = (jlong)(*fptr)(arg0, arg1, arg2, arg3);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
-@@ -3822,16 +3822,16 @@
- #endif
-
- #ifndef NO__1gdk_1cursor_1new_1from_1pixmap
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
- {
- GdkColor _arg2, *lparg2=NULL;
- GdkColor _arg3, *lparg3=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
- if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
-- rc = (jint)gdk_cursor_new_from_pixmap((GdkPixmap *)arg0, (GdkPixmap *)arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
-+ rc = (jlong)gdk_cursor_new_from_pixmap((GdkPixmap *)arg0, (GdkPixmap *)arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
- fail:
- OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
- return rc;
-@@ -3839,18 +3839,18 @@
- #endif
-
- #ifndef NO__1gdk_1display_1get_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_FUNC);
- /*
-- rc = (jint)gdk_display_get_default();
-+ rc = (jlong)gdk_display_get_default();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -3859,7 +3859,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_FUNC);
-@@ -3869,7 +3869,7 @@
-
- #ifndef NO__1gdk_1display_1supports_1cursor_1color
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
-@@ -3879,7 +3879,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint);
-+ typedef jboolean (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -3898,7 +3898,7 @@
-
- #ifndef NO__1gdk_1drag_1status
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1drag_1status_FUNC);
- gdk_drag_status((GdkDragContext *)arg0, (GdkDragAction)arg1, (guint32)arg2);
-@@ -3908,7 +3908,7 @@
-
- #ifndef NO__1gdk_1draw_1arc
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1arc_FUNC);
- gdk_draw_arc((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
-@@ -3918,7 +3918,7 @@
-
- #ifndef NO__1gdk_1draw_1drawable
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1drawable)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1drawable_FUNC);
- gdk_draw_drawable((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkDrawable *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
-@@ -3928,7 +3928,7 @@
-
- #ifndef NO__1gdk_1draw_1image
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1image_FUNC);
- gdk_draw_image((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkImage *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-@@ -3938,7 +3938,7 @@
-
- #ifndef NO__1gdk_1draw_1layout
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1layout_FUNC);
- gdk_draw_layout((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (PangoLayout *)arg4);
-@@ -3948,7 +3948,7 @@
-
- #ifndef NO__1gdk_1draw_1layout_1with_1colors
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout_1with_1colors)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4, jobject arg5, jobject arg6)
- {
- GdkColor _arg5, *lparg5=NULL;
- GdkColor _arg6, *lparg6=NULL;
-@@ -3963,7 +3963,7 @@
-
- #ifndef NO__1gdk_1draw_1line
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1line)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1line_FUNC);
- gdk_draw_line((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5);
-@@ -3973,7 +3973,7 @@
-
- #ifndef NO__1gdk_1draw_1lines
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1lines)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jint arg3)
- {
- jint *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1lines_FUNC);
-@@ -4001,7 +4001,7 @@
-
- #ifndef NO__1gdk_1draw_1pixbuf
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1pixbuf_FUNC);
- /*
-@@ -4027,7 +4027,7 @@
-
- #ifndef NO__1gdk_1draw_1point
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1point)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1point_FUNC);
- gdk_draw_point((GdkDrawable *)arg0, (GdkGC *)arg1, arg2, arg3);
-@@ -4037,7 +4037,7 @@
-
- #ifndef NO__1gdk_1draw_1polygon
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1polygon)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintArray arg3, jint arg4)
- {
- jint *lparg3=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1polygon_FUNC);
-@@ -4065,7 +4065,7 @@
-
- #ifndef NO__1gdk_1draw_1rectangle
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1draw_1rectangle_FUNC);
- gdk_draw_rectangle((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
-@@ -4075,7 +4075,7 @@
-
- #ifndef NO__1gdk_1drawable_1get_1depth
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1depth_FUNC);
-@@ -4086,12 +4086,12 @@
- #endif
-
- #ifndef NO__1gdk_1drawable_1get_1image
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1image_FUNC);
-- rc = (jint)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
-+ rc = (jlong)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
- OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1image_FUNC);
- return rc;
- }
-@@ -4099,7 +4099,7 @@
-
- #ifndef NO__1gdk_1drawable_1get_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drawable_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -4131,12 +4131,12 @@
- #endif
-
- #ifndef NO__1gdk_1drawable_1get_1visible_1region
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
-- rc = (jint)gdk_drawable_get_visible_region((GdkDrawable *)arg0);
-+ rc = (jlong)gdk_drawable_get_visible_region((GdkDrawable *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
- return rc;
- }
-@@ -4165,12 +4165,12 @@
- #endif
-
- #ifndef NO__1gdk_1event_1copy
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1copy)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1event_1copy)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1copy_FUNC);
-- rc = (jint)gdk_event_copy((GdkEvent *)arg0);
-+ rc = (jlong)gdk_event_copy((GdkEvent *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1event_1copy_FUNC);
- return rc;
- }
-@@ -4178,7 +4178,7 @@
-
- #ifndef NO__1gdk_1event_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1free_FUNC);
- gdk_event_free((GdkEvent *)arg0);
-@@ -4187,12 +4187,12 @@
- #endif
-
- #ifndef NO__1gdk_1event_1get
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1event_1get)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_FUNC);
-- rc = (jint)gdk_event_get();
-+ rc = (jlong)gdk_event_get();
- OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_FUNC);
- return rc;
- }
-@@ -4200,7 +4200,7 @@
-
- #ifndef NO__1gdk_1event_1get_1coords
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1coords)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -4218,12 +4218,12 @@
- #endif
-
- #ifndef NO__1gdk_1event_1get_1graphics_1expose
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1graphics_1expose_FUNC);
-- rc = (jint)gdk_event_get_graphics_expose((GdkWindow *)arg0);
-+ rc = (jlong)gdk_event_get_graphics_expose((GdkWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1graphics_1expose_FUNC);
- return rc;
- }
-@@ -4231,7 +4231,7 @@
-
- #ifndef NO__1gdk_1event_1get_1root_1coords
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1root_1coords)
-- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2)
- {
- jdouble *lparg1=NULL;
- jdouble *lparg2=NULL;
-@@ -4250,7 +4250,7 @@
-
- #ifndef NO__1gdk_1event_1get_1state
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1state)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1)
- {
- jint *lparg1=NULL;
- jboolean rc = 0;
-@@ -4266,7 +4266,7 @@
-
- #ifndef NO__1gdk_1event_1get_1time
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1time_FUNC);
-@@ -4278,7 +4278,7 @@
-
- #ifndef NO__1gdk_1event_1handler_1set
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1handler_1set_FUNC);
- gdk_event_handler_set((GdkEventFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2);
-@@ -4287,24 +4287,24 @@
- #endif
-
- #ifndef NO__1gdk_1event_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1event_1new)
- (JNIEnv *env, jclass that, jint arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1new_FUNC);
-- rc = (jint)gdk_event_new(arg0);
-+ rc = (jlong)gdk_event_new(arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1event_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1event_1peek
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1peek)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1event_1peek)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1peek_FUNC);
-- rc = (jint)gdk_event_peek();
-+ rc = (jlong)gdk_event_peek();
- OS_NATIVE_EXIT(env, that, _1gdk_1event_1peek_FUNC);
- return rc;
- }
-@@ -4312,7 +4312,7 @@
-
- #ifndef NO__1gdk_1event_1put
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1put)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1event_1put_FUNC);
- gdk_event_put((GdkEvent *)arg0);
-@@ -4332,7 +4332,7 @@
-
- #ifndef NO__1gdk_1free_1text_1list
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1free_1text_1list)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1free_1text_1list_FUNC);
- gdk_free_text_list((gchar **)arg0);
-@@ -4342,7 +4342,7 @@
-
- #ifndef NO__1gdk_1gc_1get_1values
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1get_1values)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkGCValues _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1get_1values_FUNC);
-@@ -4355,12 +4355,12 @@
- #endif
-
- #ifndef NO__1gdk_1gc_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1gc_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1gc_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1new_FUNC);
-- rc = (jint)gdk_gc_new((GdkDrawable *)arg0);
-+ rc = (jlong)gdk_gc_new((GdkDrawable *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1gc_1new_FUNC);
- return rc;
- }
-@@ -4368,7 +4368,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1background
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1background)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1background_FUNC);
-@@ -4381,7 +4381,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1clip_1mask
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1mask)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1mask_FUNC);
- gdk_gc_set_clip_mask((GdkGC *)arg0, (GdkBitmap *)arg1);
-@@ -4391,7 +4391,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1clip_1origin
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1origin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1origin_FUNC);
- gdk_gc_set_clip_origin((GdkGC *)arg0, (gint)arg1, (gint)arg2);
-@@ -4401,7 +4401,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1clip_1rectangle
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1rectangle)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1rectangle_FUNC);
-@@ -4414,7 +4414,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1clip_1region
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1region)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1region_FUNC);
- gdk_gc_set_clip_region((GdkGC *)arg0, (GdkRegion *)arg1);
-@@ -4424,7 +4424,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1dashes
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1dashes)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2, jint arg3)
- {
- jbyte *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1dashes_FUNC);
-@@ -4452,7 +4452,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1exposures
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1exposures)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1exposures_FUNC);
- gdk_gc_set_exposures((GdkGC *)arg0, (gboolean)arg1);
-@@ -4462,7 +4462,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1fill
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1fill_FUNC);
- gdk_gc_set_fill((GdkGC *)arg0, (GdkFill)arg1);
-@@ -4472,7 +4472,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1foreground
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1foreground)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1foreground_FUNC);
-@@ -4485,7 +4485,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1function
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1function_FUNC);
- gdk_gc_set_function((GdkGC *)arg0, (GdkFunction)arg1);
-@@ -4495,7 +4495,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1line_1attributes
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1line_1attributes)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1line_1attributes_FUNC);
- gdk_gc_set_line_attributes((GdkGC *)arg0, (gint)arg1, (GdkLineStyle)arg2, (GdkCapStyle)arg3, (GdkJoinStyle)arg4);
-@@ -4505,7 +4505,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1stipple
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1stipple_FUNC);
- gdk_gc_set_stipple((GdkGC *)arg0, (GdkPixmap *)arg1);
-@@ -4515,7 +4515,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1subwindow
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
- gdk_gc_set_subwindow((GdkGC *)arg0, (GdkSubwindowMode)arg1);
-@@ -4525,7 +4525,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1tile
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1tile)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1tile_FUNC);
- gdk_gc_set_tile((GdkGC *)arg0, (GdkPixmap *)arg1);
-@@ -4535,7 +4535,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1ts_1origin
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1ts_1origin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1ts_1origin_FUNC);
- gdk_gc_set_ts_origin((GdkGC *)arg0, arg1, arg2);
-@@ -4545,7 +4545,7 @@
-
- #ifndef NO__1gdk_1gc_1set_1values
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1values)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
- {
- GdkGCValues _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1values_FUNC);
-@@ -4567,12 +4567,12 @@
- #endif
-
- #ifndef NO__1gdk_1keymap_1get_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1default_FUNC);
-- rc = (jint)gdk_keymap_get_default();
-+ rc = (jlong)gdk_keymap_get_default();
- OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1default_FUNC);
- return rc;
- }
-@@ -4580,7 +4580,7 @@
-
- #ifndef NO__1gdk_1keymap_1translate_1keyboard_1state
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1keymap_1translate_1keyboard_1state)
-- (JNIEnv *env, jclass that, jint 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;
-@@ -4628,12 +4628,12 @@
- #endif
-
- #ifndef NO__1gdk_1pango_1context_1get
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1get_FUNC);
-- rc = (jint)gdk_pango_context_get();
-+ rc = (jlong)gdk_pango_context_get();
- OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1get_FUNC);
- return rc;
- }
-@@ -4641,7 +4641,7 @@
-
- #ifndef NO__1gdk_1pango_1context_1set_1colormap
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC);
- gdk_pango_context_set_colormap((PangoContext *)arg0, (GdkColormap *)arg1);
-@@ -4650,14 +4650,14 @@
- #endif
-
- #ifndef NO__1gdk_1pango_1layout_1get_1clip_1region
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
- {
- jint *lparg3=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-- rc = (jint)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, lparg3, arg4);
-+ rc = (jlong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
-@@ -4667,7 +4667,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1copy_1area
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint 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)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
- gdk_pixbuf_copy_area((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, (GdkPixbuf *)arg5, arg6, arg7);
-@@ -4676,12 +4676,12 @@
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1get_1from_1drawable
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
-- rc = (jint)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkColormap *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-+ rc = (jlong)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkColormap *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
- return rc;
- }
-@@ -4689,7 +4689,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1get_1has_1alpha
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
-@@ -4701,7 +4701,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1get_1height
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
-@@ -4712,12 +4712,12 @@
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1get_1pixels
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
-- rc = (jint)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
-+ rc = (jlong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
- return rc;
- }
-@@ -4725,7 +4725,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1get_1rowstride
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
-@@ -4737,7 +4737,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1get_1width
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
-@@ -4749,39 +4749,39 @@
-
- #ifndef NO__1gdk_1pixbuf_1loader_1close
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1close)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(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)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1loader_1get_1pixbuf
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
-- rc = (jint)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
-+ rc = (jlong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1loader_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
-- rc = (jint)gdk_pixbuf_loader_new();
-+ rc = (jlong)gdk_pixbuf_loader_new();
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
- return rc;
- }
-@@ -4789,45 +4789,45 @@
-
- #ifndef NO__1gdk_1pixbuf_1loader_1write
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1write)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3)
- {
-- jint *lparg3=NULL;
-+ jlong *lparg3=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
-- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(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)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_FUNC);
-- rc = (jint)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
-+ rc = (jlong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1new_1from_1file
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jintArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlongArray arg1)
- {
- jbyte *lparg0=NULL;
-- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong *lparg1=NULL;
-+ jlong rc = 0;
- OS_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)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)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)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
- return rc;
-@@ -4836,24 +4836,24 @@
-
- #ifndef NO__1gdk_1pixbuf_1render_1pixmap_1and_1mask
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1pixmap_1and_1mask)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jint arg3)
- {
-- jint *lparg1=NULL;
-- jint *lparg2=NULL;
-+ jlong *lparg1=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1pixmap_1and_1mask_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;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gdk_pixbuf_render_pixmap_and_mask((GdkPixbuf *)arg0, (GdkDrawable **)lparg1, (GdkBitmap **)lparg2, arg3);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1render_1pixmap_1and_1mask_FUNC);
- }
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1render_1to_1drawable
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1to_1drawable_FUNC);
- gdk_pixbuf_render_to_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkGC *)arg2, arg3, arg4, arg5, arg6, arg7, arg8, (GdkRgbDither)arg9, arg10, arg11);
-@@ -4863,7 +4863,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1render_1to_1drawable_1alpha
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable_1alpha)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1to_1drawable_1alpha_FUNC);
- gdk_pixbuf_render_to_drawable_alpha((GdkPixbuf *)arg0, (GdkDrawable *)arg1, arg2, arg3, arg4, arg5, arg6, arg7, (GdkPixbufAlphaMode)arg8, arg9, (GdkRgbDither)arg10, arg11, arg12);
-@@ -4873,19 +4873,19 @@
-
- #ifndef NO__1gdk_1pixbuf_1save_1to_1buffer
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1buffer)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jbyteArray arg3, jintArray arg4, jbyteArray arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2, jbyteArray arg3, jlongArray arg4, jbyteArray arg5)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
- jbyte *lparg3=NULL;
-- jint *lparg4=NULL;
-+ jlong *lparg4=NULL;
- jbyte *lparg5=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1save_1to_1buffer_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
-- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
- /*
- rc = (jboolean)gdk_pixbuf_save_to_buffer((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (GError **)lparg4, (char *)lparg5);
-@@ -4907,10 +4907,10 @@
- }
- fail:
- if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1buffer_FUNC);
- return rc;
- }
-@@ -4918,7 +4918,7 @@
-
- #ifndef NO__1gdk_1pixbuf_1scale
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jdouble arg6, jdouble arg7, jdouble arg8, jdouble arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jdouble arg6, jdouble arg7, jdouble arg8, jdouble arg9, jint arg10)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_FUNC);
- gdk_pixbuf_scale((const GdkPixbuf *)arg0, (GdkPixbuf *)arg1, arg2, arg3, arg4, arg5, (double)arg6, (double)arg7, (double)arg8, (double)arg9, arg10);
-@@ -4927,36 +4927,36 @@
- #endif
-
- #ifndef NO__1gdk_1pixbuf_1scale_1simple
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
-- rc = (jint)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
-+ rc = (jlong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1pixmap_1foreign_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1foreign_1new_FUNC);
-- rc = (jint)gdk_pixmap_foreign_new(arg0);
-+ rc = (jlong)gdk_pixmap_foreign_new(arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1foreign_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1pixmap_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1new_FUNC);
-- rc = (jint)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
-+ rc = (jlong)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1new_FUNC);
- return rc;
- }
-@@ -4964,7 +4964,7 @@
-
- #ifndef NO__1gdk_1pointer_1grab
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pointer_1grab)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jint arg2, jlong arg3, jlong arg4, jint arg5)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1grab_FUNC);
-@@ -4998,24 +4998,24 @@
-
- #ifndef NO__1gdk_1property_1get
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1property_1get)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8, jlongArray arg9)
- {
-- jint *lparg6=NULL;
-+ jlong *lparg6=NULL;
- jint *lparg7=NULL;
- jint *lparg8=NULL;
-- jint *lparg9=NULL;
-+ jlong *lparg9=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC);
-- if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
-+ if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
-- if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail;
-+ if (arg9) if ((lparg9 = (*env)->GetLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
- rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9);
- fail:
-- if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0);
-+ if (arg9 && lparg9) (*env)->ReleaseLongArrayElements(env, arg9, lparg9, 0);
- if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
- if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
-- if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
-+ if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
- return rc;
- }
-@@ -5023,7 +5023,7 @@
-
- #ifndef NO__1gdk_1region_1destroy
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1destroy_FUNC);
- gdk_region_destroy((GdkRegion *)arg0);
-@@ -5033,7 +5033,7 @@
-
- #ifndef NO__1gdk_1region_1empty
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1empty_FUNC);
-@@ -5045,7 +5045,7 @@
-
- #ifndef NO__1gdk_1region_1get_1clipbox
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1clipbox)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1clipbox_FUNC);
-@@ -5059,24 +5059,24 @@
-
- #ifndef NO__1gdk_1region_1get_1rectangles
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1rectangles)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1rectangles_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gdk_region_get_rectangles((GdkRegion *)arg0, (GdkRectangle **)lparg1, (gint *)lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1rectangles_FUNC);
- }
- #endif
-
- #ifndef NO__1gdk_1region_1intersect
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1intersect_FUNC);
- gdk_region_intersect((GdkRegion *)arg0, (GdkRegion *)arg1);
-@@ -5085,12 +5085,12 @@
- #endif
-
- #ifndef NO__1gdk_1region_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1region_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1new_FUNC);
-- rc = (jint)gdk_region_new();
-+ rc = (jlong)gdk_region_new();
- OS_NATIVE_EXIT(env, that, _1gdk_1region_1new_FUNC);
- return rc;
- }
-@@ -5098,7 +5098,7 @@
-
- #ifndef NO__1gdk_1region_1offset
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1offset_FUNC);
- gdk_region_offset((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
-@@ -5108,7 +5108,7 @@
-
- #ifndef NO__1gdk_1region_1point_1in
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1point_1in_FUNC);
-@@ -5119,14 +5119,14 @@
- #endif
-
- #ifndef NO__1gdk_1region_1polygon
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1polygon)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1region_1polygon)
- (JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
- {
- jint *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1polygon_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gdk_region_polygon((GdkPoint *)lparg0, arg1, (GdkFillRule)arg2);
-+ rc = (jlong)gdk_region_polygon((GdkPoint *)lparg0, arg1, (GdkFillRule)arg2);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1region_1polygon_FUNC);
-@@ -5135,14 +5135,14 @@
- #endif
-
- #ifndef NO__1gdk_1region_1rect_1in
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1rect_1in_FUNC);
- if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-- rc = (jint)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
-+ rc = (jlong)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
- fail:
- OS_NATIVE_EXIT(env, that, _1gdk_1region_1rect_1in_FUNC);
- return rc;
-@@ -5150,14 +5150,14 @@
- #endif
-
- #ifndef NO__1gdk_1region_1rectangle
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
- (JNIEnv *env, jclass that, jobject arg0)
- {
- GdkRectangle _arg0, *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1rectangle_FUNC);
- if (arg0) if ((lparg0 = getGdkRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
-- rc = (jint)gdk_region_rectangle(lparg0);
-+ rc = (jlong)gdk_region_rectangle(lparg0);
- fail:
- OS_NATIVE_EXIT(env, that, _1gdk_1region_1rectangle_FUNC);
- return rc;
-@@ -5166,7 +5166,7 @@
-
- #ifndef NO__1gdk_1region_1subtract
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1subtract_FUNC);
- gdk_region_subtract((GdkRegion *)arg0, (GdkRegion *)arg1);
-@@ -5176,7 +5176,7 @@
-
- #ifndef NO__1gdk_1region_1union
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_FUNC);
- gdk_region_union((GdkRegion *)arg0, (GdkRegion *)arg1);
-@@ -5186,7 +5186,7 @@
-
- #ifndef NO__1gdk_1region_1union_1with_1rect
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union_1with_1rect)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
-@@ -5208,18 +5208,18 @@
- #endif
-
- #ifndef NO__1gdk_1screen_1get_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1default_FUNC);
- /*
-- rc = (jint)gdk_screen_get_default();
-+ rc = (jlong)gdk_screen_get_default();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -5228,7 +5228,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1default_FUNC);
-@@ -5238,7 +5238,7 @@
-
- #ifndef NO__1gdk_1screen_1get_1monitor_1at_1point
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
-@@ -5267,7 +5267,7 @@
-
- #ifndef NO__1gdk_1screen_1get_1monitor_1at_1window
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
-@@ -5296,7 +5296,7 @@
-
- #ifndef NO__1gdk_1screen_1get_1monitor_1geometry
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkRectangle _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
-@@ -5326,7 +5326,7 @@
-
- #ifndef NO__1gdk_1screen_1get_1n_1monitors
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
-@@ -5355,7 +5355,7 @@
-
- #ifndef NO__1gdk_1screen_1get_1number
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1number_FUNC);
-@@ -5434,15 +5434,15 @@
-
- #ifndef NO__1gdk_1text_1property_1to_1utf8_1list
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1text_1property_1to_1utf8_1list)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4)
- {
-- jint *lparg4=NULL;
-+ jlong *lparg4=NULL;
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1text_1property_1to_1utf8_1list_FUNC);
-- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- rc = (jint)gdk_text_property_to_utf8_list((GdkAtom)arg0, arg1, (guchar *)arg2, arg3, (gchar ***)lparg4);
- fail:
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1text_1property_1to_1utf8_1list_FUNC);
- return rc;
- }
-@@ -5462,26 +5462,26 @@
-
- #ifndef NO__1gdk_1utf8_1to_1compound_1text
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1utf8_1to_1compound_1text)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jintArray arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlongArray arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
- {
- jbyte *lparg0=NULL;
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
-- jint *lparg3=NULL;
-+ jlong *lparg3=NULL;
- jint *lparg4=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1compound_1text_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- 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 (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
- rc = (jboolean)gdk_utf8_to_compound_text((const gchar *)lparg0, (GdkAtom *)lparg1, (gint *)lparg2, (guchar **)lparg3, (gint *)lparg4);
- fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1compound_1text_FUNC);
- return rc;
-@@ -5489,14 +5489,14 @@
- #endif
-
- #ifndef NO__1gdk_1utf8_1to_1string_1target
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)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);
- OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
-@@ -5505,12 +5505,12 @@
- #endif
-
- #ifndef NO__1gdk_1visual_1get_1system
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1system_FUNC);
-- rc = (jint)gdk_visual_get_system();
-+ rc = (jlong)gdk_visual_get_system();
- OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1system_FUNC);
- return rc;
- }
-@@ -5518,7 +5518,7 @@
-
- #ifndef NO__1gdk_1window_1add_1filter
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1add_1filter_FUNC);
- gdk_window_add_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
-@@ -5527,16 +5527,16 @@
- #endif
-
- #ifndef NO__1gdk_1window_1at_1pointer
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
- (JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
- {
- jint *lparg0=NULL;
- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1at_1pointer_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
-+ rc = (jlong)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
- if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-@@ -5547,7 +5547,7 @@
-
- #ifndef NO__1gdk_1window_1begin_1paint_1rect
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1begin_1paint_1rect)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
-@@ -5560,7 +5560,7 @@
-
- #ifndef NO__1gdk_1window_1clear_1area
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1clear_1area)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1clear_1area_FUNC);
- gdk_window_clear_area((GdkWindow *)arg0, arg1, arg2, arg3, arg4);
-@@ -5570,7 +5570,7 @@
-
- #ifndef NO__1gdk_1window_1destroy
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1destroy_FUNC);
- gdk_window_destroy((GdkWindow *)arg0);
-@@ -5580,7 +5580,7 @@
-
- #ifndef NO__1gdk_1window_1end_1paint
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1end_1paint_FUNC);
- gdk_window_end_paint((GdkWindow *)arg0);
-@@ -5590,7 +5590,7 @@
-
- #ifndef NO__1gdk_1window_1focus
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1focus_FUNC);
- gdk_window_focus((GdkWindow *)arg0, arg1);
-@@ -5600,7 +5600,7 @@
-
- #ifndef NO__1gdk_1window_1freeze_1updates
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1freeze_1updates)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1freeze_1updates_FUNC);
- gdk_window_freeze_updates((GdkWindow *)arg0);
-@@ -5609,12 +5609,12 @@
- #endif
-
- #ifndef NO__1gdk_1window_1get_1children
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1children_FUNC);
-- rc = (jint)gdk_window_get_children((GdkWindow *)arg0);
-+ rc = (jlong)gdk_window_get_children((GdkWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1children_FUNC);
- return rc;
- }
-@@ -5622,7 +5622,7 @@
-
- #ifndef NO__1gdk_1window_1get_1events
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1events_FUNC);
-@@ -5634,7 +5634,7 @@
-
- #ifndef NO__1gdk_1window_1get_1frame_1extents
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1frame_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
-@@ -5648,27 +5648,27 @@
-
- #ifndef NO__1gdk_1window_1get_1internal_1paint_1info
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1internal_1paint_1info)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2, jintArray arg3)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gdk_window_get_internal_paint_info((GdkWindow *)arg0, (GdkDrawable **)lparg1, (gint *)lparg2, (gint *)lparg3);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
- }
- #endif
-
- #ifndef NO__1gdk_1window_1get_1origin
- JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1origin)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -5686,30 +5686,30 @@
- #endif
-
- #ifndef NO__1gdk_1window_1get_1parent
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1parent_FUNC);
-- rc = (jint)gdk_window_get_parent((GdkWindow *)arg0);
-+ rc = (jlong)gdk_window_get_parent((GdkWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1parent_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1window_1get_1pointer
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
- jint *lparg3=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1pointer_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;
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-- rc = (jint)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
-+ rc = (jlong)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-@@ -5721,7 +5721,7 @@
-
- #ifndef NO__1gdk_1window_1get_1position
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1position)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -5738,21 +5738,21 @@
-
- #ifndef NO__1gdk_1window_1get_1user_1data
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1user_1data)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- gdk_window_get_user_data((GdkWindow *)arg0, (gpointer *)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1user_1data_FUNC);
- }
- #endif
-
- #ifndef NO__1gdk_1window_1hide
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1hide_FUNC);
- gdk_window_hide((GdkWindow *)arg0);
-@@ -5762,7 +5762,7 @@
-
- #ifndef NO__1gdk_1window_1invalidate_1rect
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1rect)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jboolean arg2)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
-@@ -5775,7 +5775,7 @@
-
- #ifndef NO__1gdk_1window_1invalidate_1region
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1region_FUNC);
- gdk_window_invalidate_region((GdkWindow *)arg0, (GdkRegion *)arg1, (gboolean)arg2);
-@@ -5785,7 +5785,7 @@
-
- #ifndef NO__1gdk_1window_1is_1visible
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1is_1visible_FUNC);
-@@ -5796,12 +5796,12 @@
- #endif
-
- #ifndef NO__1gdk_1window_1lookup
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1lookup)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1window_1lookup)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1lookup_FUNC);
-- rc = (jint)gdk_window_lookup(arg0);
-+ rc = (jlong)gdk_window_lookup(arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1window_1lookup_FUNC);
- return rc;
- }
-@@ -5809,7 +5809,7 @@
-
- #ifndef NO__1gdk_1window_1lower
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1lower_FUNC);
- gdk_window_lower((GdkWindow *)arg0);
-@@ -5819,7 +5819,7 @@
-
- #ifndef NO__1gdk_1window_1move
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_FUNC);
- gdk_window_move((GdkWindow *)arg0, arg1, arg2);
-@@ -5828,14 +5828,14 @@
- #endif
-
- #ifndef NO__1gdk_1window_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1new)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1window_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
- {
- GdkWindowAttr _arg1, *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1new_FUNC);
- if (arg1) if ((lparg1 = getGdkWindowAttrFields(env, arg1, &_arg1)) == NULL) goto fail;
-- rc = (jint)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
-+ rc = (jlong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
- fail:
- OS_NATIVE_EXIT(env, that, _1gdk_1window_1new_FUNC);
- return rc;
-@@ -5854,7 +5854,7 @@
-
- #ifndef NO__1gdk_1window_1process_1updates
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1updates_FUNC);
- gdk_window_process_updates((GdkWindow *)arg0, (gboolean)arg1);
-@@ -5864,7 +5864,7 @@
-
- #ifndef NO__1gdk_1window_1raise
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1raise_FUNC);
- gdk_window_raise((GdkWindow *)arg0);
-@@ -5874,7 +5874,7 @@
-
- #ifndef NO__1gdk_1window_1remove_1filter
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1remove_1filter_FUNC);
- gdk_window_remove_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
-@@ -5884,7 +5884,7 @@
-
- #ifndef NO__1gdk_1window_1resize
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1resize_FUNC);
- gdk_window_resize((GdkWindow *)arg0, arg1, arg2);
-@@ -5894,7 +5894,7 @@
-
- #ifndef NO__1gdk_1window_1scroll
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1scroll_FUNC);
- gdk_window_scroll((GdkWindow *)arg0, arg1, arg2);
-@@ -5904,7 +5904,7 @@
-
- #ifndef NO__1gdk_1window_1set_1accept_1focus
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1accept_1focus_FUNC);
- /*
-@@ -5930,7 +5930,7 @@
-
- #ifndef NO__1gdk_1window_1set_1back_1pixmap
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
- gdk_window_set_back_pixmap((GdkWindow *)arg0, (GdkPixmap *)arg1, (gboolean)arg2);
-@@ -5940,7 +5940,7 @@
-
- #ifndef NO__1gdk_1window_1set_1cursor
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1cursor)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1cursor_FUNC);
- gdk_window_set_cursor((GdkWindow *)arg0, (GdkCursor *)arg1);
-@@ -5960,7 +5960,7 @@
-
- #ifndef NO__1gdk_1window_1set_1decorations
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1decorations_FUNC);
- gdk_window_set_decorations((GdkWindow *)arg0, (GdkWMDecoration)arg1);
-@@ -5970,7 +5970,7 @@
-
- #ifndef NO__1gdk_1window_1set_1events
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1events_FUNC);
- gdk_window_set_events((GdkWindow *)arg0, arg1);
-@@ -5980,7 +5980,7 @@
-
- #ifndef NO__1gdk_1window_1set_1icon
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1icon_FUNC);
- gdk_window_set_icon((GdkWindow *)arg0, (GdkWindow *)arg1, (GdkPixmap *)arg2, (GdkBitmap *)arg3);
-@@ -5990,7 +5990,7 @@
-
- #ifndef NO__1gdk_1window_1set_1icon_1list
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon_1list)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1icon_1list_FUNC);
- gdk_window_set_icon_list((GdkWindow *)arg0, (GList *)arg1);
-@@ -6000,7 +6000,7 @@
-
- #ifndef NO__1gdk_1window_1set_1keep_1above
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1keep_1above_FUNC);
- /*
-@@ -6026,7 +6026,7 @@
-
- #ifndef NO__1gdk_1window_1set_1override_1redirect
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
- gdk_window_set_override_redirect((GdkWindow *)arg0, (gboolean)arg1);
-@@ -6036,7 +6036,7 @@
-
- #ifndef NO__1gdk_1window_1set_1user_1data
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1user_1data_FUNC);
- gdk_window_set_user_data((GdkWindow *)arg0, (gpointer)arg1);
-@@ -6046,7 +6046,7 @@
-
- #ifndef NO__1gdk_1window_1shape_1combine_1region
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
- gdk_window_shape_combine_region((GdkWindow *)arg0, (GdkRegion *)arg1, arg2, arg3);
-@@ -6056,7 +6056,7 @@
-
- #ifndef NO__1gdk_1window_1show
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_FUNC);
- gdk_window_show((GdkWindow *)arg0);
-@@ -6066,7 +6066,7 @@
-
- #ifndef NO__1gdk_1window_1show_1unraised
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_1unraised_FUNC);
- gdk_window_show_unraised((GdkWindow *)arg0);
-@@ -6076,7 +6076,7 @@
-
- #ifndef NO__1gdk_1window_1thaw_1updates
- JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1thaw_1updates)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gdk_1window_1thaw_1updates_FUNC);
- gdk_window_thaw_updates((GdkWindow *)arg0);
-@@ -6085,66 +6085,66 @@
- #endif
-
- #ifndef NO__1gdk_1x11_1atom_1to_1xatom
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
-- rc = (jint)gdk_x11_atom_to_xatom((GdkAtom)arg0);
-+ rc = (jlong)gdk_x11_atom_to_xatom((GdkAtom)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1x11_1colormap_1get_1xcolormap
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC);
-- rc = (jint)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0);
-+ rc = (jlong)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1x11_1drawable_1get_1xdisplay
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC);
-- rc = (jint)gdk_x11_drawable_get_xdisplay((GdkDrawable *)arg0);
-+ rc = (jlong)gdk_x11_drawable_get_xdisplay((GdkDrawable *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1x11_1drawable_1get_1xid
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
-- rc = (jint)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
-+ rc = (jlong)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gdk_1x11_1screen_1get_1window_1manager_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
- /*
-- rc = (jint)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
-+ rc = (jlong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(GdkScreen *);
-+ typedef jlong (*FPTR)(GdkScreen *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6153,7 +6153,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((GdkScreen *)arg0);
-+ rc = (jlong)(*fptr)((GdkScreen *)arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
-@@ -6162,18 +6162,18 @@
- #endif
-
- #ifndef NO__1gdk_1x11_1screen_1lookup_1visual
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
- /*
-- rc = (jint)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
-+ rc = (jlong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(GdkScreen *, VisualID);
-+ typedef jlong (*FPTR)(GdkScreen *, VisualID);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6182,7 +6182,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((GdkScreen *)arg0, (VisualID)arg1);
-+ rc = (jlong)(*fptr)((GdkScreen *)arg0, (VisualID)arg1);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
-@@ -6191,24 +6191,24 @@
- #endif
-
- #ifndef NO__1gdk_1x11_1visual_1get_1xvisual
--JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
-- rc = (jint)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
-+ rc = (jlong)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
- OS_NATIVE_EXIT(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1accel_1group_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1accel_1group_1new_FUNC);
-- rc = (jint)gtk_accel_group_new();
-+ rc = (jlong)gtk_accel_group_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1accel_1group_1new_FUNC);
- return rc;
- }
-@@ -6216,7 +6216,7 @@
-
- #ifndef NO__1gtk_1accel_1groups_1activate
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1accel_1groups_1activate)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1accel_1groups_1activate_FUNC);
-@@ -6228,7 +6228,7 @@
-
- #ifndef NO__1gtk_1accel_1label_1set_1accel_1widget
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
- gtk_accel_label_set_accel_widget((GtkAccelLabel *)arg0, (GtkWidget *)arg1);
-@@ -6238,7 +6238,7 @@
-
- #ifndef NO__1gtk_1adjustment_1changed
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1changed)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1changed_FUNC);
- gtk_adjustment_changed((GtkAdjustment *)arg0);
-@@ -6247,12 +6247,12 @@
- #endif
-
- #ifndef NO__1gtk_1adjustment_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
- (JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1new_FUNC);
-- rc = (jint)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);
- OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1new_FUNC);
- return rc;
- }
-@@ -6260,7 +6260,7 @@
-
- #ifndef NO__1gtk_1adjustment_1set_1value
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1value)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1value_FUNC);
- gtk_adjustment_set_value((GtkAdjustment *)arg0, (gdouble)arg1);
-@@ -6270,7 +6270,7 @@
-
- #ifndef NO__1gtk_1adjustment_1value_1changed
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1value_1changed)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
- gtk_adjustment_value_changed((GtkAdjustment *)arg0);
-@@ -6279,12 +6279,12 @@
- #endif
-
- #ifndef NO__1gtk_1arrow_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1arrow_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1arrow_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1new_FUNC);
-- rc = (jint)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
-+ rc = (jlong)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1arrow_1new_FUNC);
- return rc;
- }
-@@ -6292,7 +6292,7 @@
-
- #ifndef NO__1gtk_1arrow_1set
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1arrow_1set)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1set_FUNC);
- gtk_arrow_set((GtkArrow *)arg0, (GtkArrowType)arg1, (GtkShadowType)arg2);
-@@ -6301,12 +6301,12 @@
- #endif
-
- #ifndef NO__1gtk_1bin_1get_1child
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1bin_1get_1child_FUNC);
-- rc = (jint)gtk_bin_get_child((GtkBin *)arg0);
-+ rc = (jlong)gtk_bin_get_child((GtkBin *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1bin_1get_1child_FUNC);
- return rc;
- }
-@@ -6314,7 +6314,7 @@
-
- #ifndef NO__1gtk_1box_1set_1child_1packing
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1child_1packing)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
- gtk_box_set_child_packing((GtkBox *)arg0, (GtkWidget *)arg1, arg2, arg3, arg4, arg5);
-@@ -6324,7 +6324,7 @@
-
- #ifndef NO__1gtk_1box_1set_1spacing
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1spacing)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1spacing_FUNC);
- gtk_box_set_spacing((GtkBox *)arg0, arg1);
-@@ -6334,7 +6334,7 @@
-
- #ifndef NO__1gtk_1button_1clicked
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1clicked)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1button_1clicked_FUNC);
- gtk_button_clicked((GtkButton *)arg0);
-@@ -6344,7 +6344,7 @@
-
- #ifndef NO__1gtk_1button_1get_1relief
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1get_1relief)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1button_1get_1relief_FUNC);
-@@ -6355,12 +6355,12 @@
- #endif
-
- #ifndef NO__1gtk_1button_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1button_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1button_1new_FUNC);
-- rc = (jint)gtk_button_new();
-+ rc = (jlong)gtk_button_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1button_1new_FUNC);
- return rc;
- }
-@@ -6368,7 +6368,7 @@
-
- #ifndef NO__1gtk_1button_1set_1relief
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1relief)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1button_1set_1relief_FUNC);
- gtk_button_set_relief((GtkButton *)arg0, (GtkReliefStyle)arg1);
-@@ -6378,7 +6378,7 @@
-
- #ifndef NO__1gtk_1calendar_1display_1options
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1display_1options_FUNC);
- /*
-@@ -6404,7 +6404,7 @@
-
- #ifndef NO__1gtk_1calendar_1get_1date
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
-- (JNIEnv *env, jclass that, jint 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;
-@@ -6439,18 +6439,18 @@
- #endif
-
- #ifndef NO__1gtk_1calendar_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1calendar_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1calendar_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1new_FUNC);
- /*
-- rc = (jint)gtk_calendar_new();
-+ rc = (jlong)gtk_calendar_new();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6459,7 +6459,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1new_FUNC);
-@@ -6469,7 +6469,7 @@
-
- #ifndef NO__1gtk_1calendar_1select_1day
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1day_FUNC);
- /*
-@@ -6495,7 +6495,7 @@
-
- #ifndef NO__1gtk_1calendar_1select_1month
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1month_FUNC);
-@@ -6524,7 +6524,7 @@
-
- #ifndef NO__1gtk_1calendar_1set_1display_1options
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
- /*
-@@ -6550,7 +6550,7 @@
-
- #ifndef NO__1gtk_1cell_1layout_1clear
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1clear_FUNC);
- /*
-@@ -6559,7 +6559,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint);
-+ typedef void (*FPTR)(jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_cell_layout_clear_LIB, RTLD_LAZY);
-@@ -6576,7 +6576,7 @@
-
- #ifndef NO__1gtk_1cell_1layout_1pack_1start
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
- /*
-@@ -6585,7 +6585,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, jboolean);
-+ typedef void (*FPTR)(jlong, jlong, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_cell_layout_pack_start_LIB, RTLD_LAZY);
-@@ -6602,7 +6602,7 @@
-
- #ifndef NO__1gtk_1cell_1renderer_1get_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
- {
- GdkRectangle _arg2, *lparg2=NULL;
- jint *lparg3=NULL;
-@@ -6627,48 +6627,48 @@
- #endif
-
- #ifndef NO__1gtk_1cell_1renderer_1pixbuf_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
-- rc = (jint)gtk_cell_renderer_pixbuf_new();
-+ rc = (jlong)gtk_cell_renderer_pixbuf_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1cell_1renderer_1text_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
-- rc = (jint)gtk_cell_renderer_text_new();
-+ rc = (jlong)gtk_cell_renderer_text_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1cell_1renderer_1toggle_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
-- rc = (jint)gtk_cell_renderer_toggle_new();
-+ rc = (jlong)gtk_cell_renderer_toggle_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1check_1button_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1check_1button_1new_FUNC);
-- rc = (jint)gtk_check_button_new();
-+ rc = (jlong)gtk_check_button_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1check_1button_1new_FUNC);
- return rc;
- }
-@@ -6676,7 +6676,7 @@
-
- #ifndef NO__1gtk_1check_1menu_1item_1get_1active
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
-@@ -6687,14 +6687,14 @@
- #endif
-
- #ifndef NO__1gtk_1check_1menu_1item_1new_1with_1label
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
-+ rc = (jlong)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
-@@ -6704,7 +6704,7 @@
-
- #ifndef NO__1gtk_1check_1menu_1item_1set_1active
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
- gtk_check_menu_item_set_active((GtkCheckMenuItem *)arg0, (gboolean)arg1);
-@@ -6713,12 +6713,12 @@
- #endif
-
- #ifndef NO__1gtk_1check_1version
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1version)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1check_1version)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1check_1version_FUNC);
-- rc = (jint)gtk_check_version(arg0, arg1, arg2);
-+ rc = (jlong)gtk_check_version(arg0, arg1, arg2);
- OS_NATIVE_EXIT(env, that, _1gtk_1check_1version_FUNC);
- return rc;
- }
-@@ -6726,7 +6726,7 @@
-
- #ifndef NO__1gtk_1clipboard_1clear
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1clear)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1clear_FUNC);
- gtk_clipboard_clear((GtkClipboard *)arg0);
-@@ -6735,12 +6735,12 @@
- #endif
-
- #ifndef NO__1gtk_1clipboard_1get
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1get_FUNC);
-- rc = (jint)gtk_clipboard_get((GdkAtom)arg0);
-+ rc = (jlong)gtk_clipboard_get((GdkAtom)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1get_FUNC);
- return rc;
- }
-@@ -6748,7 +6748,7 @@
-
- #ifndef NO__1gtk_1clipboard_1set_1with_1data
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1data_FUNC);
-@@ -6759,26 +6759,26 @@
- #endif
-
- #ifndef NO__1gtk_1clipboard_1wait_1for_1contents
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
-- rc = (jint)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
-+ rc = (jlong)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1color_1selection_1dialog_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_color_selection_dialog_new((const gchar *)lparg0);
-+ rc = (jlong)gtk_color_selection_dialog_new((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
-@@ -6788,7 +6788,7 @@
-
- #ifndef NO__1gtk_1color_1selection_1get_1current_1color
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1get_1current_1color)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
-@@ -6802,7 +6802,7 @@
-
- #ifndef NO__1gtk_1color_1selection_1set_1current_1color
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1current_1color)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
-@@ -6815,7 +6815,7 @@
-
- #ifndef NO__1gtk_1color_1selection_1set_1has_1palette
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
- gtk_color_selection_set_has_palette((GtkColorSelection *)arg0, arg1);
-@@ -6824,18 +6824,18 @@
- #endif
-
- #ifndef NO__1gtk_1combo_1box_1entry_1new_1text
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1entry_1new_1text_FUNC);
- /*
-- rc = (jint)gtk_combo_box_entry_new_text();
-+ rc = (jlong)gtk_combo_box_entry_new_text();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6844,7 +6844,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1entry_1new_1text_FUNC);
-@@ -6854,7 +6854,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1get_1active
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
-@@ -6864,7 +6864,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6882,18 +6882,18 @@
- #endif
-
- #ifndef NO__1gtk_1combo_1box_1get_1model
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
- /*
-- rc = (jint)gtk_combo_box_get_model(arg0);
-+ rc = (jlong)gtk_combo_box_get_model(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6902,7 +6902,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
-@@ -6912,7 +6912,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1insert_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jbyteArray arg2)
- {
- jbyte *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1insert_1text_FUNC);
-@@ -6923,7 +6923,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, jbyte *);
-+ typedef void (*FPTR)(jlong, jint, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_insert_text_LIB, RTLD_LAZY);
-@@ -6941,18 +6941,18 @@
- #endif
-
- #ifndef NO__1gtk_1combo_1box_1new_1text
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1new_1text_FUNC);
- /*
-- rc = (jint)gtk_combo_box_new_text();
-+ rc = (jlong)gtk_combo_box_new_text();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -6961,7 +6961,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1new_1text_FUNC);
-@@ -6971,7 +6971,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1popdown
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popdown_FUNC);
- /*
-@@ -6980,7 +6980,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint);
-+ typedef void (*FPTR)(jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_popdown_LIB, RTLD_LAZY);
-@@ -6997,7 +6997,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1popup
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popup_FUNC);
- /*
-@@ -7006,7 +7006,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint);
-+ typedef void (*FPTR)(jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_popup_LIB, RTLD_LAZY);
-@@ -7023,7 +7023,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1remove_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1remove_1text_FUNC);
- /*
-@@ -7032,7 +7032,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_remove_text_LIB, RTLD_LAZY);
-@@ -7049,7 +7049,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1set_1active
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
- /*
-@@ -7058,7 +7058,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_set_active_LIB, RTLD_LAZY);
-@@ -7075,7 +7075,7 @@
-
- #ifndef NO__1gtk_1combo_1box_1set_1focus_1on_1click
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
- /*
-@@ -7084,7 +7084,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jboolean);
-+ typedef void (*FPTR)(jlong, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_set_focus_on_click_LIB, RTLD_LAZY);
-@@ -7101,7 +7101,7 @@
-
- #ifndef NO__1gtk_1combo_1disable_1activate
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1disable_1activate)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1disable_1activate_FUNC);
- gtk_combo_disable_activate((GtkCombo *)arg0);
-@@ -7110,12 +7110,12 @@
- #endif
-
- #ifndef NO__1gtk_1combo_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1combo_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1new_FUNC);
-- rc = (jint)gtk_combo_new();
-+ rc = (jlong)gtk_combo_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1combo_1new_FUNC);
- return rc;
- }
-@@ -7123,7 +7123,7 @@
-
- #ifndef NO__1gtk_1combo_1set_1case_1sensitive
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1case_1sensitive)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1set_1case_1sensitive_FUNC);
- gtk_combo_set_case_sensitive((GtkCombo *)arg0, (gboolean)arg1);
-@@ -7133,7 +7133,7 @@
-
- #ifndef NO__1gtk_1combo_1set_1popdown_1strings
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1popdown_1strings)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1combo_1set_1popdown_1strings_FUNC);
- gtk_combo_set_popdown_strings((GtkCombo *)arg0, (GList *)arg1);
-@@ -7143,7 +7143,7 @@
-
- #ifndef NO__1gtk_1container_1add
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC);
- gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1);
-@@ -7153,7 +7153,7 @@
-
- #ifndef NO__1gtk_1container_1forall
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1forall)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1forall_FUNC);
- gtk_container_forall((GtkContainer *)arg0, (GtkCallback)arg1, (gpointer)arg2);
-@@ -7163,7 +7163,7 @@
-
- #ifndef NO__1gtk_1container_1get_1border_1width
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1border_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1border_1width_FUNC);
-@@ -7174,12 +7174,12 @@
- #endif
-
- #ifndef NO__1gtk_1container_1get_1children
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1children_FUNC);
-- rc = (jint)gtk_container_get_children((GtkContainer *)arg0);
-+ rc = (jlong)gtk_container_get_children((GtkContainer *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1container_1get_1children_FUNC);
- return rc;
- }
-@@ -7187,7 +7187,7 @@
-
- #ifndef NO__1gtk_1container_1remove
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1remove)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1remove_FUNC);
- gtk_container_remove((GtkContainer *)arg0, (GtkWidget *)arg1);
-@@ -7197,7 +7197,7 @@
-
- #ifndef NO__1gtk_1container_1resize_1children
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1resize_1children)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1resize_1children_FUNC);
- gtk_container_resize_children((GtkContainer *)arg0);
-@@ -7207,7 +7207,7 @@
-
- #ifndef NO__1gtk_1container_1set_1border_1width
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1container_1set_1border_1width_FUNC);
- gtk_container_set_border_width((GtkContainer *)arg0, (guint)arg1);
-@@ -7216,14 +7216,14 @@
- #endif
-
- #ifndef NO__1gtk_1dialog_1add_1button
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1add_1button_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
-+ rc = (jlong)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1dialog_1add_1button_FUNC);
-@@ -7233,7 +7233,7 @@
-
- #ifndef NO__1gtk_1dialog_1run
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1run)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1run_FUNC);
-@@ -7244,12 +7244,12 @@
- #endif
-
- #ifndef NO__1gtk_1drag_1begin
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1begin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1drag_1begin)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_FUNC);
-- rc = (jint)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
-+ rc = (jlong)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
- OS_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_FUNC);
- return rc;
- }
-@@ -7257,7 +7257,7 @@
-
- #ifndef NO__1gtk_1drag_1check_1threshold
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1drag_1check_1threshold)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1check_1threshold_FUNC);
-@@ -7268,12 +7268,12 @@
- #endif
-
- #ifndef NO__1gtk_1drag_1dest_1find_1target
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
-- rc = (jint)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
-+ rc = (jlong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
- OS_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
- return rc;
- }
-@@ -7281,7 +7281,7 @@
-
- #ifndef NO__1gtk_1drag_1dest_1set
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1set)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3, jint arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1set_FUNC);
- gtk_drag_dest_set((GtkWidget *)arg0, (GtkDestDefaults)arg1, (const GtkTargetEntry *)arg2, (gint)arg3, (GdkDragAction)arg4);
-@@ -7291,7 +7291,7 @@
-
- #ifndef NO__1gtk_1drag_1dest_1unset
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1unset)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1unset_FUNC);
- gtk_drag_dest_unset((GtkWidget *)arg0);
-@@ -7301,7 +7301,7 @@
-
- #ifndef NO__1gtk_1drag_1finish
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1finish)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jboolean arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jboolean arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1finish_FUNC);
- gtk_drag_finish((GdkDragContext *)arg0, (gboolean)arg1, (gboolean)arg2, (guint32)arg3);
-@@ -7311,7 +7311,7 @@
-
- #ifndef NO__1gtk_1drag_1get_1data
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1get_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data_FUNC);
- gtk_drag_get_data((GtkWidget *)arg0, (GdkDragContext *)arg1, (GdkAtom)arg2, (guint32)arg3);
-@@ -7321,7 +7321,7 @@
-
- #ifndef NO__1gtk_1drag_1set_1icon_1pixbuf
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
- gtk_drag_set_icon_pixbuf((GdkDragContext *)arg0, (GdkPixbuf *)arg1, arg2, arg3);
-@@ -7330,12 +7330,12 @@
- #endif
-
- #ifndef NO__1gtk_1drawing_1area_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1drawing_1area_1new_FUNC);
-- rc = (jint)gtk_drawing_area_new();
-+ rc = (jlong)gtk_drawing_area_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1drawing_1area_1new_FUNC);
- return rc;
- }
-@@ -7343,7 +7343,7 @@
-
- #ifndef NO__1gtk_1editable_1copy_1clipboard
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
- gtk_editable_copy_clipboard((GtkEditable *)arg0);
-@@ -7353,7 +7353,7 @@
-
- #ifndef NO__1gtk_1editable_1cut_1clipboard
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1cut_1clipboard)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
- gtk_editable_cut_clipboard((GtkEditable *)arg0);
-@@ -7363,7 +7363,7 @@
-
- #ifndef NO__1gtk_1editable_1delete_1selection
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1selection)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1selection_FUNC);
- gtk_editable_delete_selection((GtkEditable *)arg0);
-@@ -7373,7 +7373,7 @@
-
- #ifndef NO__1gtk_1editable_1delete_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1text_FUNC);
- gtk_editable_delete_text((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
-@@ -7382,12 +7382,12 @@
- #endif
-
- #ifndef NO__1gtk_1editable_1get_1chars
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1chars_FUNC);
-- rc = (jint)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
-+ rc = (jlong)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
- OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1chars_FUNC);
- return rc;
- }
-@@ -7395,7 +7395,7 @@
-
- #ifndef NO__1gtk_1editable_1get_1editable
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1editable_FUNC);
-@@ -7407,7 +7407,7 @@
-
- #ifndef NO__1gtk_1editable_1get_1position
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1position)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1position_FUNC);
-@@ -7419,7 +7419,7 @@
-
- #ifndef NO__1gtk_1editable_1get_1selection_1bounds
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1selection_1bounds)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -7438,7 +7438,7 @@
-
- #ifndef NO__1gtk_1editable_1insert_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1insert_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
- {
- jbyte *lparg1=NULL;
- jint *lparg3=NULL;
-@@ -7455,7 +7455,7 @@
-
- #ifndef NO__1gtk_1editable_1paste_1clipboard
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1paste_1clipboard)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
- gtk_editable_paste_clipboard((GtkEditable *)arg0);
-@@ -7465,7 +7465,7 @@
-
- #ifndef NO__1gtk_1editable_1select_1region
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1select_1region)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1select_1region_FUNC);
- gtk_editable_select_region((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
-@@ -7475,7 +7475,7 @@
-
- #ifndef NO__1gtk_1editable_1set_1editable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1editable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1editable_FUNC);
- gtk_editable_set_editable((GtkEditable *)arg0, (gboolean)arg1);
-@@ -7485,7 +7485,7 @@
-
- #ifndef NO__1gtk_1editable_1set_1position
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1position)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1position_FUNC);
- gtk_editable_set_position((GtkEditable *)arg0, (gint)arg1);
-@@ -7495,7 +7495,7 @@
-
- #ifndef NO__1gtk_1entry_1get_1invisible_1char
- JNIEXPORT jchar JNICALL OS_NATIVE(_1gtk_1entry_1get_1invisible_1char)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jchar rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
-@@ -7506,12 +7506,12 @@
- #endif
-
- #ifndef NO__1gtk_1entry_1get_1layout
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_FUNC);
-- rc = (jint)gtk_entry_get_layout((GtkEntry *)arg0);
-+ rc = (jlong)gtk_entry_get_layout((GtkEntry *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_FUNC);
- return rc;
- }
-@@ -7519,7 +7519,7 @@
-
- #ifndef NO__1gtk_1entry_1get_1layout_1offsets
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout_1offsets)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -7536,7 +7536,7 @@
-
- #ifndef NO__1gtk_1entry_1get_1max_1length
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1max_1length)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
-@@ -7547,12 +7547,12 @@
- #endif
-
- #ifndef NO__1gtk_1entry_1get_1text
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1text_FUNC);
-- rc = (jint)gtk_entry_get_text((GtkEntry *)arg0);
-+ rc = (jlong)gtk_entry_get_text((GtkEntry *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1text_FUNC);
- return rc;
- }
-@@ -7560,7 +7560,7 @@
-
- #ifndef NO__1gtk_1entry_1get_1visibility
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1entry_1get_1visibility)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1visibility_FUNC);
-@@ -7571,12 +7571,12 @@
- #endif
-
- #ifndef NO__1gtk_1entry_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1entry_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1new_FUNC);
-- rc = (jint)gtk_entry_new();
-+ rc = (jlong)gtk_entry_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1entry_1new_FUNC);
- return rc;
- }
-@@ -7584,7 +7584,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1activates_1default
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1activates_1default)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1activates_1default_FUNC);
- gtk_entry_set_activates_default((GtkEntry *)arg0, (gboolean)arg1);
-@@ -7594,7 +7594,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1alignment
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment)
-- (JNIEnv *env, jclass that, jint arg0, jfloat arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jfloat arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1alignment_FUNC);
- /*
-@@ -7620,7 +7620,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1has_1frame
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1has_1frame)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
- gtk_entry_set_has_frame((GtkEntry *)arg0, (gboolean)arg1);
-@@ -7630,7 +7630,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1invisible_1char
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1invisible_1char)
-- (JNIEnv *env, jclass that, jint arg0, jchar arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jchar arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
- gtk_entry_set_invisible_char((GtkEntry *)arg0, (gint)arg1);
-@@ -7640,7 +7640,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1max_1length
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1max_1length)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
- gtk_entry_set_max_length((GtkEntry *)arg0, (gint)arg1);
-@@ -7650,7 +7650,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1text_FUNC);
-@@ -7664,7 +7664,7 @@
-
- #ifndef NO__1gtk_1entry_1set_1visibility
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1visibility)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1visibility_FUNC);
- gtk_entry_set_visibility((GtkEntry *)arg0, (gboolean)arg1);
-@@ -7674,7 +7674,7 @@
-
- #ifndef NO__1gtk_1entry_1text_1index_1to_1layout_1index
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
-@@ -7684,7 +7684,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, jint);
-+ typedef jint (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -7703,7 +7703,7 @@
-
- #ifndef NO__1gtk_1enumerate_1printers
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
- /*
-@@ -7712,7 +7712,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, gpointer, GDestroyNotify, gboolean);
-+ typedef void (*FPTR)(jlong, gpointer, GDestroyNotify, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_enumerate_printers_LIB, RTLD_LAZY);
-@@ -7741,7 +7741,7 @@
-
- #ifndef NO__1gtk_1expander_1get_1expanded
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1expanded_FUNC);
-@@ -7751,7 +7751,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint);
-+ typedef jboolean (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -7769,18 +7769,18 @@
- #endif
-
- #ifndef NO__1gtk_1expander_1get_1label_1widget
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1label_1widget_FUNC);
- /*
-- rc = (jint)gtk_expander_get_label_widget(arg0);
-+ rc = (jlong)gtk_expander_get_label_widget(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -7789,7 +7789,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1label_1widget_FUNC);
-@@ -7798,20 +7798,20 @@
- #endif
-
- #ifndef NO__1gtk_1expander_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1expander_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1expander_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_expander_new((const gchar *)lparg0);
-+ rc = (jlong)gtk_expander_new((const gchar *)lparg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(const gchar *);
-+ typedef jlong (*FPTR)(const gchar *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -7820,7 +7820,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((const gchar *)lparg0);
-+ rc = (jlong)(*fptr)((const gchar *)lparg0);
- }
- }
- fail:
-@@ -7832,7 +7832,7 @@
-
- #ifndef NO__1gtk_1expander_1set_1expanded
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1expanded_FUNC);
- /*
-@@ -7841,7 +7841,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jboolean);
-+ typedef void (*FPTR)(jlong, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_set_expanded_LIB, RTLD_LAZY);
-@@ -7858,7 +7858,7 @@
-
- #ifndef NO__1gtk_1expander_1set_1label
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_FUNC);
-@@ -7869,7 +7869,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, const gchar *);
-+ typedef void (*FPTR)(jlong, const gchar *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_set_label_LIB, RTLD_LAZY);
-@@ -7888,7 +7888,7 @@
-
- #ifndef NO__1gtk_1expander_1set_1label_1widget
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
- /*
-@@ -7897,7 +7897,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_set_label_widget_LIB, RTLD_LAZY);
-@@ -7914,7 +7914,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1add_1filter
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
- /*
-@@ -7923,7 +7923,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_add_filter_LIB, RTLD_LAZY);
-@@ -7939,18 +7939,18 @@
- #endif
-
- #ifndef NO__1gtk_1file_1chooser_1get_1current_1folder
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC);
- /*
-- rc = (jint)gtk_file_chooser_get_current_folder(arg0);
-+ rc = (jlong)gtk_file_chooser_get_current_folder(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -7959,7 +7959,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC);
-@@ -7968,18 +7968,18 @@
- #endif
-
- #ifndef NO__1gtk_1file_1chooser_1get_1filename
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
- /*
-- rc = (jint)gtk_file_chooser_get_filename(arg0);
-+ rc = (jlong)gtk_file_chooser_get_filename(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -7988,7 +7988,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
-@@ -7997,18 +7997,18 @@
- #endif
-
- #ifndef NO__1gtk_1file_1chooser_1get_1filenames
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
- /*
-- rc = (jint)gtk_file_chooser_get_filenames(arg0);
-+ rc = (jlong)gtk_file_chooser_get_filenames(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -8017,7 +8017,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
-@@ -8026,18 +8026,18 @@
- #endif
-
- #ifndef NO__1gtk_1file_1chooser_1get_1filter
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
- /*
-- rc = (jint)gtk_file_chooser_get_filter(arg0);
-+ rc = (jlong)gtk_file_chooser_get_filter(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -8046,7 +8046,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
-@@ -8056,7 +8056,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1current_1folder
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
- /*
-@@ -8065,7 +8065,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_current_folder_LIB, RTLD_LAZY);
-@@ -8082,7 +8082,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1current_1name
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC);
-@@ -8093,7 +8093,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jbyte *);
-+ typedef void (*FPTR)(jlong, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_current_name_LIB, RTLD_LAZY);
-@@ -8112,7 +8112,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
- /*
-@@ -8121,7 +8121,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jboolean);
-+ typedef void (*FPTR)(jlong, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_do_overwrite_confirmation_LIB, RTLD_LAZY);
-@@ -8138,7 +8138,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1extra_1widget
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
- /*
-@@ -8147,7 +8147,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_extra_widget_LIB, RTLD_LAZY);
-@@ -8164,7 +8164,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1filename
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
- /*
-@@ -8173,7 +8173,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_filename_LIB, RTLD_LAZY);
-@@ -8190,7 +8190,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1filter
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
- /*
-@@ -8199,7 +8199,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_filter_LIB, RTLD_LAZY);
-@@ -8216,7 +8216,7 @@
-
- #ifndef NO__1gtk_1file_1chooser_1set_1select_1multiple
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
- /*
-@@ -8225,7 +8225,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jboolean);
-+ typedef void (*FPTR)(jlong, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_select_multiple_LIB, RTLD_LAZY);
-@@ -8242,7 +8242,7 @@
-
- #ifndef NO__1gtk_1file_1filter_1add_1pattern
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
-@@ -8253,7 +8253,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jbyte *);
-+ typedef void (*FPTR)(jlong, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_filter_add_pattern_LIB, RTLD_LAZY);
-@@ -8271,18 +8271,18 @@
- #endif
-
- #ifndef NO__1gtk_1file_1filter_1get_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
- /*
-- rc = (jint)gtk_file_filter_get_name(arg0);
-+ rc = (jlong)gtk_file_filter_get_name(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -8291,7 +8291,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
-@@ -8300,18 +8300,18 @@
- #endif
-
- #ifndef NO__1gtk_1file_1filter_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1new_FUNC);
- /*
-- rc = (jint)gtk_file_filter_new();
-+ rc = (jlong)gtk_file_filter_new();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -8320,7 +8320,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1new_FUNC);
-@@ -8330,7 +8330,7 @@
-
- #ifndef NO__1gtk_1file_1filter_1set_1name
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
-@@ -8341,7 +8341,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jbyte *);
-+ typedef void (*FPTR)(jlong, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_filter_set_name_LIB, RTLD_LAZY);
-@@ -8359,24 +8359,24 @@
- #endif
-
- #ifndef NO__1gtk_1file_1selection_1get_1filename
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1filename)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1filename)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1get_1filename_FUNC);
-- rc = (jint)gtk_file_selection_get_filename((GtkFileSelection *)arg0);
-+ rc = (jlong)gtk_file_selection_get_filename((GtkFileSelection *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1get_1filename_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1file_1selection_1get_1selections
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1get_1selections_FUNC);
-- rc = (jint)gtk_file_selection_get_selections((GtkFileSelection *)arg0);
-+ rc = (jlong)gtk_file_selection_get_selections((GtkFileSelection *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1get_1selections_FUNC);
- return rc;
- }
-@@ -8384,7 +8384,7 @@
-
- #ifndef NO__1gtk_1file_1selection_1hide_1fileop_1buttons
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1hide_1fileop_1buttons)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1hide_1fileop_1buttons_FUNC);
- gtk_file_selection_hide_fileop_buttons((GtkFileSelection *)arg0);
-@@ -8393,14 +8393,14 @@
- #endif
-
- #ifndef NO__1gtk_1file_1selection_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1file_1selection_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_file_selection_new((const gchar *)lparg0);
-+ rc = (jlong)gtk_file_selection_new((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1new_FUNC);
-@@ -8410,7 +8410,7 @@
-
- #ifndef NO__1gtk_1file_1selection_1set_1filename
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1filename)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1set_1filename_FUNC);
- gtk_file_selection_set_filename((GtkFileSelection *)arg0, (const gchar *)arg1);
-@@ -8420,7 +8420,7 @@
-
- #ifndef NO__1gtk_1file_1selection_1set_1select_1multiple
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1select_1multiple)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1set_1select_1multiple_FUNC);
- gtk_file_selection_set_select_multiple((GtkFileSelection *)arg0, (gboolean)arg1);
-@@ -8430,7 +8430,7 @@
-
- #ifndef NO__1gtk_1fixed_1move
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1move)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1move_FUNC);
- gtk_fixed_move((GtkFixed *)arg0, (GtkWidget *)arg1, (gint)arg2, (gint)arg3);
-@@ -8439,12 +8439,12 @@
- #endif
-
- #ifndef NO__1gtk_1fixed_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1fixed_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1fixed_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1new_FUNC);
-- rc = (jint)gtk_fixed_new();
-+ rc = (jlong)gtk_fixed_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1fixed_1new_FUNC);
- return rc;
- }
-@@ -8452,7 +8452,7 @@
-
- #ifndef NO__1gtk_1fixed_1set_1has_1window
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1set_1has_1window)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1set_1has_1window_FUNC);
- gtk_fixed_set_has_window((GtkFixed *)arg0, (gboolean)arg1);
-@@ -8461,26 +8461,26 @@
- #endif
-
- #ifndef NO__1gtk_1font_1selection_1dialog_1get_1font_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
-- rc = (jint)gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)arg0);
-+ rc = (jlong)gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1font_1selection_1dialog_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_font_selection_dialog_new((const gchar *)lparg0);
-+ rc = (jlong)gtk_font_selection_dialog_new((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
-@@ -8490,7 +8490,7 @@
-
- #ifndef NO__1gtk_1font_1selection_1dialog_1set_1font_1name
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1set_1font_1name)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- jboolean rc = 0;
-@@ -8505,26 +8505,26 @@
- #endif
-
- #ifndef NO__1gtk_1frame_1get_1label_1widget
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
-- rc = (jint)gtk_frame_get_label_widget((GtkFrame *)arg0);
-+ rc = (jlong)gtk_frame_get_label_widget((GtkFrame *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1frame_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1frame_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1frame_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1frame_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_frame_new((const gchar *)lparg0);
-+ rc = (jlong)gtk_frame_new((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1frame_1new_FUNC);
-@@ -8534,7 +8534,7 @@
-
- #ifndef NO__1gtk_1frame_1set_1label
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_FUNC);
-@@ -8548,7 +8548,7 @@
-
- #ifndef NO__1gtk_1frame_1set_1label_1widget
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
- gtk_frame_set_label_widget((GtkFrame *)arg0, (GtkWidget *)arg1);
-@@ -8558,7 +8558,7 @@
-
- #ifndef NO__1gtk_1frame_1set_1shadow_1type
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
- gtk_frame_set_shadow_type((GtkFrame *)arg0, (GtkShadowType)arg1);
-@@ -8567,12 +8567,12 @@
- #endif
-
- #ifndef NO__1gtk_1get_1current_1event
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_FUNC);
-- rc = (jint)gtk_get_current_event();
-+ rc = (jlong)gtk_get_current_event();
- OS_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_FUNC);
- return rc;
- }
-@@ -8607,24 +8607,24 @@
- #endif
-
- #ifndef NO__1gtk_1get_1default_1language
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1get_1default_1language_FUNC);
-- rc = (jint)gtk_get_default_language();
-+ rc = (jlong)gtk_get_default_language();
- OS_NATIVE_EXIT(env, that, _1gtk_1get_1default_1language_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1get_1event_1widget
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1get_1event_1widget_FUNC);
-- rc = (jint)gtk_get_event_widget((GdkEvent *)arg0);
-+ rc = (jlong)gtk_get_event_widget((GdkEvent *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1get_1event_1widget_FUNC);
- return rc;
- }
-@@ -8632,7 +8632,7 @@
-
- #ifndef NO__1gtk_1grab_1add
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC);
- gtk_grab_add((GtkWidget *)arg0);
-@@ -8641,12 +8641,12 @@
- #endif
-
- #ifndef NO__1gtk_1grab_1get_1current
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1grab_1get_1current_FUNC);
-- rc = (jint)gtk_grab_get_current();
-+ rc = (jlong)gtk_grab_get_current();
- OS_NATIVE_EXIT(env, that, _1gtk_1grab_1get_1current_FUNC);
- return rc;
- }
-@@ -8654,7 +8654,7 @@
-
- #ifndef NO__1gtk_1grab_1remove
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC);
- gtk_grab_remove((GtkWidget *)arg0);
-@@ -8663,62 +8663,62 @@
- #endif
-
- #ifndef NO__1gtk_1hbox_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hbox_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1hbox_1new)
- (JNIEnv *env, jclass that, jboolean arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1hbox_1new_FUNC);
-- rc = (jint)gtk_hbox_new((gboolean)arg0, (gint)arg1);
-+ rc = (jlong)gtk_hbox_new((gboolean)arg0, (gint)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1hbox_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1hscale_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hscale_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1hscale_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1hscale_1new_FUNC);
-- rc = (jint)gtk_hscale_new((GtkAdjustment *)arg0);
-+ rc = (jlong)gtk_hscale_new((GtkAdjustment *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1hscale_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1hscrollbar_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1hscrollbar_1new_FUNC);
-- rc = (jint)gtk_hscrollbar_new((GtkAdjustment *)arg0);
-+ rc = (jlong)gtk_hscrollbar_new((GtkAdjustment *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1hscrollbar_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1hseparator_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1hseparator_1new_FUNC);
-- rc = (jint)gtk_hseparator_new();
-+ rc = (jlong)gtk_hseparator_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1hseparator_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1icon_1factory_1lookup_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1factory_1lookup_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1icon_1factory_1lookup_1default)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1icon_1factory_1lookup_1default_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_icon_factory_lookup_default((const gchar *)lparg0);
-+ rc = (jlong)gtk_icon_factory_lookup_default((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1icon_1factory_1lookup_1default_FUNC);
-@@ -8727,12 +8727,12 @@
- #endif
-
- #ifndef NO__1gtk_1icon_1set_1render_1icon
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jlong arg6)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1icon_1set_1render_1icon_FUNC);
-- rc = (jint)gtk_icon_set_render_icon((GtkIconSet *)arg0, (GtkStyle *)arg1, (GtkTextDirection)arg2, (GtkStateType)arg3, (GtkIconSize)arg4, (GtkWidget *)arg5, (const char *)arg6);
-+ rc = (jlong)gtk_icon_set_render_icon((GtkIconSet *)arg0, (GtkStyle *)arg1, (GtkTextDirection)arg2, (GtkStateType)arg3, (GtkIconSize)arg4, (GtkWidget *)arg5, (const char *)arg6);
- OS_NATIVE_EXIT(env, that, _1gtk_1icon_1set_1render_1icon_FUNC);
- return rc;
- }
-@@ -8740,7 +8740,7 @@
-
- #ifndef NO__1gtk_1icon_1source_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1free_FUNC);
- gtk_icon_source_free((GtkIconSource *)arg0);
-@@ -8749,12 +8749,12 @@
- #endif
-
- #ifndef NO__1gtk_1icon_1source_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1new_FUNC);
-- rc = (jint)gtk_icon_source_new();
-+ rc = (jlong)gtk_icon_source_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1icon_1source_1new_FUNC);
- return rc;
- }
-@@ -8762,7 +8762,7 @@
-
- #ifndef NO__1gtk_1icon_1source_1set_1pixbuf
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1set_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1set_1pixbuf_FUNC);
- gtk_icon_source_set_pixbuf((GtkIconSource *)arg0, (GdkPixbuf *)arg1);
-@@ -8772,7 +8772,7 @@
-
- #ifndef NO__1gtk_1im_1context_1filter_1keypress
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1im_1context_1filter_1keypress)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
-@@ -8784,7 +8784,7 @@
-
- #ifndef NO__1gtk_1im_1context_1focus_1in
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1in)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
- gtk_im_context_focus_in((GtkIMContext *)arg0);
-@@ -8794,7 +8794,7 @@
-
- #ifndef NO__1gtk_1im_1context_1focus_1out
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1out)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
- gtk_im_context_focus_out((GtkIMContext *)arg0);
-@@ -8804,31 +8804,31 @@
-
- #ifndef NO__1gtk_1im_1context_1get_1preedit_1string
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1preedit_1string)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jintArray arg3)
- {
-- jint *lparg1=NULL;
-- jint *lparg2=NULL;
-+ jlong *lparg1=NULL;
-+ jlong *lparg2=NULL;
- jint *lparg3=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1preedit_1string_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;
-+ 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)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gtk_im_context_get_preedit_string((GtkIMContext *)arg0, (gchar **)lparg1, (PangoAttrList **)lparg2, (gint *)lparg3);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1im_1context_1get_1type
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1type_FUNC);
-- rc = (jint)gtk_im_context_get_type();
-+ rc = (jlong)gtk_im_context_get_type();
- OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1type_FUNC);
- return rc;
- }
-@@ -8836,7 +8836,7 @@
-
- #ifndef NO__1gtk_1im_1context_1reset
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1reset)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1reset_FUNC);
- gtk_im_context_reset((GtkIMContext *)arg0);
-@@ -8846,7 +8846,7 @@
-
- #ifndef NO__1gtk_1im_1context_1set_1client_1window
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1client_1window)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
- gtk_im_context_set_client_window((GtkIMContext *)arg0, (GdkWindow *)arg1);
-@@ -8856,7 +8856,7 @@
-
- #ifndef NO__1gtk_1im_1context_1set_1cursor_1location
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1cursor_1location)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
-@@ -8869,7 +8869,7 @@
-
- #ifndef NO__1gtk_1im_1multicontext_1append_1menuitems
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
- gtk_im_multicontext_append_menuitems((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
-@@ -8878,26 +8878,26 @@
- #endif
-
- #ifndef NO__1gtk_1im_1multicontext_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1new_FUNC);
-- rc = (jint)gtk_im_multicontext_new();
-+ rc = (jlong)gtk_im_multicontext_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1image_1menu_1item_1new_1with_1label
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
-+ rc = (jlong)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
-@@ -8907,7 +8907,7 @@
-
- #ifndef NO__1gtk_1image_1menu_1item_1set_1image
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
- gtk_image_menu_item_set_image((GtkImageMenuItem *)arg0, (GtkWidget *)arg1);
-@@ -8916,36 +8916,36 @@
- #endif
-
- #ifndef NO__1gtk_1image_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1image_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_FUNC);
-- rc = (jint)gtk_image_new();
-+ rc = (jlong)gtk_image_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1image_1new_1from_1pixbuf
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
-- rc = (jint)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
-+ rc = (jlong)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1image_1new_1from_1pixmap
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixmap_FUNC);
-- rc = (jint)gtk_image_new_from_pixmap((GdkPixmap *)arg0, (GdkBitmap *)arg1);
-+ rc = (jlong)gtk_image_new_from_pixmap((GdkPixmap *)arg0, (GdkBitmap *)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixmap_FUNC);
- return rc;
- }
-@@ -8953,7 +8953,7 @@
-
- #ifndef NO__1gtk_1image_1set_1from_1pixbuf
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
- gtk_image_set_from_pixbuf((GtkImage *)arg0, (GdkPixbuf *)arg1);
-@@ -8963,7 +8963,7 @@
-
- #ifndef NO__1gtk_1image_1set_1from_1pixmap
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixmap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixmap_FUNC);
- gtk_image_set_from_pixmap((GtkImage *)arg0, (GdkBitmap *)arg1, (GdkBitmap *)arg2);
-@@ -8973,30 +8973,30 @@
-
- #ifndef NO__1gtk_1init_1check
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1init_1check)
-- (JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlongArray arg0, jlongArray arg1)
- {
-- jint *lparg0=NULL;
-- jint *lparg1=NULL;
-+ jlong *lparg0=NULL;
-+ jlong *lparg1=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1init_1check_FUNC);
-- if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jboolean)gtk_init_check((int *)lparg0, (char ***)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-- if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
-+ if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1init_1check_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1label_1get_1layout
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC);
-- rc = (jint)gtk_label_get_layout((GtkLabel *)arg0);
-+ rc = (jlong)gtk_label_get_layout((GtkLabel *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC);
- return rc;
- }
-@@ -9004,7 +9004,7 @@
-
- #ifndef NO__1gtk_1label_1get_1mnemonic_1keyval
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
-@@ -9015,14 +9015,14 @@
- #endif
-
- #ifndef NO__1gtk_1label_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1label_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_label_new((const gchar *)lparg0);
-+ rc = (jlong)gtk_label_new((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_FUNC);
-@@ -9031,14 +9031,14 @@
- #endif
-
- #ifndef NO__1gtk_1label_1new_1with_1mnemonic
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_label_new_with_mnemonic((const gchar *)lparg0);
-+ rc = (jlong)gtk_label_new_with_mnemonic((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
-@@ -9048,7 +9048,7 @@
-
- #ifndef NO__1gtk_1label_1set_1attributes
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1attributes)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1attributes_FUNC);
- gtk_label_set_attributes((GtkLabel *)arg0, (PangoAttrList *)arg1);
-@@ -9058,7 +9058,7 @@
-
- #ifndef NO__1gtk_1label_1set_1justify
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1justify)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1justify_FUNC);
- gtk_label_set_justify((GtkLabel *)arg0, (GtkJustification)arg1);
-@@ -9068,7 +9068,7 @@
-
- #ifndef NO__1gtk_1label_1set_1line_1wrap
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
- gtk_label_set_line_wrap((GtkLabel *)arg0, (gboolean)arg1);
-@@ -9078,7 +9078,7 @@
-
- #ifndef NO__1gtk_1label_1set_1line_1wrap_1mode
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
- /*
-@@ -9087,7 +9087,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_label_set_line_wrap_mode_LIB, RTLD_LAZY);
-@@ -9102,33 +9102,33 @@
- }
- #endif
-
--#ifndef NO__1gtk_1label_1set_1text__II
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__II)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+#ifndef NO__1gtk_1label_1set_1text__JJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__JJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__II_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
- gtk_label_set_text((GtkLabel *)arg0, (const gchar *)arg1);
-- OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__II_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1label_1set_1text__I_3B
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__I_3B)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+#ifndef NO__1gtk_1label_1set_1text__J_3B
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__J_3B)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- gtk_label_set_text((GtkLabel *)arg0, (const gchar *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1label_1set_1text_1with_1mnemonic
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text_1with_1mnemonic)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
-@@ -9142,7 +9142,7 @@
-
- #ifndef NO__1gtk_1list_1append_1items
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1append_1items)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1append_1items_FUNC);
- gtk_list_append_items((GtkList *)arg0, (GList *)arg1);
-@@ -9152,7 +9152,7 @@
-
- #ifndef NO__1gtk_1list_1clear_1items
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1clear_1items)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1clear_1items_FUNC);
- gtk_list_clear_items((GtkList *)arg0, arg1, arg2);
-@@ -9162,7 +9162,7 @@
-
- #ifndef NO__1gtk_1list_1insert_1items
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1insert_1items)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1insert_1items_FUNC);
- gtk_list_insert_items((GtkList *)arg0, (GList *)arg1, arg2);
-@@ -9171,14 +9171,14 @@
- #endif
-
- #ifndef NO__1gtk_1list_1item_1new_1with_1label
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1list_1item_1new_1with_1label)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1list_1item_1new_1with_1label)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1item_1new_1with_1label_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_list_item_new_with_label((const gchar *)lparg0);
-+ rc = (jlong)gtk_list_item_new_with_label((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1list_1item_1new_1with_1label_FUNC);
-@@ -9188,7 +9188,7 @@
-
- #ifndef NO__1gtk_1list_1remove_1items
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1remove_1items)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1remove_1items_FUNC);
- gtk_list_remove_items((GtkList *)arg0, (GList *)arg1);
-@@ -9198,7 +9198,7 @@
-
- #ifndef NO__1gtk_1list_1select_1item
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1select_1item)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1select_1item_FUNC);
- gtk_list_select_item((GtkList *)arg0, arg1);
-@@ -9208,7 +9208,7 @@
-
- #ifndef NO__1gtk_1list_1store_1append
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1append)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1append_FUNC);
- gtk_list_store_append((GtkListStore *)arg0, (GtkTreeIter *)arg1);
-@@ -9218,7 +9218,7 @@
-
- #ifndef NO__1gtk_1list_1store_1clear
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1clear)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1clear_FUNC);
- gtk_list_store_clear((GtkListStore *)arg0);
-@@ -9228,7 +9228,7 @@
-
- #ifndef NO__1gtk_1list_1store_1insert
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1insert)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1insert_FUNC);
- gtk_list_store_insert((GtkListStore *)arg0, (GtkTreeIter *)arg1, (gint)arg2);
-@@ -9237,16 +9237,16 @@
- #endif
-
- #ifndef NO__1gtk_1list_1store_1newv
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
-+ (JNIEnv *env, jclass that, jint arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong *lparg1=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ rc = (jlong)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC);
- return rc;
- }
-@@ -9254,7 +9254,7 @@
-
- #ifndef NO__1gtk_1list_1store_1remove
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1remove)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1remove_FUNC);
- gtk_list_store_remove((GtkListStore *)arg0, (GtkTreeIter *)arg1);
-@@ -9262,66 +9262,66 @@
- }
- #endif
-
--#ifndef NO__1gtk_1list_1store_1set__IIIII
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+#ifndef NO__1gtk_1list_1store_1set__JJIIJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIIJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIIJ_FUNC);
- gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
-- OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIIJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1list_1store_1set__IIIJI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
-+#ifndef NO__1gtk_1list_1store_1set__JJIJJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIJJ_FUNC);
- gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
-- OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIJJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
-+#ifndef NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4)
- {
- GdkColor _arg3, *lparg3=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
- if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
- gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
- fail:
-- OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1list_1store_1set__IIIZI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIZI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jint arg4)
-+#ifndef NO__1gtk_1list_1store_1set__JJIZJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIZJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jlong arg4)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIZJ_FUNC);
- gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
-- OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIZJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1list_1store_1set__III_3BI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__III_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
-+#ifndef NO__1gtk_1list_1store_1set__JJI_3BJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJI_3BJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jbyteArray arg3, jlong arg4)
- {
- jbyte *lparg3=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJI_3BJ_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJI_3BJ_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1list_1unselect_1all
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1all)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1unselect_1all_FUNC);
- gtk_list_unselect_all((GtkList *)arg0);
-@@ -9331,7 +9331,7 @@
-
- #ifndef NO__1gtk_1list_1unselect_1item
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1item)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1list_1unselect_1item_FUNC);
- gtk_list_unselect_item((GtkList *)arg0, arg1);
-@@ -9351,7 +9351,7 @@
-
- #ifndef NO__1gtk_1main_1do_1event
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main_1do_1event)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1main_1do_1event_FUNC);
- gtk_main_do_event((GdkEvent *)arg0);
-@@ -9384,24 +9384,24 @@
- #endif
-
- #ifndef NO__1gtk_1menu_1bar_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC);
-- rc = (jint)gtk_menu_bar_new();
-+ rc = (jlong)gtk_menu_bar_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1menu_1item_1get_1submenu
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
-- rc = (jint)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
-+ rc = (jlong)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
- return rc;
- }
-@@ -9409,7 +9409,7 @@
-
- #ifndef NO__1gtk_1menu_1item_1remove_1submenu
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1remove_1submenu)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1remove_1submenu_FUNC);
- gtk_menu_item_remove_submenu((GtkMenuItem *)arg0);
-@@ -9419,7 +9419,7 @@
-
- #ifndef NO__1gtk_1menu_1item_1set_1submenu
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1set_1submenu)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
- gtk_menu_item_set_submenu((GtkMenuItem *)arg0, (GtkWidget *)arg1);
-@@ -9428,12 +9428,12 @@
- #endif
-
- #ifndef NO__1gtk_1menu_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1menu_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1new_FUNC);
-- rc = (jint)gtk_menu_new();
-+ rc = (jlong)gtk_menu_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1menu_1new_FUNC);
- return rc;
- }
-@@ -9441,7 +9441,7 @@
-
- #ifndef NO__1gtk_1menu_1popdown
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popdown)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popdown_FUNC);
- gtk_menu_popdown((GtkMenu *)arg0);
-@@ -9451,7 +9451,7 @@
-
- #ifndef NO__1gtk_1menu_1popup
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jint arg6)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_FUNC);
- gtk_menu_popup((GtkMenu *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (GtkMenuPositionFunc)arg3, (gpointer)arg4, (guint)arg5, (guint32)arg6);
-@@ -9461,7 +9461,7 @@
-
- #ifndef NO__1gtk_1menu_1shell_1deactivate
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deactivate)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
- gtk_menu_shell_deactivate((GtkMenuShell *)arg0);
-@@ -9471,7 +9471,7 @@
-
- #ifndef NO__1gtk_1menu_1shell_1insert
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1insert)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1insert_FUNC);
- gtk_menu_shell_insert((GtkMenuShell *)arg0, (GtkWidget *)arg1, (gint)arg2);
-@@ -9481,7 +9481,7 @@
-
- #ifndef NO__1gtk_1menu_1shell_1select_1item
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1select_1item)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1select_1item_FUNC);
- gtk_menu_shell_select_item((GtkMenuShell *)arg0, (GtkWidget *)arg1);
-@@ -9491,7 +9491,7 @@
-
- #ifndef NO__1gtk_1menu_1shell_1set_1take_1focus
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
- /*
-@@ -9516,14 +9516,14 @@
- #endif
-
- #ifndef NO__1gtk_1message_1dialog_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
- {
- jbyte *lparg4=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC);
- if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
-+ rc = (jlong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
- fail:
- if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC);
-@@ -9557,7 +9557,7 @@
-
- #ifndef NO__1gtk_1misc_1set_1alignment
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1misc_1set_1alignment)
-- (JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jfloat arg1, jfloat arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1misc_1set_1alignment_FUNC);
- gtk_misc_set_alignment((GtkMisc *)arg0, (gfloat)arg1, (gfloat)arg2);
-@@ -9567,7 +9567,7 @@
-
- #ifndef NO__1gtk_1notebook_1get_1current_1page
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1get_1current_1page)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
-@@ -9579,7 +9579,7 @@
-
- #ifndef NO__1gtk_1notebook_1get_1scrollable
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1notebook_1get_1scrollable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
-@@ -9591,7 +9591,7 @@
-
- #ifndef NO__1gtk_1notebook_1insert_1page
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1insert_1page)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1insert_1page_FUNC);
- gtk_notebook_insert_page((GtkNotebook *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (gint)arg3);
-@@ -9600,12 +9600,12 @@
- #endif
-
- #ifndef NO__1gtk_1notebook_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1notebook_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1new_FUNC);
-- rc = (jint)gtk_notebook_new();
-+ rc = (jlong)gtk_notebook_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1new_FUNC);
- return rc;
- }
-@@ -9613,7 +9613,7 @@
-
- #ifndef NO__1gtk_1notebook_1next_1page
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1next_1page)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1next_1page_FUNC);
- gtk_notebook_next_page((GtkNotebook *)arg0);
-@@ -9623,7 +9623,7 @@
-
- #ifndef NO__1gtk_1notebook_1prev_1page
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1prev_1page)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1prev_1page_FUNC);
- gtk_notebook_prev_page((GtkNotebook *)arg0);
-@@ -9633,7 +9633,7 @@
-
- #ifndef NO__1gtk_1notebook_1remove_1page
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1remove_1page)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1remove_1page_FUNC);
- gtk_notebook_remove_page((GtkNotebook *)arg0, (gint)arg1);
-@@ -9643,7 +9643,7 @@
-
- #ifndef NO__1gtk_1notebook_1set_1current_1page
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1current_1page)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
- gtk_notebook_set_current_page((GtkNotebook *)arg0, (gint)arg1);
-@@ -9653,7 +9653,7 @@
-
- #ifndef NO__1gtk_1notebook_1set_1scrollable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1scrollable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
- gtk_notebook_set_scrollable((GtkNotebook *)arg0, (gboolean)arg1);
-@@ -9663,7 +9663,7 @@
-
- #ifndef NO__1gtk_1notebook_1set_1show_1tabs
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
- gtk_notebook_set_show_tabs((GtkNotebook *)arg0, (gboolean)arg1);
-@@ -9673,7 +9673,7 @@
-
- #ifndef NO__1gtk_1notebook_1set_1tab_1pos
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
- gtk_notebook_set_tab_pos((GtkNotebook *)arg0, (GtkPositionType)arg1);
-@@ -9683,7 +9683,7 @@
-
- #ifndef NO__1gtk_1object_1sink
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1object_1sink)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1object_1sink_FUNC);
- gtk_object_sink((GtkObject *)arg0);
-@@ -9693,7 +9693,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1bottom_1margin
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
-@@ -9703,7 +9703,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9722,7 +9722,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1left_1margin
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
-@@ -9732,7 +9732,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9751,7 +9751,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1orientation
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
-@@ -9761,7 +9761,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9780,7 +9780,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1page_1height
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
-@@ -9790,7 +9790,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9809,7 +9809,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1page_1width
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
-@@ -9819,7 +9819,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9838,7 +9838,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1paper_1height
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
-@@ -9848,7 +9848,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9866,18 +9866,18 @@
- #endif
-
- #ifndef NO__1gtk_1page_1setup_1get_1paper_1size
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
- /*
-- rc = (jint)gtk_page_setup_get_paper_size(arg0);
-+ rc = (jlong)gtk_page_setup_get_paper_size(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9886,7 +9886,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
-@@ -9896,7 +9896,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1paper_1width
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
-@@ -9906,7 +9906,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9925,7 +9925,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1right_1margin
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
-@@ -9935,7 +9935,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9954,7 +9954,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1get_1top_1margin
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
-@@ -9964,7 +9964,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -9982,18 +9982,18 @@
- #endif
-
- #ifndef NO__1gtk_1page_1setup_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC);
- /*
-- rc = (jint)gtk_page_setup_new();
-+ rc = (jlong)gtk_page_setup_new();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10002,7 +10002,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC);
-@@ -10012,7 +10012,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1set_1bottom_1margin
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
- /*
-@@ -10021,7 +10021,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jdouble, jint);
-+ typedef void (*FPTR)(jlong, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_bottom_margin_LIB, RTLD_LAZY);
-@@ -10038,7 +10038,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1set_1left_1margin
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
- /*
-@@ -10047,7 +10047,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jdouble, jint);
-+ typedef void (*FPTR)(jlong, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_left_margin_LIB, RTLD_LAZY);
-@@ -10064,7 +10064,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1set_1orientation
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
- /*
-@@ -10073,7 +10073,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_orientation_LIB, RTLD_LAZY);
-@@ -10090,7 +10090,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1set_1paper_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
- /*
-@@ -10099,7 +10099,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_paper_size_LIB, RTLD_LAZY);
-@@ -10116,7 +10116,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1set_1right_1margin
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
- /*
-@@ -10125,7 +10125,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jdouble, jint);
-+ typedef void (*FPTR)(jlong, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_right_margin_LIB, RTLD_LAZY);
-@@ -10142,7 +10142,7 @@
-
- #ifndef NO__1gtk_1page_1setup_1set_1top_1margin
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
- /*
-@@ -10151,7 +10151,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jdouble, jint);
-+ typedef void (*FPTR)(jlong, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_top_margin_LIB, RTLD_LAZY);
-@@ -10168,7 +10168,7 @@
-
- #ifndef NO__1gtk_1paint_1arrow
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1arrow)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10185,7 +10185,7 @@
-
- #ifndef NO__1gtk_1paint_1box
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10202,7 +10202,7 @@
-
- #ifndef NO__1gtk_1paint_1box_1gap
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box_1gap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10219,7 +10219,7 @@
-
- #ifndef NO__1gtk_1paint_1check
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1check)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10236,7 +10236,7 @@
-
- #ifndef NO__1gtk_1paint_1expander
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1expander)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
- {
- GdkRectangle _arg3, *lparg3=NULL;
- jbyte *lparg5=NULL;
-@@ -10253,7 +10253,7 @@
-
- #ifndef NO__1gtk_1paint_1extension
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1extension)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10270,7 +10270,7 @@
-
- #ifndef NO__1gtk_1paint_1flat_1box
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1flat_1box)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10287,7 +10287,7 @@
-
- #ifndef NO__1gtk_1paint_1focus
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1focus)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8, jint arg9)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8, jint arg9)
- {
- GdkRectangle _arg3, *lparg3=NULL;
- jbyte *lparg5=NULL;
-@@ -10303,7 +10303,7 @@
-
- #ifndef NO__1gtk_1paint_1handle
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1handle)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10319,7 +10319,7 @@
-
- #ifndef NO__1gtk_1paint_1hline
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1hline)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
- {
- GdkRectangle _arg3, *lparg3=NULL;
- jbyte *lparg5=NULL;
-@@ -10336,7 +10336,7 @@
-
- #ifndef NO__1gtk_1paint_1layout
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1layout)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jlong arg9)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10353,7 +10353,7 @@
-
- #ifndef NO__1gtk_1paint_1option
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1option)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10370,7 +10370,7 @@
-
- #ifndef NO__1gtk_1paint_1shadow
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1shadow)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10387,7 +10387,7 @@
-
- #ifndef NO__1gtk_1paint_1shadow_1gap
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1shadow_1gap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10404,7 +10404,7 @@
-
- #ifndef NO__1gtk_1paint_1slider
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1slider)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10421,7 +10421,7 @@
-
- #ifndef NO__1gtk_1paint_1tab
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1tab)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jobject arg4, jlong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
- {
- GdkRectangle _arg4, *lparg4=NULL;
- jbyte *lparg6=NULL;
-@@ -10438,7 +10438,7 @@
-
- #ifndef NO__1gtk_1paint_1vline
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1vline)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
- {
- GdkRectangle _arg3, *lparg3=NULL;
- jbyte *lparg5=NULL;
-@@ -10455,7 +10455,7 @@
-
- #ifndef NO__1gtk_1paper_1size_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
- /*
-@@ -10464,7 +10464,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint);
-+ typedef void (*FPTR)(jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_free_LIB, RTLD_LAZY);
-@@ -10480,18 +10480,18 @@
- #endif
-
- #ifndef NO__1gtk_1paper_1size_1get_1display_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
- /*
-- rc = (jint)gtk_paper_size_get_display_name(arg0);
-+ rc = (jlong)gtk_paper_size_get_display_name(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10500,7 +10500,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
-@@ -10510,7 +10510,7 @@
-
- #ifndef NO__1gtk_1paper_1size_1get_1height
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
-@@ -10520,7 +10520,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10538,18 +10538,18 @@
- #endif
-
- #ifndef NO__1gtk_1paper_1size_1get_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
- /*
-- rc = (jint)gtk_paper_size_get_name(arg0);
-+ rc = (jlong)gtk_paper_size_get_name(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10558,7 +10558,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
-@@ -10567,18 +10567,18 @@
- #endif
-
- #ifndef NO__1gtk_1paper_1size_1get_1ppd_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
- /*
-- rc = (jint)gtk_paper_size_get_ppd_name(arg0);
-+ rc = (jlong)gtk_paper_size_get_ppd_name(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10587,7 +10587,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
-@@ -10597,7 +10597,7 @@
-
- #ifndef NO__1gtk_1paper_1size_1get_1width
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
-@@ -10607,7 +10607,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10626,7 +10626,7 @@
-
- #ifndef NO__1gtk_1paper_1size_1is_1custom
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
-@@ -10636,7 +10636,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint);
-+ typedef jboolean (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10654,20 +10654,20 @@
- #endif
-
- #ifndef NO__1gtk_1paper_1size_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_paper_size_new(lparg0);
-+ rc = (jlong)gtk_paper_size_new(lparg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jbyte *);
-+ typedef jlong (*FPTR)(jbyte *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10676,7 +10676,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(lparg0);
-+ rc = (jlong)(*fptr)(lparg0);
- }
- }
- fail:
-@@ -10687,22 +10687,22 @@
- #endif
-
- #ifndef NO__1gtk_1paper_1size_1new_1custom
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
- (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3, jint arg4)
- {
- jbyte *lparg0=NULL;
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4);
-+ rc = (jlong)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jbyte *, jbyte *, jdouble, jdouble, jint);
-+ typedef jlong (*FPTR)(jbyte *, jbyte *, jdouble, jdouble, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10711,7 +10711,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(lparg0, lparg1, arg2, arg3, arg4);
-+ rc = (jlong)(*fptr)(lparg0, lparg1, arg2, arg3, arg4);
- }
- }
- fail:
-@@ -10723,22 +10723,22 @@
- #endif
-
- #ifndef NO__1gtk_1paper_1size_1new_1from_1ppd
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
- (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3)
- {
- jbyte *lparg0=NULL;
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3);
-+ rc = (jlong)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jbyte *, jbyte *, jdouble, jdouble);
-+ typedef jlong (*FPTR)(jbyte *, jbyte *, jdouble, jdouble);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10747,7 +10747,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(lparg0, lparg1, arg2, arg3);
-+ rc = (jlong)(*fptr)(lparg0, lparg1, arg2, arg3);
- }
- }
- fail:
-@@ -10759,42 +10759,42 @@
- #endif
-
- #ifndef NO__1gtk_1plug_1get_1id
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1plug_1get_1id_FUNC);
-- rc = (jint)gtk_plug_get_id((GtkPlug *)arg0);
-+ rc = (jlong)gtk_plug_get_id((GtkPlug *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1plug_1get_1id_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1plug_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1plug_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1plug_1new_FUNC);
-- rc = (jint)gtk_plug_new(arg0);
-+ rc = (jlong)gtk_plug_new(arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1plug_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1print_1job_1get_1printer
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1printer_FUNC);
- /*
-- rc = (jint)gtk_print_job_get_printer(arg0);
-+ rc = (jlong)gtk_print_job_get_printer(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10803,7 +10803,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1printer_FUNC);
-@@ -10812,18 +10812,18 @@
- #endif
-
- #ifndef NO__1gtk_1print_1job_1get_1settings
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1settings_FUNC);
- /*
-- rc = (jint)gtk_print_job_get_settings(arg0);
-+ rc = (jlong)gtk_print_job_get_settings(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10832,7 +10832,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1settings_FUNC);
-@@ -10842,7 +10842,7 @@
-
- #ifndef NO__1gtk_1print_1job_1get_1status
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1status_FUNC);
-@@ -10852,7 +10852,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10870,20 +10870,20 @@
- #endif
-
- #ifndef NO__1gtk_1print_1job_1get_1surface
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong *lparg1=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_print_job_get_surface(arg0, (GError **)lparg1);
-+ rc = (jlong)gtk_print_job_get_surface(arg0, (GError **)lparg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, GError **);
-+ typedef jlong (*FPTR)(jlong, GError **);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10892,29 +10892,29 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, (GError **)lparg1);
-+ rc = (jlong)(*fptr)(arg0, (GError **)lparg1);
- }
- }
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1print_1job_1get_1title
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1title_FUNC);
- /*
-- rc = (jint)gtk_print_job_get_title(arg0);
-+ rc = (jlong)gtk_print_job_get_title(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10923,7 +10923,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1title_FUNC);
-@@ -10932,20 +10932,20 @@
- #endif
-
- #ifndef NO__1gtk_1print_1job_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3);
-+ rc = (jlong)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(const gchar *, jint, jint, jint);
-+ typedef jlong (*FPTR)(const gchar *, jlong, jlong, jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -10954,7 +10954,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((const gchar *)lparg0, arg1, arg2, arg3);
-+ rc = (jlong)(*fptr)((const gchar *)lparg0, arg1, arg2, arg3);
- }
- }
- fail:
-@@ -10966,7 +10966,7 @@
-
- #ifndef NO__1gtk_1print_1job_1send
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC);
- /*
-@@ -10975,7 +10975,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, gpointer, GDestroyNotify);
-+ typedef void (*FPTR)(jlong, jlong, gpointer, GDestroyNotify);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_send_LIB, RTLD_LAZY);
-@@ -10992,21 +10992,21 @@
-
- #ifndef NO__1gtk_1print_1job_1set_1source_1file
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1job_1set_1source_1file)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2)
- {
- jbyte *lparg1=NULL;
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1set_1source_1file_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- /*
- rc = (jboolean)gtk_print_job_set_source_file(arg0, (const gchar *)lparg1, (GError **)lparg2);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint, const gchar *, GError **);
-+ typedef jboolean (*FPTR)(jlong, const gchar *, GError **);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11019,7 +11019,7 @@
- }
- }
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1set_1source_1file_FUNC);
- return rc;
-@@ -11028,7 +11028,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1foreach
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC);
- /*
-@@ -11037,7 +11037,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint, gpointer);
-+ typedef void (*FPTR)(jlong, jlong, gpointer);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_foreach_LIB, RTLD_LAZY);
-@@ -11053,20 +11053,20 @@
- #endif
-
- #ifndef NO__1gtk_1print_1settings_1get
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_print_settings_get(arg0, (const gchar *)lparg1);
-+ rc = (jlong)gtk_print_settings_get(arg0, (const gchar *)lparg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, const gchar *);
-+ typedef jlong (*FPTR)(jlong, const gchar *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11075,7 +11075,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, (const gchar *)lparg1);
-+ rc = (jlong)(*fptr)(arg0, (const gchar *)lparg1);
- }
- }
- fail:
-@@ -11087,7 +11087,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1collate
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
-@@ -11097,7 +11097,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint);
-+ typedef jboolean (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11116,7 +11116,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1n_1copies
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
-@@ -11126,7 +11126,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11145,7 +11145,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1orientation
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1orientation_FUNC);
-@@ -11155,7 +11155,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11173,20 +11173,20 @@
- #endif
-
- #ifndef NO__1gtk_1print_1settings_1get_1page_1ranges
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1)
- {
- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1);
-+ rc = (jlong)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint, gint *);
-+ typedef jlong (*FPTR)(jlong, gint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11195,7 +11195,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, (gint *)lparg1);
-+ rc = (jlong)(*fptr)(arg0, (gint *)lparg1);
- }
- }
- fail:
-@@ -11207,7 +11207,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1paper_1height
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1paper_1height_FUNC);
-@@ -11217,7 +11217,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11236,7 +11236,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1paper_1width
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1paper_1width_FUNC);
-@@ -11246,7 +11246,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jdouble (*FPTR)(jint, jint);
-+ typedef jdouble (*FPTR)(jlong, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11265,7 +11265,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1print_1pages
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
-@@ -11275,7 +11275,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11293,18 +11293,18 @@
- #endif
-
- #ifndef NO__1gtk_1print_1settings_1get_1printer
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1printer_FUNC);
- /*
-- rc = (jint)gtk_print_settings_get_printer(arg0);
-+ rc = (jlong)gtk_print_settings_get_printer(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11313,7 +11313,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1printer_FUNC);
-@@ -11323,7 +11323,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1get_1resolution
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
-@@ -11333,7 +11333,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11351,18 +11351,18 @@
- #endif
-
- #ifndef NO__1gtk_1print_1settings_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC);
- /*
-- rc = (jint)gtk_print_settings_new();
-+ rc = (jlong)gtk_print_settings_new();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11371,7 +11371,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC);
-@@ -11381,7 +11381,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-@@ -11394,7 +11394,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, const gchar *, const gchar *);
-+ typedef void (*FPTR)(jlong, const gchar *, const gchar *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_LIB, RTLD_LAZY);
-@@ -11414,7 +11414,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set_1collate
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
- /*
-@@ -11423,7 +11423,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, gboolean);
-+ typedef void (*FPTR)(jlong, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_collate_LIB, RTLD_LAZY);
-@@ -11440,7 +11440,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set_1n_1copies
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
- /*
-@@ -11449,7 +11449,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, gint);
-+ typedef void (*FPTR)(jlong, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_n_copies_LIB, RTLD_LAZY);
-@@ -11466,7 +11466,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set_1orientation
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
- /*
-@@ -11475,7 +11475,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_orientation_LIB, RTLD_LAZY);
-@@ -11492,7 +11492,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set_1page_1ranges
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jint arg2)
- {
- jint *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
-@@ -11503,7 +11503,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint *, gint);
-+ typedef void (*FPTR)(jlong, jint *, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_page_ranges_LIB, RTLD_LAZY);
-@@ -11522,7 +11522,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set_1print_1pages
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
- /*
-@@ -11531,7 +11531,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_print_pages_LIB, RTLD_LAZY);
-@@ -11548,7 +11548,7 @@
-
- #ifndef NO__1gtk_1print_1settings_1set_1printer
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
-@@ -11559,7 +11559,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jbyte *);
-+ typedef void (*FPTR)(jlong, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_printer_LIB, RTLD_LAZY);
-@@ -11578,7 +11578,7 @@
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1get_1current_1page
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
-@@ -11588,7 +11588,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11606,18 +11606,18 @@
- #endif
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1get_1page_1setup
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
- /*
-- rc = (jint)gtk_print_unix_dialog_get_page_setup(arg0);
-+ rc = (jlong)gtk_print_unix_dialog_get_page_setup(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11626,7 +11626,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
-@@ -11635,18 +11635,18 @@
- #endif
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1get_1selected_1printer
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
- /*
-- rc = (jint)gtk_print_unix_dialog_get_selected_printer(arg0);
-+ rc = (jlong)gtk_print_unix_dialog_get_selected_printer(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11655,7 +11655,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
-@@ -11664,18 +11664,18 @@
- #endif
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1get_1settings
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
- /*
-- rc = (jint)gtk_print_unix_dialog_get_settings(arg0);
-+ rc = (jlong)gtk_print_unix_dialog_get_settings(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11684,7 +11684,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
-@@ -11693,20 +11693,20 @@
- #endif
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
-- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
-+ (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
-+ rc = (jlong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(const gchar *, GtkWindow *);
-+ typedef jlong (*FPTR)(const gchar *, GtkWindow *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11715,7 +11715,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((const gchar *)lparg0, (GtkWindow *)arg1);
-+ rc = (jlong)(*fptr)((const gchar *)lparg0, (GtkWindow *)arg1);
- }
- }
- fail:
-@@ -11727,7 +11727,7 @@
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1set_1current_1page
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
- /*
-@@ -11736,7 +11736,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, gint);
-+ typedef void (*FPTR)(jlong, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_current_page_LIB, RTLD_LAZY);
-@@ -11753,7 +11753,7 @@
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1set_1manual_1capabilities
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabilities)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
- /*
-@@ -11762,7 +11762,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_manual_capabilities_LIB, RTLD_LAZY);
-@@ -11779,7 +11779,7 @@
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1set_1page_1setup
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
- /*
-@@ -11788,7 +11788,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_page_setup_LIB, RTLD_LAZY);
-@@ -11805,7 +11805,7 @@
-
- #ifndef NO__1gtk_1print_1unix_1dialog_1set_1settings
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
- /*
-@@ -11814,7 +11814,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_settings_LIB, RTLD_LAZY);
-@@ -11830,18 +11830,18 @@
- #endif
-
- #ifndef NO__1gtk_1printer_1get_1backend
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC);
- /*
-- rc = (jint)gtk_printer_get_backend(arg0);
-+ rc = (jlong)gtk_printer_get_backend(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11850,7 +11850,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC);
-@@ -11859,18 +11859,18 @@
- #endif
-
- #ifndef NO__1gtk_1printer_1get_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC);
- /*
-- rc = (jint)gtk_printer_get_name(arg0);
-+ rc = (jlong)gtk_printer_get_name(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11879,7 +11879,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC);
-@@ -11889,7 +11889,7 @@
-
- #ifndef NO__1gtk_1printer_1is_1default
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC);
-@@ -11899,7 +11899,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jboolean (*FPTR)(jint);
-+ typedef jboolean (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -11917,12 +11917,12 @@
- #endif
-
- #ifndef NO__1gtk_1progress_1bar_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1new_FUNC);
-- rc = (jint)gtk_progress_bar_new();
-+ rc = (jlong)gtk_progress_bar_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1new_FUNC);
- return rc;
- }
-@@ -11930,7 +11930,7 @@
-
- #ifndef NO__1gtk_1progress_1bar_1pulse
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1pulse)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
- gtk_progress_bar_pulse((GtkProgressBar *)arg0);
-@@ -11940,7 +11940,7 @@
-
- #ifndef NO__1gtk_1progress_1bar_1set_1fraction
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
- gtk_progress_bar_set_fraction((GtkProgressBar *)arg0, (gdouble)arg1);
-@@ -11950,7 +11950,7 @@
-
- #ifndef NO__1gtk_1progress_1bar_1set_1orientation
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
- gtk_progress_bar_set_orientation((GtkProgressBar *)arg0, (GtkProgressBarOrientation)arg1);
-@@ -11959,62 +11959,62 @@
- #endif
-
- #ifndef NO__1gtk_1radio_1button_1get_1group
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
-- rc = (jint)gtk_radio_button_get_group((GtkRadioButton *)arg0);
-+ rc = (jlong)gtk_radio_button_get_group((GtkRadioButton *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1radio_1button_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1new_FUNC);
-- rc = (jint)gtk_radio_button_new((GSList *)arg0);
-+ rc = (jlong)gtk_radio_button_new((GSList *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1radio_1menu_1item_1get_1group
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
-- rc = (jint)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
-+ rc = (jlong)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1radio_1menu_1item_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
-- rc = (jint)gtk_radio_menu_item_new((GSList *)arg0);
-+ rc = (jlong)gtk_radio_menu_item_new((GSList *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1radio_1menu_1item_1new_1with_1label
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
-+ rc = (jlong)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
-@@ -12023,12 +12023,12 @@
- #endif
-
- #ifndef NO__1gtk_1range_1get_1adjustment
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1range_1get_1adjustment_FUNC);
-- rc = (jint)gtk_range_get_adjustment((GtkRange *)arg0);
-+ rc = (jlong)gtk_range_get_adjustment((GtkRange *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1range_1get_1adjustment_FUNC);
- return rc;
- }
-@@ -12036,7 +12036,7 @@
-
- #ifndef NO__1gtk_1range_1set_1increments
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1increments)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1increments_FUNC);
- gtk_range_set_increments((GtkRange *)arg0, arg1, arg2);
-@@ -12046,7 +12046,7 @@
-
- #ifndef NO__1gtk_1range_1set_1inverted
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1inverted)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1inverted_FUNC);
- gtk_range_set_inverted((GtkRange *)arg0, arg1);
-@@ -12056,7 +12056,7 @@
-
- #ifndef NO__1gtk_1range_1set_1range
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1range)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1range_FUNC);
- gtk_range_set_range((GtkRange *)arg0, arg1, arg2);
-@@ -12066,7 +12066,7 @@
-
- #ifndef NO__1gtk_1range_1set_1value
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1value)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1value_FUNC);
- gtk_range_set_value((GtkRange *)arg0, arg1);
-@@ -12089,12 +12089,12 @@
- #endif
-
- #ifndef NO__1gtk_1rc_1style_1get_1bg_1pixmap_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
-- rc = (jint)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
-+ rc = (jlong)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
- return rc;
- }
-@@ -12102,7 +12102,7 @@
-
- #ifndef NO__1gtk_1rc_1style_1get_1color_1flags
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
-@@ -12114,7 +12114,7 @@
-
- #ifndef NO__1gtk_1rc_1style_1set_1bg
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
-@@ -12127,7 +12127,7 @@
-
- #ifndef NO__1gtk_1rc_1style_1set_1bg_1pixmap_1name
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
- gtk_rc_style_set_bg_pixmap_name((GtkRcStyle *)arg0, arg1, (char *)arg2);
-@@ -12137,7 +12137,7 @@
-
- #ifndef NO__1gtk_1rc_1style_1set_1color_1flags
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
- gtk_rc_style_set_color_flags((GtkRcStyle *)arg0, arg1, arg2);
-@@ -12147,7 +12147,7 @@
-
- #ifndef NO__1gtk_1rc_1style_1set_1fg
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1fg)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
-@@ -12160,7 +12160,7 @@
-
- #ifndef NO__1gtk_1rc_1style_1set_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1text)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
-@@ -12173,7 +12173,7 @@
-
- #ifndef NO__1gtk_1scale_1set_1digits
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1digits_FUNC);
- gtk_scale_set_digits((GtkScale *)arg0, (gint)arg1);
-@@ -12183,7 +12183,7 @@
-
- #ifndef NO__1gtk_1scale_1set_1draw_1value
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1draw_1value)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
- gtk_scale_set_draw_value((GtkScale *)arg0, (gboolean)arg1);
-@@ -12193,7 +12193,7 @@
-
- #ifndef NO__1gtk_1scrolled_1window_1add_1with_1viewport
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
- gtk_scrolled_window_add_with_viewport((GtkScrolledWindow *)arg0, (GtkWidget *)arg1);
-@@ -12202,12 +12202,12 @@
- #endif
-
- #ifndef NO__1gtk_1scrolled_1window_1get_1hadjustment
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
-- rc = (jint)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
-+ rc = (jlong)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
- return rc;
- }
-@@ -12215,7 +12215,7 @@
-
- #ifndef NO__1gtk_1scrolled_1window_1get_1policy
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1policy)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -12232,7 +12232,7 @@
-
- #ifndef NO__1gtk_1scrolled_1window_1get_1shadow_1type
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
-@@ -12243,24 +12243,24 @@
- #endif
-
- #ifndef NO__1gtk_1scrolled_1window_1get_1vadjustment
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
-- rc = (jint)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
-+ rc = (jlong)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1scrolled_1window_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1new_FUNC);
-- rc = (jint)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
-+ rc = (jlong)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1new_FUNC);
- return rc;
- }
-@@ -12268,7 +12268,7 @@
-
- #ifndef NO__1gtk_1scrolled_1window_1set_1placement
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1placement)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1placement_FUNC);
- gtk_scrolled_window_set_placement((GtkScrolledWindow *)arg0, (GtkCornerType)arg1);
-@@ -12278,7 +12278,7 @@
-
- #ifndef NO__1gtk_1scrolled_1window_1set_1policy
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
- gtk_scrolled_window_set_policy((GtkScrolledWindow *)arg0, (GtkPolicyType)arg1, (GtkPolicyType)arg2);
-@@ -12288,7 +12288,7 @@
-
- #ifndef NO__1gtk_1scrolled_1window_1set_1shadow_1type
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
- gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)arg0, (GtkShadowType)arg1);
-@@ -12298,7 +12298,7 @@
-
- #ifndef NO__1gtk_1selection_1data_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1free_FUNC);
- gtk_selection_data_free((GtkSelectionData *)arg0);
-@@ -12308,7 +12308,7 @@
-
- #ifndef NO__1gtk_1selection_1data_1set
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1set)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1set_FUNC);
- gtk_selection_data_set((GtkSelectionData *)arg0, (GdkAtom)arg1, (gint)arg2, (const guchar *)arg3, (gint)arg4);
-@@ -12317,72 +12317,72 @@
- #endif
-
- #ifndef NO__1gtk_1separator_1menu_1item_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
-- rc = (jint)gtk_separator_menu_item_new();
-+ rc = (jlong)gtk_separator_menu_item_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1set_1locale
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1set_1locale)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1set_1locale)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1set_1locale_FUNC);
-- rc = (jint)gtk_set_locale();
-+ rc = (jlong)gtk_set_locale();
- OS_NATIVE_EXIT(env, that, _1gtk_1set_1locale_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1settings_1get_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1settings_1get_1default_FUNC);
-- rc = (jint)gtk_settings_get_default();
-+ rc = (jlong)gtk_settings_get_default();
- OS_NATIVE_EXIT(env, that, _1gtk_1settings_1get_1default_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1socket_1get_1id
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1socket_1get_1id_FUNC);
-- rc = (jint)gtk_socket_get_id((GtkSocket *)arg0);
-+ rc = (jlong)gtk_socket_get_id((GtkSocket *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1socket_1get_1id_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1socket_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1socket_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1socket_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1socket_1new_FUNC);
-- rc = (jint)gtk_socket_new();
-+ rc = (jlong)gtk_socket_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1socket_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1spin_1button_1get_1adjustment
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
-- rc = (jint)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
-+ rc = (jlong)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
- return rc;
- }
-@@ -12390,7 +12390,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1get_1digits
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1digits)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
-@@ -12401,12 +12401,12 @@
- #endif
-
- #ifndef NO__1gtk_1spin_1button_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jint arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1new_FUNC);
-- rc = (jint)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
-+ rc = (jlong)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
- OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1new_FUNC);
- return rc;
- }
-@@ -12414,7 +12414,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1set_1digits
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1digits)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
- gtk_spin_button_set_digits((GtkSpinButton*)arg0, arg1);
-@@ -12424,7 +12424,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1set_1increments
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1increments)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
- gtk_spin_button_set_increments((GtkSpinButton*)arg0, arg1, arg2);
-@@ -12434,7 +12434,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1set_1range
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1range)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
- gtk_spin_button_set_range((GtkSpinButton*)arg0, arg1, arg2);
-@@ -12444,7 +12444,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1set_1value
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1value)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
- gtk_spin_button_set_value((GtkSpinButton*)arg0, arg1);
-@@ -12454,7 +12454,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1set_1wrap
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1wrap)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
- gtk_spin_button_set_wrap((GtkSpinButton*)arg0, arg1);
-@@ -12464,7 +12464,7 @@
-
- #ifndef NO__1gtk_1spin_1button_1update
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1update)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1update_FUNC);
- gtk_spin_button_update((GtkSpinButton*)arg0);
-@@ -12474,7 +12474,7 @@
-
- #ifndef NO__1gtk_1style_1get_1base
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1base)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1base_FUNC);
-@@ -12488,7 +12488,7 @@
-
- #ifndef NO__1gtk_1style_1get_1bg
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_FUNC);
-@@ -12502,21 +12502,21 @@
-
- #ifndef NO__1gtk_1style_1get_1bg_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_bg_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1bg_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1black
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkColor _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_FUNC);
-@@ -12530,21 +12530,21 @@
-
- #ifndef NO__1gtk_1style_1get_1black_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_1gc_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- gtk_style_get_black_gc((GtkStyle *)arg0, (GdkGC **)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1black_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1dark
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_FUNC);
-@@ -12558,21 +12558,21 @@
-
- #ifndef NO__1gtk_1style_1get_1dark_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_dark_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1dark_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1fg
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_FUNC);
-@@ -12586,25 +12586,25 @@
-
- #ifndef NO__1gtk_1style_1get_1fg_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_fg_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1fg_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1font_1desc
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
-- rc = (jint)gtk_style_get_font_desc((GtkStyle *)arg0);
-+ rc = (jlong)gtk_style_get_font_desc((GtkStyle *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
- return rc;
- }
-@@ -12612,7 +12612,7 @@
-
- #ifndef NO__1gtk_1style_1get_1light
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_FUNC);
-@@ -12626,35 +12626,35 @@
-
- #ifndef NO__1gtk_1style_1get_1light_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_light_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1light_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1mid_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1mid_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1mid_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_mid_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1mid_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_FUNC);
-@@ -12668,49 +12668,49 @@
-
- #ifndef NO__1gtk_1style_1get_1text_1aa_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text_1aa_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_1aa_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_text_aa_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_1aa_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1text_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_1gc_FUNC);
-- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_style_get_text_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1white_1gc
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1white_1gc)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1white_1gc_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- gtk_style_get_white_gc((GtkStyle *)arg0, (GdkGC **)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1white_1gc_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1style_1get_1xthickness
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1xthickness)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1xthickness_FUNC);
-@@ -12722,7 +12722,7 @@
-
- #ifndef NO__1gtk_1style_1get_1ythickness
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1ythickness)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1ythickness_FUNC);
-@@ -12733,14 +12733,14 @@
- #endif
-
- #ifndef NO__1gtk_1style_1render_1icon
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1render_1icon)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jbyteArray arg6)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1style_1render_1icon)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jlong arg5, jbyteArray arg6)
- {
- jbyte *lparg6=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1style_1render_1icon_FUNC);
- if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_style_render_icon((GtkStyle *)arg0, (GtkIconSource *)arg1, arg2, arg3, arg4, (GtkWidget *)arg5, (const gchar *)lparg6);
-+ rc = (jlong)gtk_style_render_icon((GtkStyle *)arg0, (GtkIconSource *)arg1, arg2, arg3, arg4, (GtkWidget *)arg5, (const gchar *)lparg6);
- fail:
- if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1style_1render_1icon_FUNC);
-@@ -12749,12 +12749,12 @@
- #endif
-
- #ifndef NO__1gtk_1target_1list_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1new_FUNC);
-- rc = (jint)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
-+ rc = (jlong)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1target_1list_1new_FUNC);
- return rc;
- }
-@@ -12762,7 +12762,7 @@
-
- #ifndef NO__1gtk_1target_1list_1unref
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1target_1list_1unref)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1unref_FUNC);
- gtk_target_list_unref((GtkTargetList *)arg0);
-@@ -12772,7 +12772,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1copy_1clipboard
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
- gtk_text_buffer_copy_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1);
-@@ -12782,7 +12782,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1cut_1clipboard
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
- gtk_text_buffer_cut_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1, (gboolean)arg2);
-@@ -12792,7 +12792,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1delete
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1delete)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-@@ -12809,7 +12809,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1bounds
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1bounds)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-@@ -12826,7 +12826,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1char_1count
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1char_1count)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1char_1count_FUNC);
-@@ -12838,7 +12838,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1end_1iter
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1end_1iter)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
-@@ -12851,12 +12851,12 @@
- #endif
-
- #ifndef NO__1gtk_1text_1buffer_1get_1insert
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
-- rc = (jint)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
-+ rc = (jlong)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
- return rc;
- }
-@@ -12864,7 +12864,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1line
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1line)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
-@@ -12878,7 +12878,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1mark
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1mark)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
-@@ -12892,7 +12892,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1offset
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1offset)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
-@@ -12906,7 +12906,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1line_1count
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
-@@ -12917,12 +12917,12 @@
- #endif
-
- #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bound
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
-- rc = (jint)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
-+ rc = (jlong)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
- return rc;
- }
-@@ -12930,7 +12930,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1get_1selection_1bounds
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bounds)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-@@ -12948,16 +12948,16 @@
- #endif
-
- #ifndef NO__1gtk_1text_1buffer_1get_1text
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
-+ rc = (jlong)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-@@ -12966,40 +12966,40 @@
- }
- #endif
-
--#ifndef NO__1gtk_1text_1buffer_1insert__II_3BI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
-+#ifndef NO__1gtk_1text_1buffer_1insert__JJ_3BI
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jint arg3)
- {
- jbyte *lparg2=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)arg1, (const gchar *)lparg2, (gint)arg3);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1text_1buffer_1insert__I_3B_3BI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
-+#ifndef NO__1gtk_1text_1buffer_1insert__J_3B_3BI
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
- {
- jbyte *lparg1=NULL;
- jbyte *lparg2=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (const gchar *)lparg2, (gint)arg3);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1text_1buffer_1move_1mark
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1move_1mark)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2)
- {
- jbyte *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1move_1mark_FUNC);
-@@ -13013,7 +13013,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1paste_1clipboard
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jboolean arg3)
- {
- jbyte *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
-@@ -13027,7 +13027,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1place_1cursor
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1place_1cursor)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
-@@ -13041,7 +13041,7 @@
-
- #ifndef NO__1gtk_1text_1buffer_1set_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1set_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
-@@ -13087,7 +13087,7 @@
-
- #ifndef NO__1gtk_1text_1view_1buffer_1to_1window_1coords
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1buffer_1to_1window_1coords)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
- {
- jint *lparg4=NULL;
- jint *lparg5=NULL;
-@@ -13103,12 +13103,12 @@
- #endif
-
- #ifndef NO__1gtk_1text_1view_1get_1buffer
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
-- rc = (jint)gtk_text_view_get_buffer((GtkTextView *)arg0);
-+ rc = (jlong)gtk_text_view_get_buffer((GtkTextView *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
- return rc;
- }
-@@ -13116,7 +13116,7 @@
-
- #ifndef NO__1gtk_1text_1view_1get_1editable
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1editable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
-@@ -13128,7 +13128,7 @@
-
- #ifndef NO__1gtk_1text_1view_1get_1iter_1at_1location
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1at_1location)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jint arg3)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
-@@ -13142,7 +13142,7 @@
-
- #ifndef NO__1gtk_1text_1view_1get_1iter_1location
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1location)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jobject arg2)
- {
- jbyte *lparg1=NULL;
- GdkRectangle _arg2, *lparg2=NULL;
-@@ -13159,7 +13159,7 @@
-
- #ifndef NO__1gtk_1text_1view_1get_1line_1at_1y
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1line_1at_1y)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
- {
- jbyte *lparg1=NULL;
- jint *lparg3=NULL;
-@@ -13176,7 +13176,7 @@
-
- #ifndef NO__1gtk_1text_1view_1get_1visible_1rect
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1visible_1rect)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
-@@ -13189,24 +13189,24 @@
- #endif
-
- #ifndef NO__1gtk_1text_1view_1get_1window
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1window_FUNC);
-- rc = (jint)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
-+ rc = (jlong)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1window_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1text_1view_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1new_FUNC);
-- rc = (jint)gtk_text_view_new();
-+ rc = (jlong)gtk_text_view_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1new_FUNC);
- return rc;
- }
-@@ -13214,7 +13214,7 @@
-
- #ifndef NO__1gtk_1text_1view_1scroll_1mark_1onscreen
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1mark_1onscreen)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1mark_1onscreen_FUNC);
- gtk_text_view_scroll_mark_onscreen((GtkTextView *)arg0, (GtkTextMark *)arg1);
-@@ -13224,7 +13224,7 @@
-
- #ifndef NO__1gtk_1text_1view_1scroll_1to_1iter
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
- {
- jbyte *lparg1=NULL;
- jboolean rc = 0;
-@@ -13240,7 +13240,7 @@
-
- #ifndef NO__1gtk_1text_1view_1set_1editable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
- gtk_text_view_set_editable((GtkTextView *)arg0, (gboolean)arg1);
-@@ -13250,7 +13250,7 @@
-
- #ifndef NO__1gtk_1text_1view_1set_1justification
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1justification)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
- gtk_text_view_set_justification((GtkTextView *)arg0, arg1);
-@@ -13260,7 +13260,7 @@
-
- #ifndef NO__1gtk_1text_1view_1set_1tabs
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1tabs)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
- gtk_text_view_set_tabs((GtkTextView *)arg0, (PangoTabArray *)arg1);
-@@ -13270,7 +13270,7 @@
-
- #ifndef NO__1gtk_1text_1view_1set_1wrap_1mode
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
- gtk_text_view_set_wrap_mode((GtkTextView *)arg0, arg1);
-@@ -13280,7 +13280,7 @@
-
- #ifndef NO__1gtk_1text_1view_1window_1to_1buffer_1coords
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1window_1to_1buffer_1coords)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
- {
- jint *lparg4=NULL;
- jint *lparg5=NULL;
-@@ -13297,7 +13297,7 @@
-
- #ifndef NO__1gtk_1timeout_1add
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1timeout_1add)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1timeout_1add_FUNC);
-@@ -13319,7 +13319,7 @@
-
- #ifndef NO__1gtk_1toggle_1button_1get_1active
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1active)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
-@@ -13331,7 +13331,7 @@
-
- #ifndef NO__1gtk_1toggle_1button_1get_1inconsistent
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1inconsistent)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1inconsistent_FUNC);
-@@ -13342,12 +13342,12 @@
- #endif
-
- #ifndef NO__1gtk_1toggle_1button_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1new_FUNC);
-- rc = (jint)gtk_toggle_button_new();
-+ rc = (jlong)gtk_toggle_button_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1new_FUNC);
- return rc;
- }
-@@ -13355,7 +13355,7 @@
-
- #ifndef NO__1gtk_1toggle_1button_1set_1active
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1active)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
- gtk_toggle_button_set_active((GtkToggleButton *)arg0, (gboolean)arg1);
-@@ -13365,7 +13365,7 @@
-
- #ifndef NO__1gtk_1toggle_1button_1set_1inconsistent
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
- gtk_toggle_button_set_inconsistent((GtkToggleButton *)arg0, (gboolean)arg1);
-@@ -13375,7 +13375,7 @@
-
- #ifndef NO__1gtk_1toggle_1button_1set_1mode
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1mode)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
- gtk_toggle_button_set_mode((GtkToggleButton *)arg0, (gboolean)arg1);
-@@ -13385,7 +13385,7 @@
-
- #ifndef NO__1gtk_1toolbar_1insert_1widget
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1insert_1widget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
-@@ -13401,12 +13401,12 @@
- #endif
-
- #ifndef NO__1gtk_1toolbar_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1new_FUNC);
-- rc = (jint)gtk_toolbar_new();
-+ rc = (jlong)gtk_toolbar_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1new_FUNC);
- return rc;
- }
-@@ -13414,7 +13414,7 @@
-
- #ifndef NO__1gtk_1toolbar_1set_1orientation
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1orientation)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1orientation_FUNC);
- gtk_toolbar_set_orientation((GtkToolbar *)arg0, (GtkOrientation)arg1);
-@@ -13424,7 +13424,7 @@
-
- #ifndef NO__1gtk_1tooltip_1trigger_1tooltip_1query
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tooltip_1trigger_1tooltip_1query_FUNC);
- /*
-@@ -13449,12 +13449,12 @@
- #endif
-
- #ifndef NO__1gtk_1tooltips_1data_1get
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1data_1get_FUNC);
-- rc = (jint)gtk_tooltips_data_get((GtkWidget *)arg0);
-+ rc = (jlong)gtk_tooltips_data_get((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1data_1get_FUNC);
- return rc;
- }
-@@ -13462,7 +13462,7 @@
-
- #ifndef NO__1gtk_1tooltips_1disable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1disable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1disable_FUNC);
- gtk_tooltips_disable((GtkTooltips *)arg0);
-@@ -13472,7 +13472,7 @@
-
- #ifndef NO__1gtk_1tooltips_1enable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1enable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1enable_FUNC);
- gtk_tooltips_enable((GtkTooltips *)arg0);
-@@ -13482,7 +13482,7 @@
-
- #ifndef NO__1gtk_1tooltips_1force_1window
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1force_1window)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1force_1window_FUNC);
- gtk_tooltips_force_window((GtkTooltips *)arg0);
-@@ -13491,12 +13491,12 @@
- #endif
-
- #ifndef NO__1gtk_1tooltips_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1new_FUNC);
-- rc = (jint)gtk_tooltips_new();
-+ rc = (jlong)gtk_tooltips_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1new_FUNC);
- return rc;
- }
-@@ -13504,7 +13504,7 @@
-
- #ifndef NO__1gtk_1tooltips_1set_1tip
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1set_1tip)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
-@@ -13519,37 +13519,37 @@
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1model_1get__III_3II
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3II)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1model_1get__JJI_3IJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3IJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintArray arg3, jlong arg4)
- {
- jint *lparg3=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3IJ_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3IJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1model_1get__III_3JI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3JI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlongArray arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1model_1get__JJI_3JJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3JJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3, jlong arg4)
- {
- jlong *lparg3=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3JJ_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3JJ_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1model_1get_1iter
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
-@@ -13561,7 +13561,7 @@
-
- #ifndef NO__1gtk_1tree_1model_1get_1iter_1first
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
-@@ -13573,7 +13573,7 @@
-
- #ifndef NO__1gtk_1tree_1model_1get_1n_1columns
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
-@@ -13584,24 +13584,24 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1model_1get_1path
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
-- rc = (jint)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
-+ rc = (jlong)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1model_1get_1type
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
-- rc = (jint)gtk_tree_model_get_type();
-+ rc = (jlong)gtk_tree_model_get_type();
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
- return rc;
- }
-@@ -13609,7 +13609,7 @@
-
- #ifndef NO__1gtk_1tree_1model_1iter_1children
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1children)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
-@@ -13621,7 +13621,7 @@
-
- #ifndef NO__1gtk_1tree_1model_1iter_1n_1children
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
-@@ -13633,7 +13633,7 @@
-
- #ifndef NO__1gtk_1tree_1model_1iter_1next
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1next)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
-@@ -13645,7 +13645,7 @@
-
- #ifndef NO__1gtk_1tree_1model_1iter_1nth_1child
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
-@@ -13657,7 +13657,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1append_1index
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1append_1index)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
- gtk_tree_path_append_index((GtkTreePath *)arg0, arg1);
-@@ -13666,12 +13666,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1path_1compare
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1compare_FUNC);
-- rc = (jint)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
-+ rc = (jlong)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1compare_FUNC);
- return rc;
- }
-@@ -13679,7 +13679,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1down
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1down)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1down_FUNC);
- gtk_tree_path_down((GtkTreePath *)arg0);
-@@ -13689,7 +13689,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1free_FUNC);
- gtk_tree_path_free((GtkTreePath *)arg0);
-@@ -13699,7 +13699,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1get_1depth
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1depth)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
-@@ -13710,62 +13710,62 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1path_1get_1indices
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
-- rc = (jint)gtk_tree_path_get_indices((GtkTreePath *)arg0);
-+ rc = (jlong)gtk_tree_path_get_indices((GtkTreePath *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1path_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_FUNC);
-- rc = (jint)gtk_tree_path_new();
-+ rc = (jlong)gtk_tree_path_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1path_1new_1first
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1first)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1first)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1first_FUNC);
-- rc = (jint)gtk_tree_path_new_first();
-+ rc = (jlong)gtk_tree_path_new_first();
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1first_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1path_1new_1from_1string__I
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)
-- (JNIEnv *env, jclass that, jint arg0)
--{
-- jint rc = 0;
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
-- rc = (jint)gtk_tree_path_new_from_string((const gchar *)arg0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
-+#ifndef NO__1gtk_1tree_1path_1new_1from_1string__J
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J)
-+ (JNIEnv *env, jclass that, jlong arg0)
-+{
-+ jlong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
-+ rc = (jlong)gtk_tree_path_new_from_string((const gchar *)arg0);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1path_1new_1from_1string___3B
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_tree_path_new_from_string((const gchar *)lparg0);
-+ rc = (jlong)gtk_tree_path_new_from_string((const gchar *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
-@@ -13775,7 +13775,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1next
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1next)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1next_FUNC);
- gtk_tree_path_next((GtkTreePath *)arg0);
-@@ -13785,7 +13785,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1prev
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1prev)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1prev_FUNC);
-@@ -13797,7 +13797,7 @@
-
- #ifndef NO__1gtk_1tree_1path_1up
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1up)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1up_FUNC);
-@@ -13809,7 +13809,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1count_1selected_1rows
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
-@@ -13838,35 +13838,35 @@
-
- #ifndef NO__1gtk_1tree_1selection_1get_1selected
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlong arg2)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jboolean)gtk_tree_selection_get_selected((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1, (GtkTreeIter *)arg2);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1selection_1get_1selected_1rows
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong *lparg1=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- /*
-- rc = (jint)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
-+ rc = (jlong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(GtkTreeSelection *, GtkTreeModel **);
-+ typedef jlong (*FPTR)(GtkTreeSelection *, GtkTreeModel **);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -13875,11 +13875,11 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
-+ rc = (jlong)(*fptr)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
- }
- }
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
- return rc;
- }
-@@ -13887,7 +13887,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1path_1is_1selected
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
-@@ -13899,7 +13899,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1select_1all
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1all)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
- gtk_tree_selection_select_all((GtkTreeSelection *)arg0);
-@@ -13909,7 +13909,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1select_1iter
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1iter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
- gtk_tree_selection_select_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
-@@ -13919,7 +13919,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1selected_1foreach
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1selected_1foreach)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1selected_1foreach_FUNC);
- gtk_tree_selection_selected_foreach((GtkTreeSelection *)arg0, (GtkTreeSelectionForeachFunc)arg1, (gpointer)arg2);
-@@ -13929,7 +13929,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1set_1mode
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1mode)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
- gtk_tree_selection_set_mode((GtkTreeSelection *)arg0, (GtkSelectionMode)arg1);
-@@ -13939,7 +13939,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1unselect_1all
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
- gtk_tree_selection_unselect_all((GtkTreeSelection *)arg0);
-@@ -13949,7 +13949,7 @@
-
- #ifndef NO__1gtk_1tree_1selection_1unselect_1iter
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
- gtk_tree_selection_unselect_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
-@@ -13959,7 +13959,7 @@
-
- #ifndef NO__1gtk_1tree_1store_1append
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1append)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1append_FUNC);
- gtk_tree_store_append((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2);
-@@ -13969,7 +13969,7 @@
-
- #ifndef NO__1gtk_1tree_1store_1clear
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1clear)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1clear_FUNC);
- gtk_tree_store_clear((GtkTreeStore *)arg0);
-@@ -13979,7 +13979,7 @@
-
- #ifndef NO__1gtk_1tree_1store_1insert
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1insert)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1insert_FUNC);
- gtk_tree_store_insert((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2, (gint)arg3);
-@@ -13988,16 +13988,16 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1store_1newv
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
-+ (JNIEnv *env, jclass that, jint arg0, jlongArray arg1)
- {
-- jint *lparg1=NULL;
-- jint rc = 0;
-+ jlong *lparg1=NULL;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_tree_store_newv(arg0, (GType *)lparg1);
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ rc = (jlong)gtk_tree_store_newv(arg0, (GType *)lparg1);
- fail:
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC);
- return rc;
- }
-@@ -14005,7 +14005,7 @@
-
- #ifndef NO__1gtk_1tree_1store_1remove
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1remove)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1remove_FUNC);
- gtk_tree_store_remove((GtkTreeStore *)arg0, (GtkTreeIter *)arg1);
-@@ -14013,66 +14013,66 @@
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1store_1set__IIIII
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1store_1set__JJIIJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIIJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jlong arg4)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIIJ_FUNC);
- gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIIJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1store_1set__IIIJI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1store_1set__JJIJJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIJJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIJJ_FUNC);
- gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIJJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jobject arg3, jlong arg4)
- {
- GdkColor _arg3, *lparg3=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
- if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
- gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
- fail:
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1store_1set__IIIZI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIZI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1store_1set__JJIZJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIZJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jboolean arg3, jlong arg4)
- {
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIZJ_FUNC);
- gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIZJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1tree_1store_1set__III_3BI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__III_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
-+#ifndef NO__1gtk_1tree_1store_1set__JJI_3BJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJI_3BJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jbyteArray arg3, jlong arg4)
- {
- jbyte *lparg3=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJI_3BJ_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
- gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJI_3BJ_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1collapse_1row
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1collapse_1row)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
-@@ -14084,7 +14084,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1add_1attribute
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1add_1attribute)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jint arg3)
- {
- jbyte *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
-@@ -14098,7 +14098,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1position
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1position)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jintArray arg3)
- {
- jint *lparg2=NULL;
- jint *lparg3=NULL;
-@@ -14134,7 +14134,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -14160,7 +14160,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1cell_1set_1cell_1data
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1data)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3, jboolean arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
- gtk_tree_view_column_cell_set_cell_data((GtkTreeViewColumn *)arg0, (GtkTreeModel *)arg1, (GtkTreeIter *)arg2, arg3, arg4);
-@@ -14170,7 +14170,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1clear
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1clear)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
- gtk_tree_view_column_clear((GtkTreeViewColumn *)arg0);
-@@ -14179,12 +14179,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1cell_1renderers
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1cell_1renderers_FUNC);
-- rc = (jint)gtk_tree_view_column_get_cell_renderers((GtkTreeViewColumn *)arg0);
-+ rc = (jlong)gtk_tree_view_column_get_cell_renderers((GtkTreeViewColumn *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1cell_1renderers_FUNC);
- return rc;
- }
-@@ -14192,7 +14192,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1fixed_1width
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
-@@ -14204,7 +14204,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1reorderable
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
-@@ -14216,7 +14216,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1resizable
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
-@@ -14228,7 +14228,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1sizing
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sizing)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sizing_FUNC);
-@@ -14240,7 +14240,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1indicator
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1indicator)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sort_1indicator_FUNC);
-@@ -14252,7 +14252,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1order
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1order)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sort_1order_FUNC);
-@@ -14264,7 +14264,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1spacing
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1spacing)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1spacing_FUNC);
-@@ -14276,7 +14276,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1visible
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
-@@ -14288,7 +14288,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1get_1width
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
-@@ -14299,12 +14299,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1column_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
-- rc = (jint)gtk_tree_view_column_new();
-+ rc = (jlong)gtk_tree_view_column_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
- return rc;
- }
-@@ -14312,7 +14312,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1pack_1end
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
- gtk_tree_view_column_pack_end((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
-@@ -14322,7 +14322,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1pack_1start
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
- gtk_tree_view_column_pack_start((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
-@@ -14332,7 +14332,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1alignment
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
-- (JNIEnv *env, jclass that, jint arg0, jfloat arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jfloat arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
- gtk_tree_view_column_set_alignment((GtkTreeViewColumn *)arg0, arg1);
-@@ -14342,7 +14342,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1cell_1data_1func
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1func)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
- gtk_tree_view_column_set_cell_data_func((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (GtkTreeCellDataFunc)arg2, (gpointer)arg3, (GtkDestroyNotify)arg4);
-@@ -14352,7 +14352,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1clickable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
- gtk_tree_view_column_set_clickable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-@@ -14362,7 +14362,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1fixed_1width
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
- gtk_tree_view_column_set_fixed_width((GtkTreeViewColumn *)arg0, (gint)arg1);
-@@ -14372,7 +14372,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1min_1width
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
- gtk_tree_view_column_set_min_width((GtkTreeViewColumn *)arg0, (gint)arg1);
-@@ -14382,7 +14382,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1reorderable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
- gtk_tree_view_column_set_reorderable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-@@ -14392,7 +14392,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1resizable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
- gtk_tree_view_column_set_resizable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-@@ -14402,7 +14402,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1sizing
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
- gtk_tree_view_column_set_sizing((GtkTreeViewColumn *)arg0, (GtkTreeViewColumnSizing)arg1);
-@@ -14412,7 +14412,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1indicator
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
- gtk_tree_view_column_set_sort_indicator((GtkTreeViewColumn *)arg0, (gboolean)arg1);
-@@ -14422,7 +14422,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1order
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
- gtk_tree_view_column_set_sort_order((GtkTreeViewColumn *)arg0, (GtkSortType)arg1);
-@@ -14432,7 +14432,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1title
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1title)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1title_FUNC);
-@@ -14446,7 +14446,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1visible
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
- gtk_tree_view_column_set_visible((GtkTreeViewColumn *)arg0, arg1);
-@@ -14456,7 +14456,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1column_1set_1widget
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
- gtk_tree_view_column_set_widget((GtkTreeViewColumn *)arg0, (GtkWidget *)arg1);
-@@ -14465,12 +14465,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1create_1row_1drag_1icon
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
-- rc = (jint)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
-+ rc = (jlong)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
- return rc;
- }
-@@ -14478,7 +14478,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1expand_1row
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1expand_1row)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
-@@ -14490,7 +14490,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1background_1area
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1background_1area)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3)
- {
- GdkRectangle _arg3, *lparg3=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
-@@ -14503,12 +14503,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1get_1bin_1window
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
-- rc = (jint)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
-+ rc = (jlong)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
- return rc;
- }
-@@ -14516,7 +14516,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1cell_1area
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cell_1area)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3)
- {
- GdkRectangle _arg3, *lparg3=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
-@@ -14529,24 +14529,24 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1get_1column
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
-- rc = (jint)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
-+ rc = (jlong)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1get_1columns
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
-- rc = (jint)gtk_tree_view_get_columns((GtkTreeView *)arg0);
-+ rc = (jlong)gtk_tree_view_get_columns((GtkTreeView *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
- return rc;
- }
-@@ -14554,28 +14554,28 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1cursor
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cursor)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2)
- {
-- jint *lparg1=NULL;
-- jint *lparg2=NULL;
-+ jlong *lparg1=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cursor_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;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_tree_view_get_cursor((GtkTreeView *)arg0, (GtkTreePath **)lparg1, (GtkTreeViewColumn **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1get_1expander_1column
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
-- rc = (jint)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
-+ rc = (jlong)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
- return rc;
- }
-@@ -14583,7 +14583,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1headers_1visible
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
-@@ -14595,24 +14595,24 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1path_1at_1pos
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlongArray arg3, jlongArray arg4, jintArray arg5, jintArray arg6)
- {
-- jint *lparg3=NULL;
-- jint *lparg4=NULL;
-+ jlong *lparg3=NULL;
-+ jlong *lparg4=NULL;
- jint *lparg5=NULL;
- jint *lparg6=NULL;
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
-- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
-+ if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-+ if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
- rc = (jboolean)gtk_tree_view_get_path_at_pos((GtkTreeView *)arg0, (gint)arg1, (gint)arg2, (GtkTreePath **)lparg3, (GtkTreeViewColumn **)lparg4, (gint *)lparg5, (gint *)lparg6);
- fail:
- if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
- if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-+ if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
-+ if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
- return rc;
- }
-@@ -14620,7 +14620,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1rules_1hint
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
-@@ -14631,12 +14631,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1get_1selection
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
-- rc = (jint)gtk_tree_view_get_selection((GtkTreeView *)arg0);
-+ rc = (jlong)gtk_tree_view_get_selection((GtkTreeView *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
- return rc;
- }
-@@ -14644,7 +14644,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1get_1visible_1rect
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1visible_1rect)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GdkRectangle _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
-@@ -14658,7 +14658,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1insert_1column
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1insert_1column)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
-@@ -14670,7 +14670,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1move_1column_1after
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
- gtk_tree_view_move_column_after((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1, (GtkTreeViewColumn *)arg2);
-@@ -14679,12 +14679,12 @@
- #endif
-
- #ifndef NO__1gtk_1tree_1view_1new_1with_1model
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
-- rc = (jint)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
-+ rc = (jlong)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
- return rc;
- }
-@@ -14692,7 +14692,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1remove_1column
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1remove_1column)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
- gtk_tree_view_remove_column((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1);
-@@ -14702,7 +14702,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1row_1expanded
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1row_1expanded)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
-@@ -14714,7 +14714,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1scroll_1to_1cell
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jfloat arg4, jfloat arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3, jfloat arg4, jfloat arg5)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
- gtk_tree_view_scroll_to_cell((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (gboolean)arg3, (gfloat)arg4, (gfloat)arg5);
-@@ -14724,7 +14724,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1scroll_1to_1point
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
- gtk_tree_view_scroll_to_point((GtkTreeView *)arg0, (gint)arg1, (gint)arg2);
-@@ -14734,7 +14734,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1cursor
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1cursor)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
- gtk_tree_view_set_cursor((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, arg3);
-@@ -14744,7 +14744,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1drag_1dest_1row
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
- gtk_tree_view_set_drag_dest_row((GtkTreeView *)arg0, (GtkTreePath *)arg1, arg2);
-@@ -14754,7 +14754,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1enable_1search
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1enable_1search)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1enable_1search_FUNC);
- gtk_tree_view_set_enable_search((GtkTreeView *)arg0, arg1);
-@@ -14764,7 +14764,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1headers_1visible
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
- gtk_tree_view_set_headers_visible((GtkTreeView *)arg0, (gboolean)arg1);
-@@ -14774,7 +14774,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1model
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1model)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
- gtk_tree_view_set_model((GtkTreeView *)arg0, (GtkTreeModel *)arg1);
-@@ -14784,7 +14784,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1rules_1hint
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
- gtk_tree_view_set_rules_hint((GtkTreeView *)arg0, arg1);
-@@ -14794,7 +14794,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1set_1search_1column
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
- gtk_tree_view_set_search_column((GtkTreeView *)arg0, (gint)arg1);
-@@ -14804,7 +14804,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1tree_1to_1widget_1coords
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1tree_1to_1widget_1coords)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
- {
- jint *lparg3=NULL;
- jint *lparg4=NULL;
-@@ -14821,7 +14821,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1unset_1rows_1drag_1dest
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
- gtk_tree_view_unset_rows_drag_dest((GtkTreeView *)arg0);
-@@ -14831,7 +14831,7 @@
-
- #ifndef NO__1gtk_1tree_1view_1widget_1to_1tree_1coords
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1widget_1to_1tree_1coords)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
- {
- jint *lparg3=NULL;
- jint *lparg4=NULL;
-@@ -14847,48 +14847,48 @@
- #endif
-
- #ifndef NO__1gtk_1vbox_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vbox_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1vbox_1new)
- (JNIEnv *env, jclass that, jboolean arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1vbox_1new_FUNC);
-- rc = (jint)gtk_vbox_new((gboolean)arg0, (gint)arg1);
-+ rc = (jlong)gtk_vbox_new((gboolean)arg0, (gint)arg1);
- OS_NATIVE_EXIT(env, that, _1gtk_1vbox_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1vscale_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscale_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1vscale_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1vscale_1new_FUNC);
-- rc = (jint)gtk_vscale_new((GtkAdjustment *)arg0);
-+ rc = (jlong)gtk_vscale_new((GtkAdjustment *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1vscale_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1vscrollbar_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1vscrollbar_1new_FUNC);
-- rc = (jint)gtk_vscrollbar_new((GtkAdjustment *)arg0);
-+ rc = (jlong)gtk_vscrollbar_new((GtkAdjustment *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1vscrollbar_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1vseparator_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1vseparator_1new_FUNC);
-- rc = (jint)gtk_vseparator_new();
-+ rc = (jlong)gtk_vseparator_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1vseparator_1new_FUNC);
- return rc;
- }
-@@ -14896,7 +14896,7 @@
-
- #ifndef NO__1gtk_1widget_1add_1accelerator
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1accelerator)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jint arg5)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
-@@ -14910,7 +14910,7 @@
-
- #ifndef NO__1gtk_1widget_1add_1events
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1events)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1events_FUNC);
- gtk_widget_add_events((GtkWidget *)arg0, (gint)arg1);
-@@ -14920,7 +14920,7 @@
-
- #ifndef NO__1gtk_1widget_1child_1focus
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1child_1focus)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1child_1focus_FUNC);
-@@ -14930,37 +14930,37 @@
- }
- #endif
-
--#ifndef NO__1gtk_1widget_1create_1pango_1layout__II
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+#ifndef NO__1gtk_1widget_1create_1pango_1layout__JJ
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
-- rc = (jint)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
-- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
-+ jlong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
-+ rc = (jlong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO__1gtk_1widget_1create_1pango_1layout__I_3B
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+#ifndef NO__1gtk_1widget_1create_1pango_1layout__J_3B
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
-- jint rc = 0;
-- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
-+ jlong rc = 0;
-+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
-+ rc = (jlong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1widget_1destroy
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1destroy_FUNC);
- gtk_widget_destroy((GtkWidget *)arg0);
-@@ -14970,7 +14970,7 @@
-
- #ifndef NO__1gtk_1widget_1event
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1event)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1event_FUNC);
-@@ -14981,12 +14981,12 @@
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1accessible
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1accessible_FUNC);
-- rc = (jint)gtk_widget_get_accessible((GtkWidget *)arg0);
-+ rc = (jlong)gtk_widget_get_accessible((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1accessible_FUNC);
- return rc;
- }
-@@ -14994,7 +14994,7 @@
-
- #ifndef NO__1gtk_1widget_1get_1child_1visible
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1child_1visible)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
-@@ -15017,12 +15017,12 @@
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1default_1style
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
-- rc = (jint)gtk_widget_get_default_style();
-+ rc = (jlong)gtk_widget_get_default_style();
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
- return rc;
- }
-@@ -15030,7 +15030,7 @@
-
- #ifndef NO__1gtk_1widget_1get_1direction
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1direction)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1direction_FUNC);
-@@ -15042,7 +15042,7 @@
-
- #ifndef NO__1gtk_1widget_1get_1events
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1events_FUNC);
-@@ -15053,36 +15053,36 @@
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1modifier_1style
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
-- rc = (jint)gtk_widget_get_modifier_style((GtkWidget *)arg0);
-+ rc = (jlong)gtk_widget_get_modifier_style((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1pango_1context
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
-- rc = (jint)gtk_widget_get_pango_context((GtkWidget *)arg0);
-+ rc = (jlong)gtk_widget_get_pango_context((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1parent
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_FUNC);
-- rc = (jint)gtk_widget_get_parent((GtkWidget *)arg0);
-+ rc = (jlong)gtk_widget_get_parent((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_FUNC);
- return rc;
- }
-@@ -15090,7 +15090,7 @@
-
- #ifndef NO__1gtk_1widget_1get_1size_1request
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1size_1request)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -15106,24 +15106,24 @@
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1style
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_FUNC);
-- rc = (jint)gtk_widget_get_style((GtkWidget *)arg0);
-+ rc = (jlong)gtk_widget_get_style((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1widget_1get_1toplevel
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
-- rc = (jint)gtk_widget_get_toplevel((GtkWidget *)arg0);
-+ rc = (jlong)gtk_widget_get_toplevel((GtkWidget *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
- return rc;
- }
-@@ -15131,7 +15131,7 @@
-
- #ifndef NO__1gtk_1widget_1grab_1focus
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1grab_1focus_FUNC);
- gtk_widget_grab_focus((GtkWidget *)arg0);
-@@ -15141,7 +15141,7 @@
-
- #ifndef NO__1gtk_1widget_1hide
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1hide)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1hide_FUNC);
- gtk_widget_hide((GtkWidget *)arg0);
-@@ -15151,7 +15151,7 @@
-
- #ifndef NO__1gtk_1widget_1is_1composited
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1composited_FUNC);
-@@ -15180,7 +15180,7 @@
-
- #ifndef NO__1gtk_1widget_1is_1focus
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1focus)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1focus_FUNC);
-@@ -15192,7 +15192,7 @@
-
- #ifndef NO__1gtk_1widget_1map
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1map)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1map_FUNC);
- gtk_widget_map((GtkWidget *)arg0);
-@@ -15202,7 +15202,7 @@
-
- #ifndef NO__1gtk_1widget_1mnemonic_1activate
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1mnemonic_1activate)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
-@@ -15214,7 +15214,7 @@
-
- #ifndef NO__1gtk_1widget_1modify_1base
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1base)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1base_FUNC);
-@@ -15227,7 +15227,7 @@
-
- #ifndef NO__1gtk_1widget_1modify_1bg
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1bg)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1bg_FUNC);
-@@ -15240,7 +15240,7 @@
-
- #ifndef NO__1gtk_1widget_1modify_1fg
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1fg)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1fg_FUNC);
-@@ -15253,7 +15253,7 @@
-
- #ifndef NO__1gtk_1widget_1modify_1font
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1font)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1font_FUNC);
- gtk_widget_modify_font((GtkWidget *)arg0, (PangoFontDescription *)arg1);
-@@ -15263,7 +15263,7 @@
-
- #ifndef NO__1gtk_1widget_1modify_1style
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1style)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1style_FUNC);
- gtk_widget_modify_style((GtkWidget *)arg0, (GtkRcStyle *)arg1);
-@@ -15273,7 +15273,7 @@
-
- #ifndef NO__1gtk_1widget_1modify_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1text)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- GdkColor _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1text_FUNC);
-@@ -15286,7 +15286,7 @@
-
- #ifndef NO__1gtk_1widget_1queue_1resize
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1resize)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1resize_FUNC);
- gtk_widget_queue_resize((GtkWidget *)arg0);
-@@ -15296,7 +15296,7 @@
-
- #ifndef NO__1gtk_1widget_1realize
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1realize)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1realize_FUNC);
- gtk_widget_realize((GtkWidget *)arg0);
-@@ -15306,7 +15306,7 @@
-
- #ifndef NO__1gtk_1widget_1remove_1accelerator
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1remove_1accelerator)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
- gtk_widget_remove_accelerator((GtkWidget *)arg0, (GtkAccelGroup *)arg1, (guint)arg2, (GdkModifierType)arg3);
-@@ -15316,7 +15316,7 @@
-
- #ifndef NO__1gtk_1widget_1reparent
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC);
- gtk_widget_reparent((GtkWidget *)arg0, (GtkWidget *)arg1);
-@@ -15326,7 +15326,7 @@
-
- #ifndef NO__1gtk_1widget_1send_1expose
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1send_1expose)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1send_1expose_FUNC);
-@@ -15338,7 +15338,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1app_1paintable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1app_1paintable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
- gtk_widget_set_app_paintable((GtkWidget *)arg0, arg1);
-@@ -15358,7 +15358,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1direction
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1direction)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1direction_FUNC);
- gtk_widget_set_direction((GtkWidget *)arg0, (GtkTextDirection)arg1);
-@@ -15368,7 +15368,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1double_1buffered
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
- gtk_widget_set_double_buffered((GtkWidget *)arg0, (gboolean)arg1);
-@@ -15378,7 +15378,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1name
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1name)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1name_FUNC);
-@@ -15392,7 +15392,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1parent_1window
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1parent_1window)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
- gtk_widget_set_parent_window((GtkWidget *)arg0, (GdkWindow *)arg1);
-@@ -15402,7 +15402,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1redraw_1on_1allocate
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
- gtk_widget_set_redraw_on_allocate((GtkWidget *)arg0, (gboolean)arg1);
-@@ -15412,7 +15412,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1sensitive
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1sensitive)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
- gtk_widget_set_sensitive((GtkWidget *)arg0, (gboolean)arg1);
-@@ -15422,7 +15422,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1size_1request
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1size_1request)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
- gtk_widget_set_size_request((GtkWidget *)arg0, (gint)arg1, (gint)arg2);
-@@ -15432,7 +15432,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1state
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1state)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1state_FUNC);
- gtk_widget_set_state((GtkWidget *)arg0, (GtkStateType)arg1);
-@@ -15442,7 +15442,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1style
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1style)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1style_FUNC);
- gtk_widget_set_style((GtkWidget *)arg0, (GtkStyle *)arg1);
-@@ -15452,7 +15452,7 @@
-
- #ifndef NO__1gtk_1widget_1set_1tooltip_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
-@@ -15482,7 +15482,7 @@
-
- #ifndef NO__1gtk_1widget_1shape_1combine_1mask
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1shape_1combine_1mask)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1shape_1combine_1mask_FUNC);
- gtk_widget_shape_combine_mask((GtkWidget *)arg0, (GdkBitmap *)arg1, (gint)arg2, (gint)arg3);
-@@ -15492,7 +15492,7 @@
-
- #ifndef NO__1gtk_1widget_1show
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_FUNC);
- gtk_widget_show((GtkWidget *)arg0);
-@@ -15502,7 +15502,7 @@
-
- #ifndef NO__1gtk_1widget_1show_1now
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show_1now)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_1now_FUNC);
- gtk_widget_show_now((GtkWidget *)arg0);
-@@ -15512,7 +15512,7 @@
-
- #ifndef NO__1gtk_1widget_1size_1allocate
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1allocate)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GtkAllocation _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate_FUNC);
-@@ -15525,7 +15525,7 @@
-
- #ifndef NO__1gtk_1widget_1size_1request
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1request)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
- GtkRequisition _arg1, *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1request_FUNC);
-@@ -15537,43 +15537,43 @@
- }
- #endif
-
--#ifndef NO__1gtk_1widget_1style_1get__I_3B_3II
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2, jint arg3)
-+#ifndef NO__1gtk_1widget_1style_1get__J_3B_3IJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintArray arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
- jint *lparg2=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
- }
- #endif
-
--#ifndef NO__1gtk_1widget_1style_1get__I_3B_3JI
--JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jlongArray arg2, jint arg3)
-+#ifndef NO__1gtk_1widget_1style_1get__J_3B_3JJ
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2, jlong arg3)
- {
- jbyte *lparg1=NULL;
- jlong *lparg2=NULL;
-- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
-+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-- OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
-+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
- }
- #endif
-
- #ifndef NO__1gtk_1widget_1translate_1coordinates
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1translate_1coordinates)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
- {
- jint *lparg4=NULL;
- jint *lparg5=NULL;
-@@ -15592,7 +15592,7 @@
-
- #ifndef NO__1gtk_1widget_1unrealize
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1unrealize)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1widget_1unrealize_FUNC);
- gtk_widget_unrealize((GtkWidget *)arg0);
-@@ -15602,7 +15602,7 @@
-
- #ifndef NO__1gtk_1window_1activate_1default
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1activate_1default)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1activate_1default_FUNC);
-@@ -15614,7 +15614,7 @@
-
- #ifndef NO__1gtk_1window_1add_1accel_1group
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1add_1accel_1group)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
- gtk_window_add_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
-@@ -15624,7 +15624,7 @@
-
- #ifndef NO__1gtk_1window_1deiconify
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1deiconify)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1deiconify_FUNC);
- gtk_window_deiconify((GtkWindow *)arg0);
-@@ -15634,7 +15634,7 @@
-
- #ifndef NO__1gtk_1window_1fullscreen
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1fullscreen)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1fullscreen_FUNC);
- gtk_window_fullscreen((GtkWindow *)arg0);
-@@ -15643,30 +15643,30 @@
- #endif
-
- #ifndef NO__1gtk_1window_1get_1focus
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1focus_FUNC);
-- rc = (jint)gtk_window_get_focus((GtkWindow *)arg0);
-+ rc = (jlong)gtk_window_get_focus((GtkWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1focus_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1gtk_1window_1get_1group
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1group_FUNC);
- /*
-- rc = (jint)gtk_window_get_group((GtkWindow *)arg0);
-+ rc = (jlong)gtk_window_get_group((GtkWindow *)arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(GtkWindow *);
-+ typedef jlong (*FPTR)(GtkWindow *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -15675,7 +15675,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((GtkWindow *)arg0);
-+ rc = (jlong)(*fptr)((GtkWindow *)arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1group_FUNC);
-@@ -15684,12 +15684,12 @@
- #endif
-
- #ifndef NO__1gtk_1window_1get_1icon_1list
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
-- rc = (jint)gtk_window_get_icon_list((GtkWindow *)arg0);
-+ rc = (jlong)gtk_window_get_icon_list((GtkWindow *)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
- return rc;
- }
-@@ -15697,7 +15697,7 @@
-
- #ifndef NO__1gtk_1window_1get_1mnemonic_1modifier
- JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
-@@ -15709,7 +15709,7 @@
-
- #ifndef NO__1gtk_1window_1get_1modal
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1get_1modal)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1modal_FUNC);
-@@ -15721,7 +15721,7 @@
-
- #ifndef NO__1gtk_1window_1get_1opacity
- JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jdouble rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1opacity_FUNC);
-@@ -15750,7 +15750,7 @@
-
- #ifndef NO__1gtk_1window_1get_1position
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1position)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -15767,7 +15767,7 @@
-
- #ifndef NO__1gtk_1window_1get_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -15784,7 +15784,7 @@
-
- #ifndef NO__1gtk_1window_1group_1add_1window
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1add_1window)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1add_1window_FUNC);
- gtk_window_group_add_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
-@@ -15793,12 +15793,12 @@
- #endif
-
- #ifndef NO__1gtk_1window_1group_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1new_FUNC);
-- rc = (jint)gtk_window_group_new();
-+ rc = (jlong)gtk_window_group_new();
- OS_NATIVE_EXIT(env, that, _1gtk_1window_1group_1new_FUNC);
- return rc;
- }
-@@ -15806,7 +15806,7 @@
-
- #ifndef NO__1gtk_1window_1group_1remove_1window
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1remove_1window)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
- gtk_window_group_remove_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
-@@ -15816,7 +15816,7 @@
-
- #ifndef NO__1gtk_1window_1iconify
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1iconify)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1iconify_FUNC);
- gtk_window_iconify((GtkWindow *)arg0);
-@@ -15825,12 +15825,12 @@
- #endif
-
- #ifndef NO__1gtk_1window_1list_1toplevels
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1list_1toplevels_FUNC);
-- rc = (jint)gtk_window_list_toplevels();
-+ rc = (jlong)gtk_window_list_toplevels();
- OS_NATIVE_EXIT(env, that, _1gtk_1window_1list_1toplevels_FUNC);
- return rc;
- }
-@@ -15838,7 +15838,7 @@
-
- #ifndef NO__1gtk_1window_1maximize
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1maximize)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1maximize_FUNC);
- gtk_window_maximize((GtkWindow *)arg0);
-@@ -15848,7 +15848,7 @@
-
- #ifndef NO__1gtk_1window_1move
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1move)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1move_FUNC);
- gtk_window_move((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
-@@ -15857,12 +15857,12 @@
- #endif
-
- #ifndef NO__1gtk_1window_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1gtk_1window_1new)
- (JNIEnv *env, jclass that, jint arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC);
-- rc = (jint)gtk_window_new((GtkWindowType)arg0);
-+ rc = (jlong)gtk_window_new((GtkWindowType)arg0);
- OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
- return rc;
- }
-@@ -15870,7 +15870,7 @@
-
- #ifndef NO__1gtk_1window_1present
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1present)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1present_FUNC);
- gtk_window_present((GtkWindow *)arg0);
-@@ -15880,7 +15880,7 @@
-
- #ifndef NO__1gtk_1window_1remove_1accel_1group
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1remove_1accel_1group)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
- gtk_window_remove_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
-@@ -15890,7 +15890,7 @@
-
- #ifndef NO__1gtk_1window_1resize
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1resize)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1resize_FUNC);
- gtk_window_resize((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
-@@ -15900,7 +15900,7 @@
-
- #ifndef NO__1gtk_1window_1set_1default
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1default)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1default_FUNC);
- gtk_window_set_default((GtkWindow *)arg0, (GtkWidget *)arg1);
-@@ -15910,7 +15910,7 @@
-
- #ifndef NO__1gtk_1window_1set_1destroy_1with_1parent
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
- gtk_window_set_destroy_with_parent((GtkWindow *)arg0, (gboolean)arg1);
-@@ -15920,7 +15920,7 @@
-
- #ifndef NO__1gtk_1window_1set_1geometry_1hints
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1geometry_1hints)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jint arg3)
- {
- GdkGeometry _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
-@@ -15933,7 +15933,7 @@
-
- #ifndef NO__1gtk_1window_1set_1icon_1list
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1icon_1list)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
- gtk_window_set_icon_list((GtkWindow *)arg0, (GList *)arg1);
-@@ -15943,7 +15943,7 @@
-
- #ifndef NO__1gtk_1window_1set_1keep_1below
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1keep_1below_FUNC);
- /*
-@@ -15969,7 +15969,7 @@
-
- #ifndef NO__1gtk_1window_1set_1modal
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1modal)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1modal_FUNC);
- gtk_window_set_modal((GtkWindow *)arg0, (gboolean)arg1);
-@@ -15979,7 +15979,7 @@
-
- #ifndef NO__1gtk_1window_1set_1opacity
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1opacity_FUNC);
- /*
-@@ -16005,7 +16005,7 @@
-
- #ifndef NO__1gtk_1window_1set_1resizable
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1resizable)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1resizable_FUNC);
- gtk_window_set_resizable((GtkWindow *)arg0, (gboolean)arg1);
-@@ -16015,7 +16015,7 @@
-
- #ifndef NO__1gtk_1window_1set_1skip_1taskbar_1hint
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
- /*
-@@ -16041,7 +16041,7 @@
-
- #ifndef NO__1gtk_1window_1set_1title
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1title)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1title_FUNC);
-@@ -16055,7 +16055,7 @@
-
- #ifndef NO__1gtk_1window_1set_1transient_1for
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1transient_1for)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
- gtk_window_set_transient_for((GtkWindow *)arg0, (GtkWindow *)arg1);
-@@ -16065,7 +16065,7 @@
-
- #ifndef NO__1gtk_1window_1set_1type_1hint
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1type_1hint)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
- gtk_window_set_type_hint((GtkWindow *)arg0, arg1);
-@@ -16075,7 +16075,7 @@
-
- #ifndef NO__1gtk_1window_1unfullscreen
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unfullscreen)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1unfullscreen_FUNC);
- gtk_window_unfullscreen((GtkWindow *)arg0);
-@@ -16085,7 +16085,7 @@
-
- #ifndef NO__1gtk_1window_1unmaximize
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unmaximize)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1gtk_1window_1unmaximize_FUNC);
- gtk_window_unmaximize((GtkWindow *)arg0);
-@@ -16094,36 +16094,36 @@
- #endif
-
- #ifndef NO__1pango_1attr_1background_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1background_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1background_1new)
- (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1background_1new_FUNC);
-- rc = (jint)pango_attr_background_new(arg0, arg1, arg2);
-+ rc = (jlong)pango_attr_background_new(arg0, arg1, arg2);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1background_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1attr_1font_1desc_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1font_1desc_1new_FUNC);
-- rc = (jint)pango_attr_font_desc_new((const PangoFontDescription *)arg0);
-+ rc = (jlong)pango_attr_font_desc_new((const PangoFontDescription *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1font_1desc_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1attr_1foreground_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
- (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1foreground_1new_FUNC);
-- rc = (jint)pango_attr_foreground_new(arg0, arg1, arg2);
-+ rc = (jlong)pango_attr_foreground_new(arg0, arg1, arg2);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1foreground_1new_FUNC);
- return rc;
- }
-@@ -16131,7 +16131,7 @@
-
- #ifndef NO__1pango_1attr_1iterator_1destroy
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1destroy_FUNC);
- pango_attr_iterator_destroy((PangoAttrIterator *)arg0);
-@@ -16140,24 +16140,24 @@
- #endif
-
- #ifndef NO__1pango_1attr_1iterator_1get
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_FUNC);
-- rc = (jint)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1);
-+ rc = (jlong)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1attr_1iterator_1get_1attrs
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_1attrs_FUNC);
-- rc = (jint)pango_attr_iterator_get_attrs((PangoAttrIterator *)arg0);
-+ rc = (jlong)pango_attr_iterator_get_attrs((PangoAttrIterator *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_1attrs_FUNC);
- return rc;
- }
-@@ -16165,7 +16165,7 @@
-
- #ifndef NO__1pango_1attr_1iterator_1next
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1next_FUNC);
-@@ -16177,7 +16177,7 @@
-
- #ifndef NO__1pango_1attr_1iterator_1range
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1range)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -16194,7 +16194,7 @@
-
- #ifndef NO__1pango_1attr_1list_1change
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1change)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1change_FUNC);
- pango_attr_list_change((PangoAttrList *)arg0, (PangoAttribute *)arg1);
-@@ -16203,12 +16203,12 @@
- #endif
-
- #ifndef NO__1pango_1attr_1list_1get_1iterator
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1get_1iterator_FUNC);
-- rc = (jint)pango_attr_list_get_iterator((PangoAttrList *)arg0);
-+ rc = (jlong)pango_attr_list_get_iterator((PangoAttrList *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1get_1iterator_FUNC);
- return rc;
- }
-@@ -16216,7 +16216,7 @@
-
- #ifndef NO__1pango_1attr_1list_1insert
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1insert_FUNC);
- pango_attr_list_insert((PangoAttrList *)arg0, (PangoAttribute *)arg1);
-@@ -16225,12 +16225,12 @@
- #endif
-
- #ifndef NO__1pango_1attr_1list_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1new_FUNC);
-- rc = (jint)pango_attr_list_new();
-+ rc = (jlong)pango_attr_list_new();
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1new_FUNC);
- return rc;
- }
-@@ -16238,7 +16238,7 @@
-
- #ifndef NO__1pango_1attr_1list_1unref
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1unref_FUNC);
- pango_attr_list_unref((PangoAttrList *)arg0);
-@@ -16247,28 +16247,28 @@
- #endif
-
- #ifndef NO__1pango_1attr_1rise_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1rise_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1rise_1new)
- (JNIEnv *env, jclass that, jint arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1rise_1new_FUNC);
-- rc = (jint)pango_attr_rise_new(arg0);
-+ rc = (jlong)pango_attr_rise_new(arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1rise_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1attr_1shape_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1shape_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1shape_1new)
- (JNIEnv *env, jclass that, jobject arg0, jobject arg1)
- {
- PangoRectangle _arg0, *lparg0=NULL;
- PangoRectangle _arg1, *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1shape_1new_FUNC);
- if (arg0) if ((lparg0 = getPangoRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
- if (arg1) if ((lparg1 = getPangoRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
-- rc = (jint)pango_attr_shape_new(lparg0, lparg1);
-+ rc = (jlong)pango_attr_shape_new(lparg0, lparg1);
- fail:
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1shape_1new_FUNC);
- return rc;
-@@ -16276,18 +16276,18 @@
- #endif
-
- #ifndef NO__1pango_1attr_1strikethrough_1color_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
- (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC);
- /*
-- rc = (jint)pango_attr_strikethrough_color_new(arg0, arg1, arg2);
-+ rc = (jlong)pango_attr_strikethrough_color_new(arg0, arg1, arg2);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jshort, jshort, jshort);
-+ typedef jlong (*FPTR)(jshort, jshort, jshort);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16296,7 +16296,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, arg1, arg2);
-+ rc = (jlong)(*fptr)(arg0, arg1, arg2);
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC);
-@@ -16305,30 +16305,30 @@
- #endif
-
- #ifndef NO__1pango_1attr_1strikethrough_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new)
- (JNIEnv *env, jclass that, jboolean arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1new_FUNC);
-- rc = (jint)pango_attr_strikethrough_new(arg0);
-+ rc = (jlong)pango_attr_strikethrough_new(arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1attr_1underline_1color_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
- (JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1color_1new_FUNC);
- /*
-- rc = (jint)pango_attr_underline_color_new(arg0, arg1, arg2);
-+ rc = (jlong)pango_attr_underline_color_new(arg0, arg1, arg2);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jshort, jshort, jshort);
-+ typedef jlong (*FPTR)(jshort, jshort, jshort);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16337,7 +16337,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0, arg1, arg2);
-+ rc = (jlong)(*fptr)(arg0, arg1, arg2);
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1color_1new_FUNC);
-@@ -16346,42 +16346,42 @@
- #endif
-
- #ifndef NO__1pango_1attr_1underline_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1underline_1new)
- (JNIEnv *env, jclass that, jint arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1new_FUNC);
-- rc = (jint)pango_attr_underline_new(arg0);
-+ rc = (jlong)pango_attr_underline_new(arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1attr_1weight_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1weight_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1attr_1weight_1new)
- (JNIEnv *env, jclass that, jint arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1attr_1weight_1new_FUNC);
-- rc = (jint)pango_attr_weight_new(arg0);
-+ rc = (jlong)pango_attr_weight_new(arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1attr_1weight_1new_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1cairo_1context_1get_1font_1options
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC);
- /*
-- rc = (jint)pango_cairo_context_get_font_options((PangoContext *)arg0);
-+ rc = (jlong)pango_cairo_context_get_font_options((PangoContext *)arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(PangoContext *);
-+ typedef jlong (*FPTR)(PangoContext *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16390,7 +16390,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)((PangoContext *)arg0);
-+ rc = (jlong)(*fptr)((PangoContext *)arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC);
-@@ -16400,7 +16400,7 @@
-
- #ifndef NO__1pango_1cairo_1context_1set_1font_1options
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1set_1font_1options_FUNC);
- /*
-@@ -16409,7 +16409,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(PangoContext *, jint);
-+ typedef void (*FPTR)(PangoContext *, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_context_set_font_options_LIB, RTLD_LAZY);
-@@ -16425,18 +16425,18 @@
- #endif
-
- #ifndef NO__1pango_1cairo_1create_1layout
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1create_1layout_FUNC);
- /*
-- rc = (jint)pango_cairo_create_layout(arg0);
-+ rc = (jlong)pango_cairo_create_layout(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16445,7 +16445,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1cairo_1create_1layout_FUNC);
-@@ -16454,18 +16454,18 @@
- #endif
-
- #ifndef NO__1pango_1cairo_1font_1map_1create_1context
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1create_1context_FUNC);
- /*
-- rc = (jint)pango_cairo_font_map_create_context(arg0);
-+ rc = (jlong)pango_cairo_font_map_create_context(arg0);
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jlong (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16474,7 +16474,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)(arg0);
-+ rc = (jlong)(*fptr)(arg0);
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1create_1context_FUNC);
-@@ -16483,18 +16483,18 @@
- #endif
-
- #ifndef NO__1pango_1cairo_1font_1map_1get_1default
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC);
- /*
-- rc = (jint)pango_cairo_font_map_get_default();
-+ rc = (jlong)pango_cairo_font_map_get_default();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16503,7 +16503,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC);
-@@ -16512,18 +16512,18 @@
- #endif
-
- #ifndef NO__1pango_1cairo_1font_1map_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1new_FUNC);
- /*
-- rc = (jint)pango_cairo_font_map_new();
-+ rc = (jlong)pango_cairo_font_map_new();
- */
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)();
-+ typedef jlong (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -16532,7 +16532,7 @@
- initialized = 1;
- }
- if (fptr) {
-- rc = (jint)(*fptr)();
-+ rc = (jlong)(*fptr)();
- }
- }
- OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1new_FUNC);
-@@ -16542,7 +16542,7 @@
-
- #ifndef NO__1pango_1cairo_1font_1map_1set_1resolution
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution)
-- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1set_1resolution_FUNC);
- /*
-@@ -16551,7 +16551,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jdouble);
-+ typedef void (*FPTR)(jlong, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_font_map_set_resolution_LIB, RTLD_LAZY);
-@@ -16568,7 +16568,7 @@
-
- #ifndef NO__1pango_1cairo_1layout_1path
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1layout_1path_FUNC);
- /*
-@@ -16577,7 +16577,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_layout_path_LIB, RTLD_LAZY);
-@@ -16594,7 +16594,7 @@
-
- #ifndef NO__1pango_1cairo_1show_1layout
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1cairo_1show_1layout_FUNC);
- /*
-@@ -16603,7 +16603,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jint);
-+ typedef void (*FPTR)(jlong, jlong);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_show_layout_LIB, RTLD_LAZY);
-@@ -16620,7 +16620,7 @@
-
- #ifndef NO__1pango_1context_1get_1base_1dir
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1base_1dir_FUNC);
-@@ -16631,24 +16631,24 @@
- #endif
-
- #ifndef NO__1pango_1context_1get_1language
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1language)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1context_1get_1language)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1language_FUNC);
-- rc = (jint)pango_context_get_language((PangoContext *)arg0);
-+ rc = (jlong)pango_context_get_language((PangoContext *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1language_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1context_1get_1metrics
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1metrics_FUNC);
-- rc = (jint)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2);
-+ rc = (jlong)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2);
- OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1metrics_FUNC);
- return rc;
- }
-@@ -16656,24 +16656,24 @@
-
- #ifndef NO__1pango_1context_1list_1families
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1list_1families)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1context_1list_1families_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- pango_context_list_families((PangoContext *)arg0, (PangoFontFamily ***)lparg1, (int *)lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1pango_1context_1list_1families_FUNC);
- }
- #endif
-
- #ifndef NO__1pango_1context_1set_1base_1dir
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1base_1dir_FUNC);
- pango_context_set_base_dir((PangoContext *)arg0, arg1);
-@@ -16683,7 +16683,7 @@
-
- #ifndef NO__1pango_1context_1set_1language
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1language_FUNC);
- pango_context_set_language((PangoContext *)arg0, (PangoLanguage *)arg1);
-@@ -16692,12 +16692,12 @@
- #endif
-
- #ifndef NO__1pango_1font_1description_1copy
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1copy_FUNC);
-- rc = (jint)pango_font_description_copy((PangoFontDescription *)arg0);
-+ rc = (jlong)pango_font_description_copy((PangoFontDescription *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1copy_FUNC);
- return rc;
- }
-@@ -16705,7 +16705,7 @@
-
- #ifndef NO__1pango_1font_1description_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1free_FUNC);
- pango_font_description_free((PangoFontDescription *)arg0);
-@@ -16714,11 +16714,11 @@
- #endif
-
- #ifndef NO__1pango_1font_1description_1from_1string
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1from_1string_FUNC);
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -16728,7 +16728,7 @@
- {
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- }
-- rc = (jint)pango_font_description_from_string((const char *)lparg0);
-+ rc = (jlong)pango_font_description_from_string((const char *)lparg0);
- fail:
- #ifdef JNI_VERSION_1_2
- if (IS_JNI_1_2) {
-@@ -16744,12 +16744,12 @@
- #endif
-
- #ifndef NO__1pango_1font_1description_1get_1family
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1family_FUNC);
-- rc = (jint)pango_font_description_get_family((PangoFontDescription *)arg0);
-+ rc = (jlong)pango_font_description_get_family((PangoFontDescription *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1get_1family_FUNC);
- return rc;
- }
-@@ -16757,7 +16757,7 @@
-
- #ifndef NO__1pango_1font_1description_1get_1size
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1size_FUNC);
-@@ -16769,7 +16769,7 @@
-
- #ifndef NO__1pango_1font_1description_1get_1style
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1style_FUNC);
-@@ -16781,7 +16781,7 @@
-
- #ifndef NO__1pango_1font_1description_1get_1weight
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1weight_FUNC);
-@@ -16792,12 +16792,12 @@
- #endif
-
- #ifndef NO__1pango_1font_1description_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1new_FUNC);
-- rc = (jint)pango_font_description_new();
-+ rc = (jlong)pango_font_description_new();
- OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1new_FUNC);
- return rc;
- }
-@@ -16805,7 +16805,7 @@
-
- #ifndef NO__1pango_1font_1description_1set_1family
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1family)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1family_FUNC);
-@@ -16833,7 +16833,7 @@
-
- #ifndef NO__1pango_1font_1description_1set_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1size_FUNC);
- pango_font_description_set_size((PangoFontDescription *)arg0, (gint)arg1);
-@@ -16843,7 +16843,7 @@
-
- #ifndef NO__1pango_1font_1description_1set_1stretch
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1stretch_FUNC);
- pango_font_description_set_stretch((PangoFontDescription *)arg0, (PangoStretch)arg1);
-@@ -16853,7 +16853,7 @@
-
- #ifndef NO__1pango_1font_1description_1set_1style
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1style_FUNC);
- pango_font_description_set_style((PangoFontDescription *)arg0, (PangoStyle)arg1);
-@@ -16863,7 +16863,7 @@
-
- #ifndef NO__1pango_1font_1description_1set_1weight
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1weight_FUNC);
- pango_font_description_set_weight((PangoFontDescription *)arg0, (PangoWeight)arg1);
-@@ -16872,36 +16872,36 @@
- #endif
-
- #ifndef NO__1pango_1font_1description_1to_1string
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1to_1string_FUNC);
-- rc = (jint)pango_font_description_to_string((PangoFontDescription *)arg0);
-+ rc = (jlong)pango_font_description_to_string((PangoFontDescription *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1to_1string_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1font_1face_1describe
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1face_1describe)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1face_1describe)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1face_1describe_FUNC);
-- rc = (jint)pango_font_face_describe((PangoFontFace *)arg0);
-+ rc = (jlong)pango_font_face_describe((PangoFontFace *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1face_1describe_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1font_1family_1get_1name
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1get_1name_FUNC);
-- rc = (jint)pango_font_family_get_name((PangoFontFamily *)arg0);
-+ rc = (jlong)pango_font_family_get_name((PangoFontFamily *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1get_1name_FUNC);
- return rc;
- }
-@@ -16909,28 +16909,28 @@
-
- #ifndef NO__1pango_1font_1family_1list_1faces
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1family_1list_1faces)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1list_1faces_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- pango_font_family_list_faces((PangoFontFamily *)arg0, (PangoFontFace ***)lparg1, (int *)lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1list_1faces_FUNC);
- }
- #endif
-
- #ifndef NO__1pango_1font_1get_1metrics
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1get_1metrics_FUNC);
-- rc = (jint)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
-+ rc = (jlong)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
- OS_NATIVE_EXIT(env, that, _1pango_1font_1get_1metrics_FUNC);
- return rc;
- }
-@@ -16938,7 +16938,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1approximate_1char_1width
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1approximate_1char_1width_FUNC);
-@@ -16950,7 +16950,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1ascent
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1ascent_FUNC);
-@@ -16962,7 +16962,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1descent
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1descent_FUNC);
-@@ -16974,7 +16974,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1strikethrough_1position
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1position)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1strikethrough_1position_FUNC);
-@@ -16984,7 +16984,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -17003,7 +17003,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1strikethrough_1thickness
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thickness)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1strikethrough_1thickness_FUNC);
-@@ -17013,7 +17013,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -17032,7 +17032,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1underline_1position
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1position)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1underline_1position_FUNC);
-@@ -17042,7 +17042,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -17061,7 +17061,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1get_1underline_1thickness
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickness)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1underline_1thickness_FUNC);
-@@ -17071,7 +17071,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef jint (*FPTR)(jint);
-+ typedef jint (*FPTR)(jlong);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
-@@ -17090,7 +17090,7 @@
-
- #ifndef NO__1pango_1font_1metrics_1unref
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1unref_FUNC);
- pango_font_metrics_unref((PangoFontMetrics *)arg0);
-@@ -17099,14 +17099,14 @@
- #endif
-
- #ifndef NO__1pango_1language_1from_1string
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1language_1from_1string)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1language_1from_1string)
- (JNIEnv *env, jclass that, jbyteArray arg0)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1language_1from_1string_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-- rc = (jint)pango_language_from_string((const char *)lparg0);
-+ rc = (jlong)pango_language_from_string((const char *)lparg0);
- fail:
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
- OS_NATIVE_EXIT(env, that, _1pango_1language_1from_1string_FUNC);
-@@ -17116,7 +17116,7 @@
-
- #ifndef NO__1pango_1layout_1context_1changed
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1context_1changed_FUNC);
- pango_layout_context_changed((PangoLayout *)arg0);
-@@ -17126,7 +17126,7 @@
-
- #ifndef NO__1pango_1layout_1get_1alignment
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1alignment_FUNC);
-@@ -17137,24 +17137,24 @@
- #endif
-
- #ifndef NO__1pango_1layout_1get_1attributes
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1attributes_FUNC);
-- rc = (jint)pango_layout_get_attributes((PangoLayout *)arg0);
-+ rc = (jlong)pango_layout_get_attributes((PangoLayout *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1attributes_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1layout_1get_1context
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1context_FUNC);
-- rc = (jint)pango_layout_get_context((PangoLayout *)arg0);
-+ rc = (jlong)pango_layout_get_context((PangoLayout *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1context_FUNC);
- return rc;
- }
-@@ -17162,7 +17162,7 @@
-
- #ifndef NO__1pango_1layout_1get_1indent
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1indent_FUNC);
-@@ -17173,12 +17173,12 @@
- #endif
-
- #ifndef NO__1pango_1layout_1get_1iter
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1iter_FUNC);
-- rc = (jint)pango_layout_get_iter((PangoLayout*)arg0);
-+ rc = (jlong)pango_layout_get_iter((PangoLayout*)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1iter_FUNC);
- return rc;
- }
-@@ -17186,7 +17186,7 @@
-
- #ifndef NO__1pango_1layout_1get_1justify
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1justify_FUNC);
-@@ -17197,12 +17197,12 @@
- #endif
-
- #ifndef NO__1pango_1layout_1get_1line
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_FUNC);
-- rc = (jint)pango_layout_get_line((PangoLayout *)arg0, arg1);
-+ rc = (jlong)pango_layout_get_line((PangoLayout *)arg0, arg1);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1line_FUNC);
- return rc;
- }
-@@ -17210,7 +17210,7 @@
-
- #ifndef NO__1pango_1layout_1get_1line_1count
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_1count_FUNC);
-@@ -17222,24 +17222,24 @@
-
- #ifndef NO__1pango_1layout_1get_1log_1attrs
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1log_1attrs)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
- {
-- jint *lparg1=NULL;
-+ jlong *lparg1=NULL;
- jint *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
-- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- pango_layout_get_log_attrs((PangoLayout*)arg0, (PangoLogAttr **)lparg1, (int *)lparg2);
- fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
- }
- #endif
-
- #ifndef NO__1pango_1layout_1get_1size
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jintArray arg1, jintArray arg2)
- {
- jint *lparg1=NULL;
- jint *lparg2=NULL;
-@@ -17256,7 +17256,7 @@
-
- #ifndef NO__1pango_1layout_1get_1spacing
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1spacing_FUNC);
-@@ -17267,24 +17267,24 @@
- #endif
-
- #ifndef NO__1pango_1layout_1get_1tabs
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1tabs)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1tabs)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1tabs_FUNC);
-- rc = (jint)pango_layout_get_tabs((PangoLayout*)arg0);
-+ rc = (jlong)pango_layout_get_tabs((PangoLayout*)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1tabs_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO__1pango_1layout_1get_1text
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1text_FUNC);
-- rc = (jint)pango_layout_get_text((PangoLayout *)arg0);
-+ rc = (jlong)pango_layout_get_text((PangoLayout *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1text_FUNC);
- return rc;
- }
-@@ -17292,7 +17292,7 @@
-
- #ifndef NO__1pango_1layout_1get_1width
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1width_FUNC);
-@@ -17304,7 +17304,7 @@
-
- #ifndef NO__1pango_1layout_1index_1to_1pos
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1index_1to_1pos)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
- {
- PangoRectangle _arg2, *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1index_1to_1pos_FUNC);
-@@ -17318,7 +17318,7 @@
-
- #ifndef NO__1pango_1layout_1iter_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1free_FUNC);
- pango_layout_iter_free((PangoLayoutIter*)arg0);
-@@ -17328,7 +17328,7 @@
-
- #ifndef NO__1pango_1layout_1iter_1get_1index
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1index_FUNC);
-@@ -17340,7 +17340,7 @@
-
- #ifndef NO__1pango_1layout_1iter_1get_1line_1extents
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1line_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jobject arg2)
- {
- PangoRectangle _arg1, *lparg1=NULL;
- PangoRectangle _arg2, *lparg2=NULL;
-@@ -17356,12 +17356,12 @@
- #endif
-
- #ifndef NO__1pango_1layout_1iter_1get_1run
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1run_FUNC);
-- rc = (jint)pango_layout_iter_get_run((PangoLayoutIter*)arg0);
-+ rc = (jlong)pango_layout_iter_get_run((PangoLayoutIter*)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1iter_1get_1run_FUNC);
- return rc;
- }
-@@ -17369,7 +17369,7 @@
-
- #ifndef NO__1pango_1layout_1iter_1next_1line
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1line_FUNC);
-@@ -17381,7 +17381,7 @@
-
- #ifndef NO__1pango_1layout_1iter_1next_1run
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1run_FUNC);
-@@ -17393,7 +17393,7 @@
-
- #ifndef NO__1pango_1layout_1line_1get_1extents
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1line_1get_1extents)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jobject arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jobject arg2)
- {
- PangoRectangle _arg1, *lparg1=NULL;
- PangoRectangle _arg2, *lparg2=NULL;
-@@ -17410,7 +17410,7 @@
-
- #ifndef NO__1pango_1layout_1line_1x_1to_1index
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1line_1x_1to_1index)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jintArray arg2, jintArray arg3)
- {
- jint *lparg2=NULL;
- jint *lparg3=NULL;
-@@ -17428,12 +17428,12 @@
- #endif
-
- #ifndef NO__1pango_1layout_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1new)
-- (JNIEnv *env, jclass that, jint arg0)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1layout_1new)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1new_FUNC);
-- rc = (jint)pango_layout_new((PangoContext *)arg0);
-+ rc = (jlong)pango_layout_new((PangoContext *)arg0);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1new_FUNC);
- return rc;
- }
-@@ -17441,7 +17441,7 @@
-
- #ifndef NO__1pango_1layout_1set_1alignment
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1alignment_FUNC);
- pango_layout_set_alignment((PangoLayout *)arg0, arg1);
-@@ -17451,7 +17451,7 @@
-
- #ifndef NO__1pango_1layout_1set_1attributes
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1attributes_FUNC);
- pango_layout_set_attributes((PangoLayout *)arg0, (PangoAttrList *)arg1);
-@@ -17461,7 +17461,7 @@
-
- #ifndef NO__1pango_1layout_1set_1auto_1dir
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
- /*
-@@ -17470,7 +17470,7 @@
- {
- static int initialized = 0;
- static void *handle = NULL;
-- typedef void (*FPTR)(jint, jboolean);
-+ typedef void (*FPTR)(jlong, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_layout_set_auto_dir_LIB, RTLD_LAZY);
-@@ -17487,7 +17487,7 @@
-
- #ifndef NO__1pango_1layout_1set_1font_1description
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1font_1description_FUNC);
- pango_layout_set_font_description((PangoLayout *)arg0, (PangoFontDescription *)arg1);
-@@ -17497,7 +17497,7 @@
-
- #ifndef NO__1pango_1layout_1set_1indent
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1indent_FUNC);
- pango_layout_set_indent((PangoLayout*)arg0, arg1);
-@@ -17507,7 +17507,7 @@
-
- #ifndef NO__1pango_1layout_1set_1justify
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1justify_FUNC);
- pango_layout_set_justify((PangoLayout*)arg0, arg1);
-@@ -17517,7 +17517,7 @@
-
- #ifndef NO__1pango_1layout_1set_1single_1paragraph_1mode
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode)
-- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1single_1paragraph_1mode_FUNC);
- pango_layout_set_single_paragraph_mode((PangoLayout *)arg0, (gboolean)arg1);
-@@ -17527,7 +17527,7 @@
-
- #ifndef NO__1pango_1layout_1set_1spacing
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1spacing_FUNC);
- pango_layout_set_spacing((PangoLayout *)arg0, arg1);
-@@ -17537,7 +17537,7 @@
-
- #ifndef NO__1pango_1layout_1set_1tabs
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1tabs_FUNC);
- pango_layout_set_tabs((PangoLayout *)arg0, (PangoTabArray *)arg1);
-@@ -17547,7 +17547,7 @@
-
- #ifndef NO__1pango_1layout_1set_1text
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1text)
-- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jint arg2)
- {
- jbyte *lparg1=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1text_FUNC);
-@@ -17575,7 +17575,7 @@
-
- #ifndef NO__1pango_1layout_1set_1width
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1width_FUNC);
- pango_layout_set_width((PangoLayout *)arg0, arg1);
-@@ -17585,7 +17585,7 @@
-
- #ifndef NO__1pango_1layout_1set_1wrap
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1wrap_FUNC);
- pango_layout_set_wrap((PangoLayout *)arg0, arg1);
-@@ -17595,7 +17595,7 @@
-
- #ifndef NO__1pango_1layout_1xy_1to_1index
- JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1xy_1to_1index)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
- {
- jint *lparg3=NULL;
- jint *lparg4=NULL;
-@@ -17614,7 +17614,7 @@
-
- #ifndef NO__1pango_1tab_1array_1free
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1free_FUNC);
- pango_tab_array_free((PangoTabArray *)arg0);
-@@ -17624,7 +17624,7 @@
-
- #ifndef NO__1pango_1tab_1array_1get_1size
- JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1size)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1get_1size_FUNC);
-@@ -17636,28 +17636,28 @@
-
- #ifndef NO__1pango_1tab_1array_1get_1tabs
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1tabs)
-- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2)
- {
-- jint *lparg1=NULL;
-- jint *lparg2=NULL;
-+ jlong *lparg1=NULL;
-+ jlong *lparg2=NULL;
- OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1get_1tabs_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;
-+ if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
- pango_tab_array_get_tabs((PangoTabArray *)arg0, (PangoTabAlign **)lparg1, (int **)lparg2);
- fail:
-- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
-+ if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-+ if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1get_1tabs_FUNC);
- }
- #endif
-
- #ifndef NO__1pango_1tab_1array_1new
--JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
-+JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1new_FUNC);
-- rc = (jint)pango_tab_array_new((gint)arg0, (gboolean)arg1);
-+ rc = (jlong)pango_tab_array_new((gint)arg0, (gboolean)arg1);
- OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1new_FUNC);
- return rc;
- }
-@@ -17665,7 +17665,7 @@
-
- #ifndef NO__1pango_1tab_1array_1set_1tab
- JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1set_1tab)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3)
- {
- OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1set_1tab_FUNC);
- pango_tab_array_set_tab((PangoTabArray *)arg0, (gint)arg1, (PangoTabAlign)arg2, (gint)arg3);
-@@ -17675,7 +17675,7 @@
-
- #ifndef NO_g_1main_1context_1wakeup
- JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- OS_NATIVE_ENTER(env, that, g_1main_1context_1wakeup_FUNC);
- g_main_context_wakeup((GMainContext *)arg0);
-@@ -17684,754 +17684,754 @@
- #endif
-
- #ifndef NO_localeconv_1decimal_1point
--JNIEXPORT jint JNICALL OS_NATIVE(localeconv_1decimal_1point)
-+JNIEXPORT jlong JNICALL OS_NATIVE(localeconv_1decimal_1point)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, localeconv_1decimal_1point_FUNC);
-- rc = (jint)localeconv_decimal_point();
-+ rc = (jlong)localeconv_decimal_point();
- OS_NATIVE_EXIT(env, that, localeconv_1decimal_1point_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
- {
- GInterfaceInfo _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
- if (arg1) if ((lparg1 = getGInterfaceInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
- if (arg1) getGObjectClassFields(env, arg1, (GObjectClass *)arg0);
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
- {
- GTypeInfo _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
- if (arg1) if ((lparg1 = getGTypeInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- GdkEventButton _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC);
- if (arg1) if ((lparg1 = getGdkEventButtonFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- GdkEventExpose _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC);
- if (arg1) if ((lparg1 = getGdkEventExposeFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- GdkEventMotion _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC);
- if (arg1) if ((lparg1 = getGdkEventMotionFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
- if (arg1) getGtkAdjustmentFields(env, arg1, (GtkAdjustment *)arg0);
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
- if (arg1) getGtkCellRendererClassFields(env, arg1, (GtkCellRendererClass *)arg0);
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
- if (arg1) getGtkFixedFields(env, arg1, (GtkFixed *)arg0);
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- GtkTargetEntry _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC);
- if (arg1) if ((lparg1 = getGtkTargetEntryFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
- if (arg1) getGtkWidgetClassFields(env, arg1, (GtkWidgetClass *)arg0);
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- PangoAttribute _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC);
- if (arg1) if ((lparg1 = getPangoAttributeFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- XButtonEvent _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC);
- if (arg1) if ((lparg1 = getXButtonEventFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- XClientMessageEvent _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC);
- if (arg1) if ((lparg1 = getXClientMessageEventFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- XCrossingEvent _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC);
- if (arg1) if ((lparg1 = getXCrossingEventFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- XExposeEvent _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC);
- if (arg1) if ((lparg1 = getXExposeEventFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
- {
- XFocusChangeEvent _arg1, *lparg1=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC);
- if (arg1) if ((lparg1 = getXFocusChangeEventFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
-- OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
- if (arg0) setGObjectClassFields(env, arg0, (GObjectClass *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GTypeQuery _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGTypeQueryFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkColor _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkColorFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkDragContext _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkDragContextFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventAny _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventAnyFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventButton _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventButtonFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventCrossing _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventCrossingFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventExpose _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventExposeFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventFocus _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventFocusFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventKey _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventKeyFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventMotion _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventMotionFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventScroll _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventScrollFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventVisibility _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventVisibilityFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEventWindowState _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventWindowStateFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkEvent _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkEventFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC);
- if (arg0) setGdkImageFields(env, arg0, (GdkImage *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GdkRectangle _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGdkRectangleFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC);
- if (arg0) setGdkVisualFields(env, arg0, (GdkVisual *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC);
- if (arg0) setGtkAdjustmentFields(env, arg0, (GtkAdjustment *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GtkBorder _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGtkBorderFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC);
- if (arg0) setGtkCellRendererClassFields(env, arg0, (GtkCellRendererClass *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC);
- if (arg0) setGtkColorSelectionDialogFields(env, arg0, (GtkColorSelectionDialog *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC);
- if (arg0) setGtkComboFields(env, arg0, (GtkCombo *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC);
- if (arg0) setGtkFileSelectionFields(env, arg0, (GtkFileSelection *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC);
- if (arg0) setGtkFixedFields(env, arg0, (GtkFixed *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GtkSelectionData _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGtkSelectionDataFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- GtkTargetPair _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setGtkTargetPairFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1)
- {
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC);
- if (arg0) setGtkWidgetClassFields(env, arg0, (GtkWidgetClass *)arg1);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoAttrColor _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoAttrColorFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoAttrInt _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoAttrIntFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoAttribute _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoAttributeFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoItem _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoItemFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoLayoutLine _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoLayoutLineFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoLayoutRun _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoLayoutRunFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- PangoLogAttr _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setPangoLogAttrFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- XButtonEvent _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setXButtonEventFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- XCrossingEvent _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setXCrossingEventFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- XExposeEvent _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setXExposeEventFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- XFocusChangeEvent _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setXFocusChangeEventFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II
--JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ
-+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
- {
- XVisibilityEvent _arg0, *lparg0=NULL;
-- OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC);
-+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC);
- if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setXVisibilityEventFields(env, arg0, lparg0);
-- OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC);
-+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC);
- }
- #endif
-
- #ifndef NO_realpath
--JNIEXPORT jint JNICALL OS_NATIVE(realpath)
-+JNIEXPORT jlong JNICALL OS_NATIVE(realpath)
- (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
- {
- jbyte *lparg0=NULL;
- jbyte *lparg1=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- OS_NATIVE_ENTER(env, that, realpath_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-- rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
-+ rc = (jlong)realpath((const char *)lparg0, (char *)lparg1);
- fail:
- if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
- if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-diff -ur x86/os_stats.c x86_64/os_stats.c
---- x86/os_stats.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/os_stats.c 2009-02-11 17:53:48.000000000 -0500
-@@ -231,11 +231,11 @@
- "_1g_1object_1get_1qdata",
- "_1g_1object_1new",
- "_1g_1object_1ref",
-- "_1g_1object_1set__I_3BFI",
-- "_1g_1object_1set__I_3BII",
-- "_1g_1object_1set__I_3BJI",
-- "_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I",
-- "_1g_1object_1set__I_3BZI",
-+ "_1g_1object_1set__J_3BFJ",
-+ "_1g_1object_1set__J_3BIJ",
-+ "_1g_1object_1set__J_3BJJ",
-+ "_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J",
-+ "_1g_1object_1set__J_3BZJ",
- "_1g_1object_1set_1qdata",
- "_1g_1object_1unref",
- "_1g_1quark_1from_1string",
-@@ -245,10 +245,10 @@
- "_1g_1signal_1connect_1after",
- "_1g_1signal_1connect_1closure",
- "_1g_1signal_1connect_1closure_1by_1id",
-- "_1g_1signal_1emit_1by_1name__I_3B",
-- "_1g_1signal_1emit_1by_1name__I_3BI",
-- "_1g_1signal_1emit_1by_1name__I_3BII",
-- "_1g_1signal_1emit_1by_1name__I_3B_3B",
-+ "_1g_1signal_1emit_1by_1name__J_3B",
-+ "_1g_1signal_1emit_1by_1name__J_3BJ",
-+ "_1g_1signal_1emit_1by_1name__J_3BJJ",
-+ "_1g_1signal_1emit_1by_1name__J_3B_3B",
- "_1g_1signal_1handler_1disconnect",
- "_1g_1signal_1handlers_1block_1matched",
- "_1g_1signal_1handlers_1disconnect_1matched",
-@@ -279,8 +279,8 @@
- "_1g_1utf8_1offset_1to_1pointer",
- "_1g_1utf8_1pointer_1to_1offset",
- "_1g_1utf8_1strlen",
-- "_1g_1utf8_1to_1utf16__II_3I_3I_3I",
-- "_1g_1utf8_1to_1utf16___3BI_3I_3I_3I",
-+ "_1g_1utf8_1to_1utf16__JJ_3J_3J_3J",
-+ "_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J",
- "_1g_1value_1peek_1pointer",
- "_1gdk_1atom_1intern",
- "_1gdk_1atom_1name",
-@@ -652,8 +652,8 @@
- "_1gtk_1label_1set_1justify",
- "_1gtk_1label_1set_1line_1wrap",
- "_1gtk_1label_1set_1line_1wrap_1mode",
-- "_1gtk_1label_1set_1text__II",
-- "_1gtk_1label_1set_1text__I_3B",
-+ "_1gtk_1label_1set_1text__JJ",
-+ "_1gtk_1label_1set_1text__J_3B",
- "_1gtk_1label_1set_1text_1with_1mnemonic",
- "_1gtk_1list_1append_1items",
- "_1gtk_1list_1clear_1items",
-@@ -666,11 +666,11 @@
- "_1gtk_1list_1store_1insert",
- "_1gtk_1list_1store_1newv",
- "_1gtk_1list_1store_1remove",
-- "_1gtk_1list_1store_1set__IIIII",
-- "_1gtk_1list_1store_1set__IIIJI",
-- "_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I",
-- "_1gtk_1list_1store_1set__IIIZI",
-- "_1gtk_1list_1store_1set__III_3BI",
-+ "_1gtk_1list_1store_1set__JJIIJ",
-+ "_1gtk_1list_1store_1set__JJIJJ",
-+ "_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J",
-+ "_1gtk_1list_1store_1set__JJIZJ",
-+ "_1gtk_1list_1store_1set__JJI_3BJ",
- "_1gtk_1list_1unselect_1all",
- "_1gtk_1list_1unselect_1item",
- "_1gtk_1main",
-@@ -874,8 +874,8 @@
- "_1gtk_1text_1buffer_1get_1selection_1bound",
- "_1gtk_1text_1buffer_1get_1selection_1bounds",
- "_1gtk_1text_1buffer_1get_1text",
-- "_1gtk_1text_1buffer_1insert__II_3BI",
-- "_1gtk_1text_1buffer_1insert__I_3B_3BI",
-+ "_1gtk_1text_1buffer_1insert__JJ_3BI",
-+ "_1gtk_1text_1buffer_1insert__J_3B_3BI",
- "_1gtk_1text_1buffer_1move_1mark",
- "_1gtk_1text_1buffer_1paste_1clipboard",
- "_1gtk_1text_1buffer_1place_1cursor",
-@@ -916,8 +916,8 @@
- "_1gtk_1tooltips_1force_1window",
- "_1gtk_1tooltips_1new",
- "_1gtk_1tooltips_1set_1tip",
-- "_1gtk_1tree_1model_1get__III_3II",
-- "_1gtk_1tree_1model_1get__III_3JI",
-+ "_1gtk_1tree_1model_1get__JJI_3IJ",
-+ "_1gtk_1tree_1model_1get__JJI_3JJ",
- "_1gtk_1tree_1model_1get_1iter",
- "_1gtk_1tree_1model_1get_1iter_1first",
- "_1gtk_1tree_1model_1get_1n_1columns",
-@@ -935,7 +935,7 @@
- "_1gtk_1tree_1path_1get_1indices",
- "_1gtk_1tree_1path_1new",
- "_1gtk_1tree_1path_1new_1first",
-- "_1gtk_1tree_1path_1new_1from_1string__I",
-+ "_1gtk_1tree_1path_1new_1from_1string__J",
- "_1gtk_1tree_1path_1new_1from_1string___3B",
- "_1gtk_1tree_1path_1next",
- "_1gtk_1tree_1path_1prev",
-@@ -955,11 +955,11 @@
- "_1gtk_1tree_1store_1insert",
- "_1gtk_1tree_1store_1newv",
- "_1gtk_1tree_1store_1remove",
-- "_1gtk_1tree_1store_1set__IIIII",
-- "_1gtk_1tree_1store_1set__IIIJI",
-- "_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I",
-- "_1gtk_1tree_1store_1set__IIIZI",
-- "_1gtk_1tree_1store_1set__III_3BI",
-+ "_1gtk_1tree_1store_1set__JJIIJ",
-+ "_1gtk_1tree_1store_1set__JJIJJ",
-+ "_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J",
-+ "_1gtk_1tree_1store_1set__JJIZJ",
-+ "_1gtk_1tree_1store_1set__JJI_3BJ",
- "_1gtk_1tree_1view_1collapse_1row",
- "_1gtk_1tree_1view_1column_1add_1attribute",
- "_1gtk_1tree_1view_1column_1cell_1get_1position",
-@@ -1030,8 +1030,8 @@
- "_1gtk_1widget_1add_1accelerator",
- "_1gtk_1widget_1add_1events",
- "_1gtk_1widget_1child_1focus",
-- "_1gtk_1widget_1create_1pango_1layout__II",
-- "_1gtk_1widget_1create_1pango_1layout__I_3B",
-+ "_1gtk_1widget_1create_1pango_1layout__JJ",
-+ "_1gtk_1widget_1create_1pango_1layout__J_3B",
- "_1gtk_1widget_1destroy",
- "_1gtk_1widget_1event",
- "_1gtk_1widget_1get_1accessible",
-@@ -1080,8 +1080,8 @@
- "_1gtk_1widget_1show_1now",
- "_1gtk_1widget_1size_1allocate",
- "_1gtk_1widget_1size_1request",
-- "_1gtk_1widget_1style_1get__I_3B_3II",
-- "_1gtk_1widget_1style_1get__I_3B_3JI",
-+ "_1gtk_1widget_1style_1get__J_3B_3IJ",
-+ "_1gtk_1widget_1style_1get__J_3B_3JJ",
- "_1gtk_1widget_1translate_1coordinates",
- "_1gtk_1widget_1unrealize",
- "_1gtk_1window_1activate_1default",
-@@ -1229,63 +1229,63 @@
- "_1pango_1tab_1array_1set_1tab",
- "g_1main_1context_1wakeup",
- "localeconv_1decimal_1point",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
-- "memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I",
-- "memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II",
-- "memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J",
-+ "memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ",
-+ "memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ",
- "realpath",
- };
-
-diff -ur x86/os_stats.h x86_64/os_stats.h
---- x86/os_stats.h 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/os_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -239,11 +239,11 @@
- _1g_1object_1get_1qdata_FUNC,
- _1g_1object_1new_FUNC,
- _1g_1object_1ref_FUNC,
-- _1g_1object_1set__I_3BFI_FUNC,
-- _1g_1object_1set__I_3BII_FUNC,
-- _1g_1object_1set__I_3BJI_FUNC,
-- _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
-- _1g_1object_1set__I_3BZI_FUNC,
-+ _1g_1object_1set__J_3BFJ_FUNC,
-+ _1g_1object_1set__J_3BIJ_FUNC,
-+ _1g_1object_1set__J_3BJJ_FUNC,
-+ _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
-+ _1g_1object_1set__J_3BZJ_FUNC,
- _1g_1object_1set_1qdata_FUNC,
- _1g_1object_1unref_FUNC,
- _1g_1quark_1from_1string_FUNC,
-@@ -253,10 +253,10 @@
- _1g_1signal_1connect_1after_FUNC,
- _1g_1signal_1connect_1closure_FUNC,
- _1g_1signal_1connect_1closure_1by_1id_FUNC,
-- _1g_1signal_1emit_1by_1name__I_3B_FUNC,
-- _1g_1signal_1emit_1by_1name__I_3BI_FUNC,
-- _1g_1signal_1emit_1by_1name__I_3BII_FUNC,
-- _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC,
-+ _1g_1signal_1emit_1by_1name__J_3B_FUNC,
-+ _1g_1signal_1emit_1by_1name__J_3BJ_FUNC,
-+ _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC,
-+ _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC,
- _1g_1signal_1handler_1disconnect_FUNC,
- _1g_1signal_1handlers_1block_1matched_FUNC,
- _1g_1signal_1handlers_1disconnect_1matched_FUNC,
-@@ -287,8 +287,8 @@
- _1g_1utf8_1offset_1to_1pointer_FUNC,
- _1g_1utf8_1pointer_1to_1offset_FUNC,
- _1g_1utf8_1strlen_FUNC,
-- _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC,
-- _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC,
-+ _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC,
-+ _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC,
- _1g_1value_1peek_1pointer_FUNC,
- _1gdk_1atom_1intern_FUNC,
- _1gdk_1atom_1name_FUNC,
-@@ -660,8 +660,8 @@
- _1gtk_1label_1set_1justify_FUNC,
- _1gtk_1label_1set_1line_1wrap_FUNC,
- _1gtk_1label_1set_1line_1wrap_1mode_FUNC,
-- _1gtk_1label_1set_1text__II_FUNC,
-- _1gtk_1label_1set_1text__I_3B_FUNC,
-+ _1gtk_1label_1set_1text__JJ_FUNC,
-+ _1gtk_1label_1set_1text__J_3B_FUNC,
- _1gtk_1label_1set_1text_1with_1mnemonic_FUNC,
- _1gtk_1list_1append_1items_FUNC,
- _1gtk_1list_1clear_1items_FUNC,
-@@ -674,11 +674,11 @@
- _1gtk_1list_1store_1insert_FUNC,
- _1gtk_1list_1store_1newv_FUNC,
- _1gtk_1list_1store_1remove_FUNC,
-- _1gtk_1list_1store_1set__IIIII_FUNC,
-- _1gtk_1list_1store_1set__IIIJI_FUNC,
-- _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
-- _1gtk_1list_1store_1set__IIIZI_FUNC,
-- _1gtk_1list_1store_1set__III_3BI_FUNC,
-+ _1gtk_1list_1store_1set__JJIIJ_FUNC,
-+ _1gtk_1list_1store_1set__JJIJJ_FUNC,
-+ _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
-+ _1gtk_1list_1store_1set__JJIZJ_FUNC,
-+ _1gtk_1list_1store_1set__JJI_3BJ_FUNC,
- _1gtk_1list_1unselect_1all_FUNC,
- _1gtk_1list_1unselect_1item_FUNC,
- _1gtk_1main_FUNC,
-@@ -882,8 +882,8 @@
- _1gtk_1text_1buffer_1get_1selection_1bound_FUNC,
- _1gtk_1text_1buffer_1get_1selection_1bounds_FUNC,
- _1gtk_1text_1buffer_1get_1text_FUNC,
-- _1gtk_1text_1buffer_1insert__II_3BI_FUNC,
-- _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC,
-+ _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC,
-+ _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC,
- _1gtk_1text_1buffer_1move_1mark_FUNC,
- _1gtk_1text_1buffer_1paste_1clipboard_FUNC,
- _1gtk_1text_1buffer_1place_1cursor_FUNC,
-@@ -924,8 +924,8 @@
- _1gtk_1tooltips_1force_1window_FUNC,
- _1gtk_1tooltips_1new_FUNC,
- _1gtk_1tooltips_1set_1tip_FUNC,
-- _1gtk_1tree_1model_1get__III_3II_FUNC,
-- _1gtk_1tree_1model_1get__III_3JI_FUNC,
-+ _1gtk_1tree_1model_1get__JJI_3IJ_FUNC,
-+ _1gtk_1tree_1model_1get__JJI_3JJ_FUNC,
- _1gtk_1tree_1model_1get_1iter_FUNC,
- _1gtk_1tree_1model_1get_1iter_1first_FUNC,
- _1gtk_1tree_1model_1get_1n_1columns_FUNC,
-@@ -943,7 +943,7 @@
- _1gtk_1tree_1path_1get_1indices_FUNC,
- _1gtk_1tree_1path_1new_FUNC,
- _1gtk_1tree_1path_1new_1first_FUNC,
-- _1gtk_1tree_1path_1new_1from_1string__I_FUNC,
-+ _1gtk_1tree_1path_1new_1from_1string__J_FUNC,
- _1gtk_1tree_1path_1new_1from_1string___3B_FUNC,
- _1gtk_1tree_1path_1next_FUNC,
- _1gtk_1tree_1path_1prev_FUNC,
-@@ -963,11 +963,11 @@
- _1gtk_1tree_1store_1insert_FUNC,
- _1gtk_1tree_1store_1newv_FUNC,
- _1gtk_1tree_1store_1remove_FUNC,
-- _1gtk_1tree_1store_1set__IIIII_FUNC,
-- _1gtk_1tree_1store_1set__IIIJI_FUNC,
-- _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
-- _1gtk_1tree_1store_1set__IIIZI_FUNC,
-- _1gtk_1tree_1store_1set__III_3BI_FUNC,
-+ _1gtk_1tree_1store_1set__JJIIJ_FUNC,
-+ _1gtk_1tree_1store_1set__JJIJJ_FUNC,
-+ _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
-+ _1gtk_1tree_1store_1set__JJIZJ_FUNC,
-+ _1gtk_1tree_1store_1set__JJI_3BJ_FUNC,
- _1gtk_1tree_1view_1collapse_1row_FUNC,
- _1gtk_1tree_1view_1column_1add_1attribute_FUNC,
- _1gtk_1tree_1view_1column_1cell_1get_1position_FUNC,
-@@ -1038,8 +1038,8 @@
- _1gtk_1widget_1add_1accelerator_FUNC,
- _1gtk_1widget_1add_1events_FUNC,
- _1gtk_1widget_1child_1focus_FUNC,
-- _1gtk_1widget_1create_1pango_1layout__II_FUNC,
-- _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC,
-+ _1gtk_1widget_1create_1pango_1layout__JJ_FUNC,
-+ _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC,
- _1gtk_1widget_1destroy_FUNC,
- _1gtk_1widget_1event_FUNC,
- _1gtk_1widget_1get_1accessible_FUNC,
-@@ -1088,8 +1088,8 @@
- _1gtk_1widget_1show_1now_FUNC,
- _1gtk_1widget_1size_1allocate_FUNC,
- _1gtk_1widget_1size_1request_FUNC,
-- _1gtk_1widget_1style_1get__I_3B_3II_FUNC,
-- _1gtk_1widget_1style_1get__I_3B_3JI_FUNC,
-+ _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC,
-+ _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC,
- _1gtk_1widget_1translate_1coordinates_FUNC,
- _1gtk_1widget_1unrealize_FUNC,
- _1gtk_1window_1activate_1default_FUNC,
-@@ -1237,62 +1237,62 @@
- _1pango_1tab_1array_1set_1tab_FUNC,
- g_1main_1context_1wakeup_FUNC,
- localeconv_1decimal_1point_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC,
-- memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC,
-- memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC,
- realpath_FUNC,
- } OS_FUNCS;
-diff -ur x86/os_structs.c x86_64/os_structs.c
---- x86/os_structs.c 2009-06-24 21:14:02.000000000 -0400
-+++ x86_64/os_structs.c 2009-02-11 17:53:46.000000000 -0500
-@@ -29,27 +29,27 @@
- {
- if (GInterfaceInfoFc.cached) return;
- GInterfaceInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", "I");
-- GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", "I");
-- GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", "I");
-+ GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", "J");
-+ GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", "J");
-+ GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", "J");
- GInterfaceInfoFc.cached = 1;
- }
-
- GInterfaceInfo *getGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
- {
- if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
-- lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_init);
-- lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_finalize);
-- lpStruct->interface_data = (gpointer)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_data);
-+ lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_init);
-+ lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_finalize);
-+ lpStruct->interface_data = (gpointer)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_data);
- return lpStruct;
- }
-
- void setGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
- {
- if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_init, (jint)lpStruct->interface_init);
-- (*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jint)lpStruct->interface_finalize);
-- (*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_data, (jint)lpStruct->interface_data);
-+ (*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_init, (jlong)lpStruct->interface_init);
-+ (*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jlong)lpStruct->interface_finalize);
-+ (*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_data, (jlong)lpStruct->interface_data);
- }
- #endif
-
-@@ -66,39 +66,39 @@
- {
- if (GObjectClassFc.cached) return;
- GObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", "I");
-- GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", "I");
-- GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", "I");
-- GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", "I");
-- GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", "I");
-- GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", "I");
-- GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", "I");
-+ GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", "J");
-+ GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", "J");
-+ GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", "J");
-+ GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", "J");
-+ GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", "J");
-+ GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", "J");
-+ GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", "J");
- GObjectClassFc.cached = 1;
- }
-
- GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
- {
- if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
-- lpStruct->constructor = (GObject *(*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.constructor);
-- lpStruct->set_property = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.set_property);
-- lpStruct->get_property = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.get_property);
-- lpStruct->dispose = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.dispose);
-- lpStruct->finalize = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.finalize);
-- lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
-- lpStruct->notify = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.notify);
-+ lpStruct->constructor = (GObject *(*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.constructor);
-+ lpStruct->set_property = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.set_property);
-+ lpStruct->get_property = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.get_property);
-+ lpStruct->dispose = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.dispose);
-+ lpStruct->finalize = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.finalize);
-+ lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
-+ lpStruct->notify = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.notify);
- return lpStruct;
- }
-
- void setGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
- {
- if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.constructor, (jint)lpStruct->constructor);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.set_property, (jint)lpStruct->set_property);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.get_property, (jint)lpStruct->get_property);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.dispose, (jint)lpStruct->dispose);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.finalize, (jint)lpStruct->finalize);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jint)lpStruct->dispatch_properties_changed);
-- (*env)->SetIntField(env, lpObject, GObjectClassFc.notify, (jint)lpStruct->notify);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.constructor, (jlong)lpStruct->constructor);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.set_property, (jlong)lpStruct->set_property);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.get_property, (jlong)lpStruct->get_property);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.dispose, (jlong)lpStruct->dispose);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.finalize, (jlong)lpStruct->finalize);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jlong)lpStruct->dispatch_properties_changed);
-+ (*env)->SetLongField(env, lpObject, GObjectClassFc.notify, (jlong)lpStruct->notify);
- }
- #endif
-
-@@ -116,15 +116,15 @@
- if (GTypeInfoFc.cached) return;
- GTypeInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GTypeInfoFc.class_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_size", "S");
-- GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", "I");
-- GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", "I");
-- GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", "I");
-- GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", "I");
-- GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", "I");
-+ GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", "J");
-+ GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", "J");
-+ GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", "J");
-+ GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", "J");
-+ GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", "J");
- GTypeInfoFc.instance_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_size", "S");
- GTypeInfoFc.n_preallocs = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "n_preallocs", "S");
-- GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", "I");
-- GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", "I");
-+ GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", "J");
-+ GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", "J");
- GTypeInfoFc.cached = 1;
- }
-
-@@ -132,15 +132,15 @@
- {
- if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject);
- lpStruct->class_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.class_size);
-- lpStruct->base_init = (GBaseInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.base_init);
-- lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.base_finalize);
-- lpStruct->class_init = (GClassInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_init);
-- lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_finalize);
-- lpStruct->class_data = (gconstpointer)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_data);
-+ lpStruct->base_init = (GBaseInitFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.base_init);
-+ lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.base_finalize);
-+ lpStruct->class_init = (GClassInitFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.class_init);
-+ lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.class_finalize);
-+ lpStruct->class_data = (gconstpointer)(*env)->GetLongField(env, lpObject, GTypeInfoFc.class_data);
- lpStruct->instance_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.instance_size);
- lpStruct->n_preallocs = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.n_preallocs);
-- lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.instance_init);
-- lpStruct->value_table = (GTypeValueTable *)(*env)->GetIntField(env, lpObject, GTypeInfoFc.value_table);
-+ lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetLongField(env, lpObject, GTypeInfoFc.instance_init);
-+ lpStruct->value_table = (GTypeValueTable *)(*env)->GetLongField(env, lpObject, GTypeInfoFc.value_table);
- return lpStruct;
- }
-
-@@ -148,15 +148,15 @@
- {
- if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject);
- (*env)->SetShortField(env, lpObject, GTypeInfoFc.class_size, (jshort)lpStruct->class_size);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.base_init, (jint)lpStruct->base_init);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.base_finalize, (jint)lpStruct->base_finalize);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.class_init, (jint)lpStruct->class_init);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.class_finalize, (jint)lpStruct->class_finalize);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.class_data, (jint)lpStruct->class_data);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.base_init, (jlong)lpStruct->base_init);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.base_finalize, (jlong)lpStruct->base_finalize);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.class_init, (jlong)lpStruct->class_init);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.class_finalize, (jlong)lpStruct->class_finalize);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.class_data, (jlong)lpStruct->class_data);
- (*env)->SetShortField(env, lpObject, GTypeInfoFc.instance_size, (jshort)lpStruct->instance_size);
- (*env)->SetShortField(env, lpObject, GTypeInfoFc.n_preallocs, (jshort)lpStruct->n_preallocs);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.instance_init, (jint)lpStruct->instance_init);
-- (*env)->SetIntField(env, lpObject, GTypeInfoFc.value_table, (jint)lpStruct->value_table);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.instance_init, (jlong)lpStruct->instance_init);
-+ (*env)->SetLongField(env, lpObject, GTypeInfoFc.value_table, (jlong)lpStruct->value_table);
- }
- #endif
-
-@@ -174,7 +174,7 @@
- if (GTypeQueryFc.cached) return;
- GTypeQueryFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GTypeQueryFc.type = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type", "I");
-- GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", "I");
-+ GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", "J");
- GTypeQueryFc.class_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "class_size", "I");
- GTypeQueryFc.instance_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "instance_size", "I");
- GTypeQueryFc.cached = 1;
-@@ -184,7 +184,7 @@
- {
- if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
- lpStruct->type = (GType)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type);
-- lpStruct->type_name = (const gchar *)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type_name);
-+ lpStruct->type_name = (const gchar *)(*env)->GetLongField(env, lpObject, GTypeQueryFc.type_name);
- lpStruct->class_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.class_size);
- lpStruct->instance_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.instance_size);
- return lpStruct;
-@@ -194,7 +194,7 @@
- {
- if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GTypeQueryFc.type, (jint)lpStruct->type);
-- (*env)->SetIntField(env, lpObject, GTypeQueryFc.type_name, (jint)lpStruct->type_name);
-+ (*env)->SetLongField(env, lpObject, GTypeQueryFc.type_name, (jlong)lpStruct->type_name);
- (*env)->SetIntField(env, lpObject, GTypeQueryFc.class_size, (jint)lpStruct->class_size);
- (*env)->SetIntField(env, lpObject, GTypeQueryFc.instance_size, (jint)lpStruct->instance_size);
- }
-@@ -255,9 +255,9 @@
- GdkDragContextFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkDragContextFc.protocol = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "protocol", "I");
- GdkDragContextFc.is_source = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "is_source", "Z");
-- GdkDragContextFc.source_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "source_window", "I");
-- GdkDragContextFc.dest_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "dest_window", "I");
-- GdkDragContextFc.targets = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "targets", "I");
-+ GdkDragContextFc.source_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "source_window", "J");
-+ GdkDragContextFc.dest_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "dest_window", "J");
-+ GdkDragContextFc.targets = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "targets", "J");
- GdkDragContextFc.actions = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "actions", "I");
- GdkDragContextFc.suggested_action = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "suggested_action", "I");
- GdkDragContextFc.action = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "action", "I");
-@@ -270,9 +270,9 @@
- if (!GdkDragContextFc.cached) cacheGdkDragContextFields(env, lpObject);
- lpStruct->protocol = (GdkDragProtocol)(*env)->GetIntField(env, lpObject, GdkDragContextFc.protocol);
- lpStruct->is_source = (gboolean)(*env)->GetBooleanField(env, lpObject, GdkDragContextFc.is_source);
-- lpStruct->source_window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.source_window);
-- lpStruct->dest_window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.dest_window);
-- lpStruct->targets = (GList *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.targets);
-+ lpStruct->source_window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkDragContextFc.source_window);
-+ lpStruct->dest_window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkDragContextFc.dest_window);
-+ lpStruct->targets = (GList *)(*env)->GetLongField(env, lpObject, GdkDragContextFc.targets);
- lpStruct->actions = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.actions);
- lpStruct->suggested_action = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.suggested_action);
- lpStruct->action = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.action);
-@@ -285,9 +285,9 @@
- if (!GdkDragContextFc.cached) cacheGdkDragContextFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.protocol, (jint)lpStruct->protocol);
- (*env)->SetBooleanField(env, lpObject, GdkDragContextFc.is_source, (jboolean)lpStruct->is_source);
-- (*env)->SetIntField(env, lpObject, GdkDragContextFc.source_window, (jint)lpStruct->source_window);
-- (*env)->SetIntField(env, lpObject, GdkDragContextFc.dest_window, (jint)lpStruct->dest_window);
-- (*env)->SetIntField(env, lpObject, GdkDragContextFc.targets, (jint)lpStruct->targets);
-+ (*env)->SetLongField(env, lpObject, GdkDragContextFc.source_window, (jlong)lpStruct->source_window);
-+ (*env)->SetLongField(env, lpObject, GdkDragContextFc.dest_window, (jlong)lpStruct->dest_window);
-+ (*env)->SetLongField(env, lpObject, GdkDragContextFc.targets, (jlong)lpStruct->targets);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.actions, (jint)lpStruct->actions);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.suggested_action, (jint)lpStruct->suggested_action);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.action, (jint)lpStruct->action);
-@@ -340,7 +340,7 @@
- if (GdkEventAnyFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventAnyFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", "I");
-+ GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", "J");
- GdkEventAnyFc.send_event = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "send_event", "B");
- GdkEventAnyFc.cached = 1;
- }
-@@ -349,7 +349,7 @@
- {
- if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventAnyFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventAnyFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventAnyFc.send_event);
- return lpStruct;
- }
-@@ -358,7 +358,7 @@
- {
- if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventAnyFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventAnyFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventAnyFc.send_event, (jbyte)lpStruct->send_event);
- }
- #endif
-@@ -377,15 +377,15 @@
- if (GdkEventButtonFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventButtonFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", "I");
-+ GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", "J");
- GdkEventButtonFc.send_event = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "send_event", "B");
- GdkEventButtonFc.time = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "time", "I");
- GdkEventButtonFc.x = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x", "D");
- GdkEventButtonFc.y = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y", "D");
-- GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", "I");
-+ GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", "J");
- GdkEventButtonFc.state = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "state", "I");
- GdkEventButtonFc.button = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "button", "I");
-- GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", "I");
-+ GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", "J");
- GdkEventButtonFc.x_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x_root", "D");
- GdkEventButtonFc.y_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y_root", "D");
- GdkEventButtonFc.cached = 1;
-@@ -395,15 +395,15 @@
- {
- if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventButtonFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventButtonFc.send_event);
- lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.time);
- lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x);
- lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y);
-- lpStruct->axes = (gdouble *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.axes);
-+ lpStruct->axes = (gdouble *)(*env)->GetLongField(env, lpObject, GdkEventButtonFc.axes);
- lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.state);
- lpStruct->button = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.button);
-- lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.device);
-+ lpStruct->device = (GdkDevice *)(*env)->GetLongField(env, lpObject, GdkEventButtonFc.device);
- lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x_root);
- lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y_root);
- return lpStruct;
-@@ -413,15 +413,15 @@
- {
- if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventButtonFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventButtonFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.time, (jint)lpStruct->time);
- (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x, (jdouble)lpStruct->x);
- (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y, (jdouble)lpStruct->y);
-- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.axes, (jint)lpStruct->axes);
-+ (*env)->SetLongField(env, lpObject, GdkEventButtonFc.axes, (jlong)lpStruct->axes);
- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.state, (jint)lpStruct->state);
- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.button, (jint)lpStruct->button);
-- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.device, (jint)lpStruct->device);
-+ (*env)->SetLongField(env, lpObject, GdkEventButtonFc.device, (jlong)lpStruct->device);
- (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x_root, (jdouble)lpStruct->x_root);
- (*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y_root, (jdouble)lpStruct->y_root);
- }
-@@ -441,9 +441,9 @@
- if (GdkEventCrossingFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventCrossingFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", "I");
-+ GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", "J");
- GdkEventCrossingFc.send_event = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "send_event", "B");
-- GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", "I");
-+ GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", "J");
- GdkEventCrossingFc.time = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "time", "I");
- GdkEventCrossingFc.x = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "x", "D");
- GdkEventCrossingFc.y = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "y", "D");
-@@ -460,9 +460,9 @@
- {
- if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventCrossingFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventCrossingFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventCrossingFc.send_event);
-- lpStruct->subwindow = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventCrossingFc.subwindow);
-+ lpStruct->subwindow = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventCrossingFc.subwindow);
- lpStruct->time = (*env)->GetIntField(env, lpObject, GdkEventCrossingFc.time);
- lpStruct->x = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.x);
- lpStruct->y = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.y);
-@@ -479,9 +479,9 @@
- {
- if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventCrossingFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventCrossingFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventCrossingFc.send_event, (jbyte)lpStruct->send_event);
-- (*env)->SetIntField(env, lpObject, GdkEventCrossingFc.subwindow, (jint)lpStruct->subwindow);
-+ (*env)->SetLongField(env, lpObject, GdkEventCrossingFc.subwindow, (jlong)lpStruct->subwindow);
- (*env)->SetIntField(env, lpObject, GdkEventCrossingFc.time, (jint)lpStruct->time);
- (*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.x, (jdouble)lpStruct->x);
- (*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.y, (jdouble)lpStruct->y);
-@@ -508,13 +508,13 @@
- if (GdkEventExposeFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventExposeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", "I");
-+ GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", "J");
- GdkEventExposeFc.send_event = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "send_event", "B");
- GdkEventExposeFc.area_x = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_x", "I");
- GdkEventExposeFc.area_y = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_y", "I");
- GdkEventExposeFc.area_width = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_width", "I");
- GdkEventExposeFc.area_height = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_height", "I");
-- GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", "I");
-+ GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", "J");
- GdkEventExposeFc.count = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "count", "I");
- GdkEventExposeFc.cached = 1;
- }
-@@ -523,13 +523,13 @@
- {
- if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventExposeFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventExposeFc.send_event);
- lpStruct->area.x = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_x);
- lpStruct->area.y = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_y);
- lpStruct->area.width = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_width);
- lpStruct->area.height = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_height);
-- lpStruct->region = (GdkRegion *)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.region);
-+ lpStruct->region = (GdkRegion *)(*env)->GetLongField(env, lpObject, GdkEventExposeFc.region);
- lpStruct->count = (gint)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.count);
- return lpStruct;
- }
-@@ -538,13 +538,13 @@
- {
- if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventExposeFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventExposeFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_x, (jint)lpStruct->area.x);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_y, (jint)lpStruct->area.y);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_width, (jint)lpStruct->area.width);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_height, (jint)lpStruct->area.height);
-- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.region, (jint)lpStruct->region);
-+ (*env)->SetLongField(env, lpObject, GdkEventExposeFc.region, (jlong)lpStruct->region);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.count, (jint)lpStruct->count);
- }
- #endif
-@@ -563,7 +563,7 @@
- if (GdkEventFocusFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventFocusFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", "I");
-+ GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", "J");
- GdkEventFocusFc.send_event = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "send_event", "B");
- GdkEventFocusFc.in = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "in", "S");
- GdkEventFocusFc.cached = 1;
-@@ -573,7 +573,7 @@
- {
- if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventFocusFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventFocusFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventFocusFc.send_event);
- lpStruct->in = (gint16)(*env)->GetShortField(env, lpObject, GdkEventFocusFc.in);
- return lpStruct;
-@@ -583,7 +583,7 @@
- {
- if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventFocusFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventFocusFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventFocusFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetShortField(env, lpObject, GdkEventFocusFc.in, (jshort)lpStruct->in);
- }
-@@ -603,13 +603,13 @@
- if (GdkEventKeyFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventKeyFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", "I");
-+ GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", "J");
- GdkEventKeyFc.send_event = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "send_event", "B");
- GdkEventKeyFc.time = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "time", "I");
- GdkEventKeyFc.state = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "state", "I");
- GdkEventKeyFc.keyval = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "keyval", "I");
- GdkEventKeyFc.length = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "length", "I");
-- GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", "I");
-+ GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", "J");
- GdkEventKeyFc.hardware_keycode = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "hardware_keycode", "S");
- GdkEventKeyFc.group = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "group", "B");
- GdkEventKeyFc.cached = 1;
-@@ -619,13 +619,13 @@
- {
- if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventKeyFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.send_event);
- lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.time);
- lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.state);
- lpStruct->keyval = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.keyval);
- lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.length);
-- lpStruct->string = (gchar *)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.string);
-+ lpStruct->string = (gchar *)(*env)->GetLongField(env, lpObject, GdkEventKeyFc.string);
- lpStruct->hardware_keycode = (guint16)(*env)->GetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode);
- lpStruct->group = (guint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.group);
- return lpStruct;
-@@ -635,13 +635,13 @@
- {
- if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventKeyFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventKeyFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.time, (jint)lpStruct->time);
- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.state, (jint)lpStruct->state);
- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.keyval, (jint)lpStruct->keyval);
- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.length, (jint)lpStruct->length);
-- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.string, (jint)lpStruct->string);
-+ (*env)->SetLongField(env, lpObject, GdkEventKeyFc.string, (jlong)lpStruct->string);
- (*env)->SetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode, (jshort)lpStruct->hardware_keycode);
- (*env)->SetByteField(env, lpObject, GdkEventKeyFc.group, (jbyte)lpStruct->group);
- }
-@@ -661,15 +661,15 @@
- if (GdkEventMotionFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventMotionFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", "I");
-+ GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", "J");
- GdkEventMotionFc.send_event = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "send_event", "B");
- GdkEventMotionFc.time = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "time", "I");
- GdkEventMotionFc.x = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x", "D");
- GdkEventMotionFc.y = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y", "D");
-- GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", "I");
-+ GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", "J");
- GdkEventMotionFc.state = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "state", "I");
- GdkEventMotionFc.is_hint = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "is_hint", "S");
-- GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", "I");
-+ GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", "J");
- GdkEventMotionFc.x_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x_root", "D");
- GdkEventMotionFc.y_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y_root", "D");
- GdkEventMotionFc.cached = 1;
-@@ -679,15 +679,15 @@
- {
- if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventMotionFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventMotionFc.send_event);
- lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.time);
- lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x);
- lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y);
-- lpStruct->axes = (gdouble *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.axes);
-+ lpStruct->axes = (gdouble *)(*env)->GetLongField(env, lpObject, GdkEventMotionFc.axes);
- lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.state);
- lpStruct->is_hint = (gint16)(*env)->GetShortField(env, lpObject, GdkEventMotionFc.is_hint);
-- lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.device);
-+ lpStruct->device = (GdkDevice *)(*env)->GetLongField(env, lpObject, GdkEventMotionFc.device);
- lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x_root);
- lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y_root);
- return lpStruct;
-@@ -697,15 +697,15 @@
- {
- if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventMotionFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventMotionFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.time, (jint)lpStruct->time);
- (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x, (jdouble)lpStruct->x);
- (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y, (jdouble)lpStruct->y);
-- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.axes, (jint)lpStruct->axes);
-+ (*env)->SetLongField(env, lpObject, GdkEventMotionFc.axes, (jlong)lpStruct->axes);
- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.state, (jint)lpStruct->state);
- (*env)->SetShortField(env, lpObject, GdkEventMotionFc.is_hint, (jshort)lpStruct->is_hint);
-- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.device, (jint)lpStruct->device);
-+ (*env)->SetLongField(env, lpObject, GdkEventMotionFc.device, (jlong)lpStruct->device);
- (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x_root, (jdouble)lpStruct->x_root);
- (*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y_root, (jdouble)lpStruct->y_root);
- }
-@@ -725,14 +725,14 @@
- if (GdkEventScrollFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventScrollFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventScrollFc.window = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "window", "I");
-+ GdkEventScrollFc.window = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "window", "J");
- GdkEventScrollFc.send_event = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "send_event", "B");
- GdkEventScrollFc.time = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "time", "I");
- GdkEventScrollFc.x = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "x", "D");
- GdkEventScrollFc.y = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "y", "D");
- GdkEventScrollFc.state = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "state", "I");
- GdkEventScrollFc.direction = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "direction", "I");
-- GdkEventScrollFc.device = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "device", "I");
-+ GdkEventScrollFc.device = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "device", "J");
- GdkEventScrollFc.x_root = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "x_root", "D");
- GdkEventScrollFc.y_root = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "y_root", "D");
- GdkEventScrollFc.cached = 1;
-@@ -742,14 +742,14 @@
- {
- if (!GdkEventScrollFc.cached) cacheGdkEventScrollFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventScrollFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventScrollFc.send_event);
- lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.time);
- lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.x);
- lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.y);
- lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.state);
- lpStruct->direction = (GdkScrollDirection)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.direction);
-- lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.device);
-+ lpStruct->device = (GdkDevice *)(*env)->GetLongField(env, lpObject, GdkEventScrollFc.device);
- lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.x_root);
- lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.y_root);
- return lpStruct;
-@@ -759,14 +759,14 @@
- {
- if (!GdkEventScrollFc.cached) cacheGdkEventScrollFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventScrollFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventScrollFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.time, (jint)lpStruct->time);
- (*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.x, (jdouble)lpStruct->x);
- (*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.y, (jdouble)lpStruct->y);
- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.state, (jint)lpStruct->state);
- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.direction, (jint)lpStruct->direction);
-- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.device, (jint)lpStruct->device);
-+ (*env)->SetLongField(env, lpObject, GdkEventScrollFc.device, (jlong)lpStruct->device);
- (*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.x_root, (jdouble)lpStruct->x_root);
- (*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.y_root, (jdouble)lpStruct->y_root);
- }
-@@ -786,7 +786,7 @@
- if (GdkEventVisibilityFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventVisibilityFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventVisibilityFc.window = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "window", "I");
-+ GdkEventVisibilityFc.window = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "window", "J");
- GdkEventVisibilityFc.send_event = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "send_event", "B");
- GdkEventVisibilityFc.state = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "state", "I");
- GdkEventVisibilityFc.cached = 1;
-@@ -796,7 +796,7 @@
- {
- if (!GdkEventVisibilityFc.cached) cacheGdkEventVisibilityFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventVisibilityFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventVisibilityFc.window);
- lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventVisibilityFc.send_event);
- lpStruct->state = (GdkVisibilityState)(*env)->GetIntField(env, lpObject, GdkEventVisibilityFc.state);
- return lpStruct;
-@@ -806,7 +806,7 @@
- {
- if (!GdkEventVisibilityFc.cached) cacheGdkEventVisibilityFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventVisibilityFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventVisibilityFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventVisibilityFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventVisibilityFc.state, (jint)lpStruct->state);
- }
-@@ -826,7 +826,7 @@
- if (GdkEventWindowStateFc.cached) return;
- cacheGdkEventFields(env, lpObject);
- GdkEventWindowStateFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", "I");
-+ GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", "J");
- GdkEventWindowStateFc.send_event = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "send_event", "B");
- GdkEventWindowStateFc.changed_mask = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "changed_mask", "I");
- GdkEventWindowStateFc.new_window_state = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "new_window_state", "I");
-@@ -837,7 +837,7 @@
- {
- if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject);
- getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.window);
-+ lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventWindowStateFc.window);
- lpStruct->send_event = (*env)->GetByteField(env, lpObject, GdkEventWindowStateFc.send_event);
- lpStruct->changed_mask = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask);
- lpStruct->new_window_state = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state);
-@@ -848,7 +848,7 @@
- {
- if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject);
- setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, GdkEventWindowStateFc.window, (jlong)lpStruct->window);
- (*env)->SetByteField(env, lpObject, GdkEventWindowStateFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask, (jint)lpStruct->changed_mask);
- (*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state, (jint)lpStruct->new_window_state);
-@@ -876,12 +876,12 @@
- GdkGCValuesFc.background_red = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_red", "S");
- GdkGCValuesFc.background_green = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_green", "S");
- GdkGCValuesFc.background_blue = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_blue", "S");
-- GdkGCValuesFc.font = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "font", "I");
-- GdkGCValuesFc.function = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "function", "I");
-+ GdkGCValuesFc.font = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "font", "J");
-+ GdkGCValuesFc.function = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "function", "J");
- GdkGCValuesFc.fill = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "fill", "I");
-- GdkGCValuesFc.tile = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "tile", "I");
-- GdkGCValuesFc.stipple = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "stipple", "I");
-- GdkGCValuesFc.clip_mask = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "clip_mask", "I");
-+ GdkGCValuesFc.tile = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "tile", "J");
-+ GdkGCValuesFc.stipple = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "stipple", "J");
-+ GdkGCValuesFc.clip_mask = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "clip_mask", "J");
- GdkGCValuesFc.subwindow_mode = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "subwindow_mode", "I");
- GdkGCValuesFc.ts_x_origin = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "ts_x_origin", "I");
- GdkGCValuesFc.ts_y_origin = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "ts_y_origin", "I");
-@@ -906,12 +906,12 @@
- lpStruct->background.red = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_red);
- lpStruct->background.green = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_green);
- lpStruct->background.blue = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_blue);
-- lpStruct->font = (GdkFont *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.font);
-- lpStruct->function = (GdkFunction)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.function);
-+ lpStruct->font = (GdkFont *)(*env)->GetLongField(env, lpObject, GdkGCValuesFc.font);
-+ lpStruct->function = (GdkFunction)(*env)->GetLongField(env, lpObject, GdkGCValuesFc.function);
- lpStruct->fill = (GdkFill)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.fill);
-- lpStruct->tile = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.tile);
-- lpStruct->stipple = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.stipple);
-- lpStruct->clip_mask = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.clip_mask);
-+ lpStruct->tile = (GdkPixmap *)(*env)->GetLongField(env, lpObject, GdkGCValuesFc.tile);
-+ lpStruct->stipple = (GdkPixmap *)(*env)->GetLongField(env, lpObject, GdkGCValuesFc.stipple);
-+ lpStruct->clip_mask = (GdkPixmap *)(*env)->GetLongField(env, lpObject, GdkGCValuesFc.clip_mask);
- lpStruct->subwindow_mode = (GdkSubwindowMode)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.subwindow_mode);
- lpStruct->ts_x_origin = (gint)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.ts_x_origin);
- lpStruct->ts_y_origin = (gint)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.ts_y_origin);
-@@ -936,12 +936,12 @@
- (*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_red, (jshort)lpStruct->background.red);
- (*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_green, (jshort)lpStruct->background.green);
- (*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_blue, (jshort)lpStruct->background.blue);
-- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.font, (jint)lpStruct->font);
-- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.function, (jint)lpStruct->function);
-+ (*env)->SetLongField(env, lpObject, GdkGCValuesFc.font, (jlong)lpStruct->font);
-+ (*env)->SetLongField(env, lpObject, GdkGCValuesFc.function, (jlong)lpStruct->function);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.fill, (jint)lpStruct->fill);
-- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.tile, (jint)lpStruct->tile);
-- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.stipple, (jint)lpStruct->stipple);
-- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.clip_mask, (jint)lpStruct->clip_mask);
-+ (*env)->SetLongField(env, lpObject, GdkGCValuesFc.tile, (jlong)lpStruct->tile);
-+ (*env)->SetLongField(env, lpObject, GdkGCValuesFc.stipple, (jlong)lpStruct->stipple);
-+ (*env)->SetLongField(env, lpObject, GdkGCValuesFc.clip_mask, (jlong)lpStruct->clip_mask);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.ts_x_origin, (jint)lpStruct->ts_x_origin);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.ts_y_origin, (jint)lpStruct->ts_y_origin);
-@@ -1030,7 +1030,7 @@
- if (GdkImageFc.cached) return;
- GdkImageFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkImageFc.type = (*env)->GetFieldID(env, GdkImageFc.clazz, "type", "I");
-- GdkImageFc.visual = (*env)->GetFieldID(env, GdkImageFc.clazz, "visual", "I");
-+ GdkImageFc.visual = (*env)->GetFieldID(env, GdkImageFc.clazz, "visual", "J");
- GdkImageFc.byte_order = (*env)->GetFieldID(env, GdkImageFc.clazz, "byte_order", "I");
- GdkImageFc.width = (*env)->GetFieldID(env, GdkImageFc.clazz, "width", "I");
- GdkImageFc.height = (*env)->GetFieldID(env, GdkImageFc.clazz, "height", "I");
-@@ -1038,9 +1038,9 @@
- GdkImageFc.bpp = (*env)->GetFieldID(env, GdkImageFc.clazz, "bpp", "S");
- GdkImageFc.bpl = (*env)->GetFieldID(env, GdkImageFc.clazz, "bpl", "S");
- GdkImageFc.bits_per_pixel = (*env)->GetFieldID(env, GdkImageFc.clazz, "bits_per_pixel", "S");
-- GdkImageFc.mem = (*env)->GetFieldID(env, GdkImageFc.clazz, "mem", "I");
-- GdkImageFc.colormap = (*env)->GetFieldID(env, GdkImageFc.clazz, "colormap", "I");
-- GdkImageFc.windowing_data = (*env)->GetFieldID(env, GdkImageFc.clazz, "windowing_data", "I");
-+ GdkImageFc.mem = (*env)->GetFieldID(env, GdkImageFc.clazz, "mem", "J");
-+ GdkImageFc.colormap = (*env)->GetFieldID(env, GdkImageFc.clazz, "colormap", "J");
-+ GdkImageFc.windowing_data = (*env)->GetFieldID(env, GdkImageFc.clazz, "windowing_data", "J");
- GdkImageFc.cached = 1;
- }
-
-@@ -1048,7 +1048,7 @@
- {
- if (!GdkImageFc.cached) cacheGdkImageFields(env, lpObject);
- lpStruct->type = (GdkImageType)(*env)->GetIntField(env, lpObject, GdkImageFc.type);
-- lpStruct->visual = (GdkVisual *)(*env)->GetIntField(env, lpObject, GdkImageFc.visual);
-+ lpStruct->visual = (GdkVisual *)(*env)->GetLongField(env, lpObject, GdkImageFc.visual);
- lpStruct->byte_order = (GdkByteOrder)(*env)->GetIntField(env, lpObject, GdkImageFc.byte_order);
- lpStruct->width = (gint)(*env)->GetIntField(env, lpObject, GdkImageFc.width);
- lpStruct->height = (gint)(*env)->GetIntField(env, lpObject, GdkImageFc.height);
-@@ -1056,9 +1056,9 @@
- lpStruct->bpp = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bpp);
- lpStruct->bpl = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bpl);
- lpStruct->bits_per_pixel = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bits_per_pixel);
-- lpStruct->mem = (gpointer)(*env)->GetIntField(env, lpObject, GdkImageFc.mem);
-- lpStruct->colormap = (GdkColormap *)(*env)->GetIntField(env, lpObject, GdkImageFc.colormap);
-- lpStruct->windowing_data = (gpointer)(*env)->GetIntField(env, lpObject, GdkImageFc.windowing_data);
-+ lpStruct->mem = (gpointer)(*env)->GetLongField(env, lpObject, GdkImageFc.mem);
-+ lpStruct->colormap = (GdkColormap *)(*env)->GetLongField(env, lpObject, GdkImageFc.colormap);
-+ lpStruct->windowing_data = (gpointer)(*env)->GetLongField(env, lpObject, GdkImageFc.windowing_data);
- return lpStruct;
- }
-
-@@ -1066,7 +1066,7 @@
- {
- if (!GdkImageFc.cached) cacheGdkImageFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GdkImageFc.type, (jint)lpStruct->type);
-- (*env)->SetIntField(env, lpObject, GdkImageFc.visual, (jint)lpStruct->visual);
-+ (*env)->SetLongField(env, lpObject, GdkImageFc.visual, (jlong)lpStruct->visual);
- (*env)->SetIntField(env, lpObject, GdkImageFc.byte_order, (jint)lpStruct->byte_order);
- (*env)->SetIntField(env, lpObject, GdkImageFc.width, (jint)lpStruct->width);
- (*env)->SetIntField(env, lpObject, GdkImageFc.height, (jint)lpStruct->height);
-@@ -1074,9 +1074,9 @@
- (*env)->SetShortField(env, lpObject, GdkImageFc.bpp, (jshort)lpStruct->bpp);
- (*env)->SetShortField(env, lpObject, GdkImageFc.bpl, (jshort)lpStruct->bpl);
- (*env)->SetShortField(env, lpObject, GdkImageFc.bits_per_pixel, (jshort)lpStruct->bits_per_pixel);
-- (*env)->SetIntField(env, lpObject, GdkImageFc.mem, (jint)lpStruct->mem);
-- (*env)->SetIntField(env, lpObject, GdkImageFc.colormap, (jint)lpStruct->colormap);
-- (*env)->SetIntField(env, lpObject, GdkImageFc.windowing_data, (jint)lpStruct->windowing_data);
-+ (*env)->SetLongField(env, lpObject, GdkImageFc.mem, (jlong)lpStruct->mem);
-+ (*env)->SetLongField(env, lpObject, GdkImageFc.colormap, (jlong)lpStruct->colormap);
-+ (*env)->SetLongField(env, lpObject, GdkImageFc.windowing_data, (jlong)lpStruct->windowing_data);
- }
- #endif
-
-@@ -1203,19 +1203,19 @@
- {
- if (GdkWindowAttrFc.cached) return;
- GdkWindowAttrFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", "I");
-+ GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", "J");
- GdkWindowAttrFc.event_mask = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "event_mask", "I");
- GdkWindowAttrFc.x = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "x", "I");
- GdkWindowAttrFc.y = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "y", "I");
- GdkWindowAttrFc.width = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "width", "I");
- GdkWindowAttrFc.height = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "height", "I");
- GdkWindowAttrFc.wclass = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wclass", "I");
-- GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", "I");
-- GdkWindowAttrFc.colormap = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "colormap", "I");
-+ GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", "J");
-+ GdkWindowAttrFc.colormap = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "colormap", "J");
- GdkWindowAttrFc.window_type = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "window_type", "I");
-- GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", "I");
-- GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", "I");
-- GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", "I");
-+ GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", "J");
-+ GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", "J");
-+ GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", "J");
- GdkWindowAttrFc.override_redirect = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "override_redirect", "Z");
- GdkWindowAttrFc.cached = 1;
- }
-@@ -1223,19 +1223,19 @@
- GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct)
- {
- if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject);
-- lpStruct->title = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.title);
-+ lpStruct->title = (gchar *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.title);
- lpStruct->event_mask = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.event_mask);
- lpStruct->x = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.x);
- lpStruct->y = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.y);
- lpStruct->width = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.width);
- lpStruct->height = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.height);
- lpStruct->wclass = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wclass);
-- lpStruct->visual = (GdkVisual *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.visual);
-- lpStruct->colormap = (GdkColormap *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.colormap);
-+ lpStruct->visual = (GdkVisual *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.visual);
-+ lpStruct->colormap = (GdkColormap *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.colormap);
- lpStruct->window_type = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.window_type);
-- lpStruct->cursor = (GdkCursor *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.cursor);
-- lpStruct->wmclass_name = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wmclass_name);
-- lpStruct->wmclass_class = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wmclass_class);
-+ lpStruct->cursor = (GdkCursor *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.cursor);
-+ lpStruct->wmclass_name = (gchar *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.wmclass_name);
-+ lpStruct->wmclass_class = (gchar *)(*env)->GetLongField(env, lpObject, GdkWindowAttrFc.wmclass_class);
- lpStruct->override_redirect = (*env)->GetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect);
- return lpStruct;
- }
-@@ -1243,19 +1243,19 @@
- void setGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct)
- {
- if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.title, (jint)lpStruct->title);
-+ (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.title, (jlong)lpStruct->title);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.event_mask, (jint)lpStruct->event_mask);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.x, (jint)lpStruct->x);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.y, (jint)lpStruct->y);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.width, (jint)lpStruct->width);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.height, (jint)lpStruct->height);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wclass, (jint)lpStruct->wclass);
-- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.visual, (jint)lpStruct->visual);
-- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.colormap, (jint)lpStruct->colormap);
-+ (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.visual, (jlong)lpStruct->visual);
-+ (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.colormap, (jlong)lpStruct->colormap);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.window_type, (jint)lpStruct->window_type);
-- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.cursor, (jint)lpStruct->cursor);
-- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jint)lpStruct->wmclass_name);
-- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jint)lpStruct->wmclass_class);
-+ (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.cursor, (jlong)lpStruct->cursor);
-+ (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jlong)lpStruct->wmclass_name);
-+ (*env)->SetLongField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jlong)lpStruct->wmclass_class);
- (*env)->SetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect, (jboolean)lpStruct->override_redirect);
- }
- #endif
-@@ -1399,24 +1399,24 @@
- {
- if (GtkCellRendererClassFc.cached) return;
- GtkCellRendererClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", "I");
-- GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", "I");
-+ GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", "J");
-+ GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", "J");
- GtkCellRendererClassFc.cached = 1;
- }
-
- GtkCellRendererClass *getGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
- {
- if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
-- lpStruct->render = (void(*)())(*env)->GetIntField(env, lpObject, GtkCellRendererClassFc.render);
-- lpStruct->get_size = (void(*)())(*env)->GetIntField(env, lpObject, GtkCellRendererClassFc.get_size);
-+ lpStruct->render = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.render);
-+ lpStruct->get_size = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.get_size);
- return lpStruct;
- }
-
- void setGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
- {
- if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkCellRendererClassFc.render, (jint)lpStruct->render);
-- (*env)->SetIntField(env, lpObject, GtkCellRendererClassFc.get_size, (jint)lpStruct->get_size);
-+ (*env)->SetLongField(env, lpObject, GtkCellRendererClassFc.render, (jlong)lpStruct->render);
-+ (*env)->SetLongField(env, lpObject, GtkCellRendererClassFc.get_size, (jlong)lpStruct->get_size);
- }
- #endif
-
-@@ -1433,30 +1433,30 @@
- {
- if (GtkColorSelectionDialogFc.cached) return;
- GtkColorSelectionDialogFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkColorSelectionDialogFc.colorsel = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "colorsel", "I");
-- GtkColorSelectionDialogFc.ok_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "ok_button", "I");
-- GtkColorSelectionDialogFc.cancel_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "cancel_button", "I");
-- GtkColorSelectionDialogFc.help_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "help_button", "I");
-+ GtkColorSelectionDialogFc.colorsel = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "colorsel", "J");
-+ GtkColorSelectionDialogFc.ok_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "ok_button", "J");
-+ GtkColorSelectionDialogFc.cancel_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "cancel_button", "J");
-+ GtkColorSelectionDialogFc.help_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "help_button", "J");
- GtkColorSelectionDialogFc.cached = 1;
- }
-
- GtkColorSelectionDialog *getGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct)
- {
- if (!GtkColorSelectionDialogFc.cached) cacheGtkColorSelectionDialogFields(env, lpObject);
-- lpStruct->colorsel = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.colorsel);
-- lpStruct->ok_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.ok_button);
-- lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.cancel_button);
-- lpStruct->help_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.help_button);
-+ lpStruct->colorsel = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkColorSelectionDialogFc.colorsel);
-+ lpStruct->ok_button = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkColorSelectionDialogFc.ok_button);
-+ lpStruct->cancel_button = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkColorSelectionDialogFc.cancel_button);
-+ lpStruct->help_button = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkColorSelectionDialogFc.help_button);
- return lpStruct;
- }
-
- void setGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct)
- {
- if (!GtkColorSelectionDialogFc.cached) cacheGtkColorSelectionDialogFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.colorsel, (jint)lpStruct->colorsel);
-- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.ok_button, (jint)lpStruct->ok_button);
-- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.cancel_button, (jint)lpStruct->cancel_button);
-- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.help_button, (jint)lpStruct->help_button);
-+ (*env)->SetLongField(env, lpObject, GtkColorSelectionDialogFc.colorsel, (jlong)lpStruct->colorsel);
-+ (*env)->SetLongField(env, lpObject, GtkColorSelectionDialogFc.ok_button, (jlong)lpStruct->ok_button);
-+ (*env)->SetLongField(env, lpObject, GtkColorSelectionDialogFc.cancel_button, (jlong)lpStruct->cancel_button);
-+ (*env)->SetLongField(env, lpObject, GtkColorSelectionDialogFc.help_button, (jlong)lpStruct->help_button);
- }
- #endif
-
-@@ -1473,24 +1473,24 @@
- {
- if (GtkComboFc.cached) return;
- GtkComboFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkComboFc.entry = (*env)->GetFieldID(env, GtkComboFc.clazz, "entry", "I");
-- GtkComboFc.list = (*env)->GetFieldID(env, GtkComboFc.clazz, "list", "I");
-+ GtkComboFc.entry = (*env)->GetFieldID(env, GtkComboFc.clazz, "entry", "J");
-+ GtkComboFc.list = (*env)->GetFieldID(env, GtkComboFc.clazz, "list", "J");
- GtkComboFc.cached = 1;
- }
-
- GtkCombo *getGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct)
- {
- if (!GtkComboFc.cached) cacheGtkComboFields(env, lpObject);
-- lpStruct->entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkComboFc.entry);
-- lpStruct->list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkComboFc.list);
-+ lpStruct->entry = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkComboFc.entry);
-+ lpStruct->list = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkComboFc.list);
- return lpStruct;
- }
-
- void setGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct)
- {
- if (!GtkComboFc.cached) cacheGtkComboFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkComboFc.entry, (jint)lpStruct->entry);
-- (*env)->SetIntField(env, lpObject, GtkComboFc.list, (jint)lpStruct->list);
-+ (*env)->SetLongField(env, lpObject, GtkComboFc.entry, (jlong)lpStruct->entry);
-+ (*env)->SetLongField(env, lpObject, GtkComboFc.list, (jlong)lpStruct->list);
- }
- #endif
-
-@@ -1507,78 +1507,78 @@
- {
- if (GtkFileSelectionFc.cached) return;
- GtkFileSelectionFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkFileSelectionFc.dir_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "dir_list", "I");
-- GtkFileSelectionFc.file_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "file_list", "I");
-- GtkFileSelectionFc.selection_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_entry", "I");
-- GtkFileSelectionFc.selection_text = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_text", "I");
-- GtkFileSelectionFc.main_vbox = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "main_vbox", "I");
-- GtkFileSelectionFc.ok_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "ok_button", "I");
-- GtkFileSelectionFc.cancel_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cancel_button", "I");
-- GtkFileSelectionFc.help_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "help_button", "I");
-- GtkFileSelectionFc.history_pulldown = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_pulldown", "I");
-- GtkFileSelectionFc.history_menu = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_menu", "I");
-- GtkFileSelectionFc.history_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_list", "I");
-- GtkFileSelectionFc.fileop_dialog = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_dialog", "I");
-- GtkFileSelectionFc.fileop_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_entry", "I");
-- GtkFileSelectionFc.fileop_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_file", "I");
-- GtkFileSelectionFc.cmpl_state = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cmpl_state", "I");
-- GtkFileSelectionFc.fileop_c_dir = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_c_dir", "I");
-- GtkFileSelectionFc.fileop_del_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_del_file", "I");
-- GtkFileSelectionFc.fileop_ren_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_ren_file", "I");
-- GtkFileSelectionFc.button_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "button_area", "I");
-- GtkFileSelectionFc.action_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "action_area", "I");
-+ GtkFileSelectionFc.dir_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "dir_list", "J");
-+ GtkFileSelectionFc.file_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "file_list", "J");
-+ GtkFileSelectionFc.selection_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_entry", "J");
-+ GtkFileSelectionFc.selection_text = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_text", "J");
-+ GtkFileSelectionFc.main_vbox = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "main_vbox", "J");
-+ GtkFileSelectionFc.ok_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "ok_button", "J");
-+ GtkFileSelectionFc.cancel_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cancel_button", "J");
-+ GtkFileSelectionFc.help_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "help_button", "J");
-+ GtkFileSelectionFc.history_pulldown = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_pulldown", "J");
-+ GtkFileSelectionFc.history_menu = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_menu", "J");
-+ GtkFileSelectionFc.history_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_list", "J");
-+ GtkFileSelectionFc.fileop_dialog = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_dialog", "J");
-+ GtkFileSelectionFc.fileop_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_entry", "J");
-+ GtkFileSelectionFc.fileop_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_file", "J");
-+ GtkFileSelectionFc.cmpl_state = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cmpl_state", "J");
-+ GtkFileSelectionFc.fileop_c_dir = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_c_dir", "J");
-+ GtkFileSelectionFc.fileop_del_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_del_file", "J");
-+ GtkFileSelectionFc.fileop_ren_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_ren_file", "J");
-+ GtkFileSelectionFc.button_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "button_area", "J");
-+ GtkFileSelectionFc.action_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "action_area", "J");
- GtkFileSelectionFc.cached = 1;
- }
-
- GtkFileSelection *getGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct)
- {
- if (!GtkFileSelectionFc.cached) cacheGtkFileSelectionFields(env, lpObject);
-- lpStruct->dir_list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.dir_list);
-- lpStruct->file_list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.file_list);
-- lpStruct->selection_entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.selection_entry);
-- lpStruct->selection_text = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.selection_text);
-- lpStruct->main_vbox = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.main_vbox);
-- lpStruct->ok_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.ok_button);
-- lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.cancel_button);
-- lpStruct->help_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.help_button);
-- lpStruct->history_pulldown = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_pulldown);
-- lpStruct->history_menu = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_menu);
-- lpStruct->history_list = (GList *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_list);
-- lpStruct->fileop_dialog = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_dialog);
-- lpStruct->fileop_entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_entry);
-- lpStruct->fileop_file = (gchar *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_file);
-- lpStruct->cmpl_state = (gpointer)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.cmpl_state);
-- lpStruct->fileop_c_dir = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_c_dir);
-- lpStruct->fileop_del_file = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_del_file);
-- lpStruct->fileop_ren_file = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_ren_file);
-- lpStruct->button_area = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.button_area);
-- lpStruct->action_area = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.action_area);
-+ lpStruct->dir_list = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.dir_list);
-+ lpStruct->file_list = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.file_list);
-+ lpStruct->selection_entry = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.selection_entry);
-+ lpStruct->selection_text = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.selection_text);
-+ lpStruct->main_vbox = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.main_vbox);
-+ lpStruct->ok_button = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.ok_button);
-+ lpStruct->cancel_button = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.cancel_button);
-+ lpStruct->help_button = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.help_button);
-+ lpStruct->history_pulldown = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.history_pulldown);
-+ lpStruct->history_menu = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.history_menu);
-+ lpStruct->history_list = (GList *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.history_list);
-+ lpStruct->fileop_dialog = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.fileop_dialog);
-+ lpStruct->fileop_entry = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.fileop_entry);
-+ lpStruct->fileop_file = (gchar *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.fileop_file);
-+ lpStruct->cmpl_state = (gpointer)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.cmpl_state);
-+ lpStruct->fileop_c_dir = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.fileop_c_dir);
-+ lpStruct->fileop_del_file = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.fileop_del_file);
-+ lpStruct->fileop_ren_file = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.fileop_ren_file);
-+ lpStruct->button_area = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.button_area);
-+ lpStruct->action_area = (GtkWidget *)(*env)->GetLongField(env, lpObject, GtkFileSelectionFc.action_area);
- return lpStruct;
- }
-
- void setGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct)
- {
- if (!GtkFileSelectionFc.cached) cacheGtkFileSelectionFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.dir_list, (jint)lpStruct->dir_list);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.file_list, (jint)lpStruct->file_list);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.selection_entry, (jint)lpStruct->selection_entry);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.selection_text, (jint)lpStruct->selection_text);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.main_vbox, (jint)lpStruct->main_vbox);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.ok_button, (jint)lpStruct->ok_button);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.cancel_button, (jint)lpStruct->cancel_button);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.help_button, (jint)lpStruct->help_button);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_pulldown, (jint)lpStruct->history_pulldown);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_menu, (jint)lpStruct->history_menu);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_list, (jint)lpStruct->history_list);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_dialog, (jint)lpStruct->fileop_dialog);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_entry, (jint)lpStruct->fileop_entry);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_file, (jint)lpStruct->fileop_file);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.cmpl_state, (jint)lpStruct->cmpl_state);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_c_dir, (jint)lpStruct->fileop_c_dir);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_del_file, (jint)lpStruct->fileop_del_file);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_ren_file, (jint)lpStruct->fileop_ren_file);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.button_area, (jint)lpStruct->button_area);
-- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.action_area, (jint)lpStruct->action_area);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.dir_list, (jlong)lpStruct->dir_list);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.file_list, (jlong)lpStruct->file_list);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.selection_entry, (jlong)lpStruct->selection_entry);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.selection_text, (jlong)lpStruct->selection_text);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.main_vbox, (jlong)lpStruct->main_vbox);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.ok_button, (jlong)lpStruct->ok_button);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.cancel_button, (jlong)lpStruct->cancel_button);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.help_button, (jlong)lpStruct->help_button);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.history_pulldown, (jlong)lpStruct->history_pulldown);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.history_menu, (jlong)lpStruct->history_menu);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.history_list, (jlong)lpStruct->history_list);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.fileop_dialog, (jlong)lpStruct->fileop_dialog);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.fileop_entry, (jlong)lpStruct->fileop_entry);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.fileop_file, (jlong)lpStruct->fileop_file);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.cmpl_state, (jlong)lpStruct->cmpl_state);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.fileop_c_dir, (jlong)lpStruct->fileop_c_dir);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.fileop_del_file, (jlong)lpStruct->fileop_del_file);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.fileop_ren_file, (jlong)lpStruct->fileop_ren_file);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.button_area, (jlong)lpStruct->button_area);
-+ (*env)->SetLongField(env, lpObject, GtkFileSelectionFc.action_area, (jlong)lpStruct->action_area);
- }
- #endif
-
-@@ -1595,21 +1595,21 @@
- {
- if (GtkFixedFc.cached) return;
- GtkFixedFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkFixedFc.children = (*env)->GetFieldID(env, GtkFixedFc.clazz, "children", "I");
-+ GtkFixedFc.children = (*env)->GetFieldID(env, GtkFixedFc.clazz, "children", "J");
- GtkFixedFc.cached = 1;
- }
-
- GtkFixed *getGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct)
- {
- if (!GtkFixedFc.cached) cacheGtkFixedFields(env, lpObject);
-- lpStruct->children = (GList *)(*env)->GetIntField(env, lpObject, GtkFixedFc.children);
-+ lpStruct->children = (GList *)(*env)->GetLongField(env, lpObject, GtkFixedFc.children);
- return lpStruct;
- }
-
- void setGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct)
- {
- if (!GtkFixedFc.cached) cacheGtkFixedFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkFixedFc.children, (jint)lpStruct->children);
-+ (*env)->SetLongField(env, lpObject, GtkFixedFc.children, (jlong)lpStruct->children);
- }
- #endif
-
-@@ -1660,11 +1660,11 @@
- {
- if (GtkSelectionDataFc.cached) return;
- GtkSelectionDataFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkSelectionDataFc.selection = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "selection", "I");
-- GtkSelectionDataFc.target = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "target", "I");
-- GtkSelectionDataFc.type = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "type", "I");
-+ GtkSelectionDataFc.selection = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "selection", "J");
-+ GtkSelectionDataFc.target = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "target", "J");
-+ GtkSelectionDataFc.type = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "type", "J");
- GtkSelectionDataFc.format = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "format", "I");
-- GtkSelectionDataFc.data = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "data", "I");
-+ GtkSelectionDataFc.data = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "data", "J");
- GtkSelectionDataFc.length = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "length", "I");
- GtkSelectionDataFc.cached = 1;
- }
-@@ -1672,11 +1672,11 @@
- GtkSelectionData *getGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct)
- {
- if (!GtkSelectionDataFc.cached) cacheGtkSelectionDataFields(env, lpObject);
-- lpStruct->selection = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.selection);
-- lpStruct->target = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.target);
-- lpStruct->type = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.type);
-+ lpStruct->selection = (GdkAtom)(*env)->GetLongField(env, lpObject, GtkSelectionDataFc.selection);
-+ lpStruct->target = (GdkAtom)(*env)->GetLongField(env, lpObject, GtkSelectionDataFc.target);
-+ lpStruct->type = (GdkAtom)(*env)->GetLongField(env, lpObject, GtkSelectionDataFc.type);
- lpStruct->format = (gint)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.format);
-- lpStruct->data = (guchar *)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.data);
-+ lpStruct->data = (guchar *)(*env)->GetLongField(env, lpObject, GtkSelectionDataFc.data);
- lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.length);
- return lpStruct;
- }
-@@ -1684,11 +1684,11 @@
- void setGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct)
- {
- if (!GtkSelectionDataFc.cached) cacheGtkSelectionDataFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.selection, (jint)lpStruct->selection);
-- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.target, (jint)lpStruct->target);
-- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.type, (jint)lpStruct->type);
-+ (*env)->SetLongField(env, lpObject, GtkSelectionDataFc.selection, (jlong)lpStruct->selection);
-+ (*env)->SetLongField(env, lpObject, GtkSelectionDataFc.target, (jlong)lpStruct->target);
-+ (*env)->SetLongField(env, lpObject, GtkSelectionDataFc.type, (jlong)lpStruct->type);
- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.format, (jint)lpStruct->format);
-- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.data, (jint)lpStruct->data);
-+ (*env)->SetLongField(env, lpObject, GtkSelectionDataFc.data, (jlong)lpStruct->data);
- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.length, (jint)lpStruct->length);
- }
- #endif
-@@ -1706,7 +1706,7 @@
- {
- if (GtkTargetEntryFc.cached) return;
- GtkTargetEntryFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", "I");
-+ GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", "J");
- GtkTargetEntryFc.flags = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "flags", "I");
- GtkTargetEntryFc.info = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "info", "I");
- GtkTargetEntryFc.cached = 1;
-@@ -1715,7 +1715,7 @@
- GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct)
- {
- if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject);
-- lpStruct->target = (gchar *)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.target);
-+ lpStruct->target = (gchar *)(*env)->GetLongField(env, lpObject, GtkTargetEntryFc.target);
- lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.flags);
- lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.info);
- return lpStruct;
-@@ -1724,7 +1724,7 @@
- void setGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct)
- {
- if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkTargetEntryFc.target, (jint)lpStruct->target);
-+ (*env)->SetLongField(env, lpObject, GtkTargetEntryFc.target, (jlong)lpStruct->target);
- (*env)->SetIntField(env, lpObject, GtkTargetEntryFc.flags, (jint)lpStruct->flags);
- (*env)->SetIntField(env, lpObject, GtkTargetEntryFc.info, (jint)lpStruct->info);
- }
-@@ -1743,7 +1743,7 @@
- {
- if (GtkTargetPairFc.cached) return;
- GtkTargetPairFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- GtkTargetPairFc.target = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "target", "I");
-+ GtkTargetPairFc.target = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "target", "J");
- GtkTargetPairFc.flags = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "flags", "I");
- GtkTargetPairFc.info = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "info", "I");
- GtkTargetPairFc.cached = 1;
-@@ -1752,7 +1752,7 @@
- GtkTargetPair *getGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct)
- {
- if (!GtkTargetPairFc.cached) cacheGtkTargetPairFields(env, lpObject);
-- lpStruct->target = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.target);
-+ lpStruct->target = (GdkAtom)(*env)->GetLongField(env, lpObject, GtkTargetPairFc.target);
- lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.flags);
- lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.info);
- return lpStruct;
-@@ -1761,7 +1761,7 @@
- void setGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct)
- {
- if (!GtkTargetPairFc.cached) cacheGtkTargetPairFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, GtkTargetPairFc.target, (jint)lpStruct->target);
-+ (*env)->SetLongField(env, lpObject, GtkTargetPairFc.target, (jlong)lpStruct->target);
- (*env)->SetIntField(env, lpObject, GtkTargetPairFc.flags, (jint)lpStruct->flags);
- (*env)->SetIntField(env, lpObject, GtkTargetPairFc.info, (jint)lpStruct->info);
- }
-@@ -1783,68 +1783,68 @@
- GtkWidgetClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkWidgetClassFc.activate_signal = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "activate_signal", "I");
- GtkWidgetClassFc.set_scroll_adjustments_signal = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "set_scroll_adjustments_signal", "I");
-- GtkWidgetClassFc.dispatch_child_properties_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "dispatch_child_properties_changed", "I");
-- GtkWidgetClassFc.show = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show", "I");
-- GtkWidgetClassFc.show_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_all", "I");
-- GtkWidgetClassFc.hide = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide", "I");
-- GtkWidgetClassFc.hide_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide_all", "I");
-- GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", "I");
-- GtkWidgetClassFc.unmap = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap", "I");
-- GtkWidgetClassFc.realize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "realize", "I");
-- GtkWidgetClassFc.unrealize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unrealize", "I");
-- GtkWidgetClassFc.size_request = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_request", "I");
-- GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", "I");
-- GtkWidgetClassFc.state_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "state_changed", "I");
-- GtkWidgetClassFc.parent_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "parent_set", "I");
-- GtkWidgetClassFc.hierarchy_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hierarchy_changed", "I");
-- GtkWidgetClassFc.style_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "style_set", "I");
-- GtkWidgetClassFc.direction_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "direction_changed", "I");
-- GtkWidgetClassFc.grab_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_notify", "I");
-- GtkWidgetClassFc.child_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "child_notify", "I");
-- GtkWidgetClassFc.mnemonic_activate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "mnemonic_activate", "I");
-- GtkWidgetClassFc.grab_focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_focus", "I");
-- GtkWidgetClassFc.focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus", "I");
-- GtkWidgetClassFc.event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "event", "I");
-- GtkWidgetClassFc.button_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_press_event", "I");
-- GtkWidgetClassFc.button_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_release_event", "I");
-- GtkWidgetClassFc.scroll_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "scroll_event", "I");
-- GtkWidgetClassFc.motion_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "motion_notify_event", "I");
-- GtkWidgetClassFc.delete_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "delete_event", "I");
-- GtkWidgetClassFc.destroy_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "destroy_event", "I");
-- GtkWidgetClassFc.expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "expose_event", "I");
-- GtkWidgetClassFc.key_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_press_event", "I");
-- GtkWidgetClassFc.key_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_release_event", "I");
-- GtkWidgetClassFc.enter_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "enter_notify_event", "I");
-- GtkWidgetClassFc.leave_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "leave_notify_event", "I");
-- GtkWidgetClassFc.configure_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "configure_event", "I");
-- GtkWidgetClassFc.focus_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_in_event", "I");
-- GtkWidgetClassFc.focus_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_out_event", "I");
-- GtkWidgetClassFc.map_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map_event", "I");
-- GtkWidgetClassFc.unmap_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap_event", "I");
-- GtkWidgetClassFc.property_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "property_notify_event", "I");
-- GtkWidgetClassFc.selection_clear_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_clear_event", "I");
-- GtkWidgetClassFc.selection_request_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_request_event", "I");
-- GtkWidgetClassFc.selection_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_notify_event", "I");
-- GtkWidgetClassFc.proximity_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_in_event", "I");
-- GtkWidgetClassFc.proximity_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_out_event", "I");
-- GtkWidgetClassFc.visibility_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "visibility_notify_event", "I");
-- GtkWidgetClassFc.client_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "client_event", "I");
-- GtkWidgetClassFc.no_expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "no_expose_event", "I");
-- GtkWidgetClassFc.window_state_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "window_state_event", "I");
-- GtkWidgetClassFc.selection_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_get", "I");
-- GtkWidgetClassFc.selection_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_received", "I");
-- GtkWidgetClassFc.drag_begin = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_begin", "I");
-- GtkWidgetClassFc.drag_end = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_end", "I");
-- GtkWidgetClassFc.drag_data_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_get", "I");
-- GtkWidgetClassFc.drag_data_delete = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_delete", "I");
-- GtkWidgetClassFc.drag_leave = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_leave", "I");
-- GtkWidgetClassFc.drag_motion = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_motion", "I");
-- GtkWidgetClassFc.drag_drop = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_drop", "I");
-- GtkWidgetClassFc.drag_data_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_received", "I");
-- GtkWidgetClassFc.popup_menu = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "popup_menu", "I");
-- GtkWidgetClassFc.show_help = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_help", "I");
-- GtkWidgetClassFc.get_accessible = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "get_accessible", "I");
-- GtkWidgetClassFc.screen_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "screen_changed", "I");
-+ GtkWidgetClassFc.dispatch_child_properties_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "dispatch_child_properties_changed", "J");
-+ GtkWidgetClassFc.show = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show", "J");
-+ GtkWidgetClassFc.show_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_all", "J");
-+ GtkWidgetClassFc.hide = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide", "J");
-+ GtkWidgetClassFc.hide_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide_all", "J");
-+ GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", "J");
-+ GtkWidgetClassFc.unmap = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap", "J");
-+ GtkWidgetClassFc.realize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "realize", "J");
-+ GtkWidgetClassFc.unrealize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unrealize", "J");
-+ GtkWidgetClassFc.size_request = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_request", "J");
-+ GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", "J");
-+ GtkWidgetClassFc.state_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "state_changed", "J");
-+ GtkWidgetClassFc.parent_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "parent_set", "J");
-+ GtkWidgetClassFc.hierarchy_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hierarchy_changed", "J");
-+ GtkWidgetClassFc.style_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "style_set", "J");
-+ GtkWidgetClassFc.direction_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "direction_changed", "J");
-+ GtkWidgetClassFc.grab_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_notify", "J");
-+ GtkWidgetClassFc.child_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "child_notify", "J");
-+ GtkWidgetClassFc.mnemonic_activate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "mnemonic_activate", "J");
-+ GtkWidgetClassFc.grab_focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_focus", "J");
-+ GtkWidgetClassFc.focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus", "J");
-+ GtkWidgetClassFc.event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "event", "J");
-+ GtkWidgetClassFc.button_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_press_event", "J");
-+ GtkWidgetClassFc.button_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_release_event", "J");
-+ GtkWidgetClassFc.scroll_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "scroll_event", "J");
-+ GtkWidgetClassFc.motion_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "motion_notify_event", "J");
-+ GtkWidgetClassFc.delete_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "delete_event", "J");
-+ GtkWidgetClassFc.destroy_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "destroy_event", "J");
-+ GtkWidgetClassFc.expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "expose_event", "J");
-+ GtkWidgetClassFc.key_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_press_event", "J");
-+ GtkWidgetClassFc.key_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_release_event", "J");
-+ GtkWidgetClassFc.enter_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "enter_notify_event", "J");
-+ GtkWidgetClassFc.leave_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "leave_notify_event", "J");
-+ GtkWidgetClassFc.configure_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "configure_event", "J");
-+ GtkWidgetClassFc.focus_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_in_event", "J");
-+ GtkWidgetClassFc.focus_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_out_event", "J");
-+ GtkWidgetClassFc.map_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map_event", "J");
-+ GtkWidgetClassFc.unmap_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap_event", "J");
-+ GtkWidgetClassFc.property_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "property_notify_event", "J");
-+ GtkWidgetClassFc.selection_clear_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_clear_event", "J");
-+ GtkWidgetClassFc.selection_request_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_request_event", "J");
-+ GtkWidgetClassFc.selection_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_notify_event", "J");
-+ GtkWidgetClassFc.proximity_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_in_event", "J");
-+ GtkWidgetClassFc.proximity_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_out_event", "J");
-+ GtkWidgetClassFc.visibility_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "visibility_notify_event", "J");
-+ GtkWidgetClassFc.client_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "client_event", "J");
-+ GtkWidgetClassFc.no_expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "no_expose_event", "J");
-+ GtkWidgetClassFc.window_state_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "window_state_event", "J");
-+ GtkWidgetClassFc.selection_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_get", "J");
-+ GtkWidgetClassFc.selection_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_received", "J");
-+ GtkWidgetClassFc.drag_begin = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_begin", "J");
-+ GtkWidgetClassFc.drag_end = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_end", "J");
-+ GtkWidgetClassFc.drag_data_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_get", "J");
-+ GtkWidgetClassFc.drag_data_delete = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_delete", "J");
-+ GtkWidgetClassFc.drag_leave = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_leave", "J");
-+ GtkWidgetClassFc.drag_motion = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_motion", "J");
-+ GtkWidgetClassFc.drag_drop = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_drop", "J");
-+ GtkWidgetClassFc.drag_data_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_received", "J");
-+ GtkWidgetClassFc.popup_menu = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "popup_menu", "J");
-+ GtkWidgetClassFc.show_help = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_help", "J");
-+ GtkWidgetClassFc.get_accessible = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "get_accessible", "J");
-+ GtkWidgetClassFc.screen_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "screen_changed", "J");
- GtkWidgetClassFc.cached = 1;
- }
-
-@@ -1854,68 +1854,68 @@
- getGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
- lpStruct->activate_signal = (*env)->GetIntField(env, lpObject, GtkWidgetClassFc.activate_signal);
- lpStruct->set_scroll_adjustments_signal = (*env)->GetIntField(env, lpObject, GtkWidgetClassFc.set_scroll_adjustments_signal);
-- lpStruct->dispatch_child_properties_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed);
-- lpStruct->show = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show);
-- lpStruct->show_all = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show_all);
-- lpStruct->hide = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hide);
-- lpStruct->hide_all = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hide_all);
-- lpStruct->map = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.map);
-- lpStruct->unmap = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unmap);
-- lpStruct->realize = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.realize);
-- lpStruct->unrealize = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unrealize);
-- lpStruct->size_request = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.size_request);
-- lpStruct->size_allocate = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.size_allocate);
-- lpStruct->state_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.state_changed);
-- lpStruct->parent_set = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.parent_set);
-- lpStruct->hierarchy_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hierarchy_changed);
-- lpStruct->style_set = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.style_set);
-- lpStruct->direction_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.direction_changed);
-- lpStruct->grab_notify = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.grab_notify);
-- lpStruct->child_notify = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.child_notify);
-- lpStruct->mnemonic_activate = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.mnemonic_activate);
-- lpStruct->grab_focus = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.grab_focus);
-- lpStruct->focus = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus);
-- lpStruct->event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.event);
-- lpStruct->button_press_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.button_press_event);
-- lpStruct->button_release_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.button_release_event);
-- lpStruct->scroll_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.scroll_event);
-- lpStruct->motion_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.motion_notify_event);
-- lpStruct->delete_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.delete_event);
-- lpStruct->destroy_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.destroy_event);
-- lpStruct->expose_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.expose_event);
-- lpStruct->key_press_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.key_press_event);
-- lpStruct->key_release_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.key_release_event);
-- lpStruct->enter_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.enter_notify_event);
-- lpStruct->leave_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.leave_notify_event);
-- lpStruct->configure_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.configure_event);
-- lpStruct->focus_in_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus_in_event);
-- lpStruct->focus_out_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus_out_event);
-- lpStruct->map_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.map_event);
-- lpStruct->unmap_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unmap_event);
-- lpStruct->property_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.property_notify_event);
-- lpStruct->selection_clear_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_clear_event);
-- lpStruct->selection_request_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_request_event);
-- lpStruct->selection_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_notify_event);
-- lpStruct->proximity_in_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.proximity_in_event);
-- lpStruct->proximity_out_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.proximity_out_event);
-- lpStruct->visibility_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.visibility_notify_event);
-- lpStruct->client_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.client_event);
-- lpStruct->no_expose_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.no_expose_event);
-- lpStruct->window_state_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.window_state_event);
-- lpStruct->selection_get = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_get);
-- lpStruct->selection_received = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_received);
-- lpStruct->drag_begin = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_begin);
-- lpStruct->drag_end = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_end);
-- lpStruct->drag_data_get = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_get);
-- lpStruct->drag_data_delete = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_delete);
-- lpStruct->drag_leave = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_leave);
-- lpStruct->drag_motion = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_motion);
-- lpStruct->drag_drop = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_drop);
-- lpStruct->drag_data_received = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_received);
-- lpStruct->popup_menu = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.popup_menu);
-- lpStruct->show_help = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show_help);
-- lpStruct->get_accessible = (AtkObject*(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.get_accessible);
-- lpStruct->screen_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.screen_changed);
-+ lpStruct->dispatch_child_properties_changed = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed);
-+ lpStruct->show = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.show);
-+ lpStruct->show_all = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.show_all);
-+ lpStruct->hide = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.hide);
-+ lpStruct->hide_all = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.hide_all);
-+ lpStruct->map = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.map);
-+ lpStruct->unmap = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.unmap);
-+ lpStruct->realize = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.realize);
-+ lpStruct->unrealize = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.unrealize);
-+ lpStruct->size_request = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.size_request);
-+ lpStruct->size_allocate = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
-+ lpStruct->state_changed = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.state_changed);
-+ lpStruct->parent_set = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.parent_set);
-+ lpStruct->hierarchy_changed = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.hierarchy_changed);
-+ lpStruct->style_set = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.style_set);
-+ lpStruct->direction_changed = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.direction_changed);
-+ lpStruct->grab_notify = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.grab_notify);
-+ lpStruct->child_notify = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.child_notify);
-+ lpStruct->mnemonic_activate = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.mnemonic_activate);
-+ lpStruct->grab_focus = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.grab_focus);
-+ lpStruct->focus = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.focus);
-+ lpStruct->event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.event);
-+ lpStruct->button_press_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.button_press_event);
-+ lpStruct->button_release_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.button_release_event);
-+ lpStruct->scroll_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.scroll_event);
-+ lpStruct->motion_notify_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.motion_notify_event);
-+ lpStruct->delete_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.delete_event);
-+ lpStruct->destroy_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.destroy_event);
-+ lpStruct->expose_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.expose_event);
-+ lpStruct->key_press_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.key_press_event);
-+ lpStruct->key_release_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.key_release_event);
-+ lpStruct->enter_notify_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.enter_notify_event);
-+ lpStruct->leave_notify_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.leave_notify_event);
-+ lpStruct->configure_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.configure_event);
-+ lpStruct->focus_in_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.focus_in_event);
-+ lpStruct->focus_out_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.focus_out_event);
-+ lpStruct->map_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.map_event);
-+ lpStruct->unmap_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.unmap_event);
-+ lpStruct->property_notify_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.property_notify_event);
-+ lpStruct->selection_clear_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.selection_clear_event);
-+ lpStruct->selection_request_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.selection_request_event);
-+ lpStruct->selection_notify_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.selection_notify_event);
-+ lpStruct->proximity_in_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.proximity_in_event);
-+ lpStruct->proximity_out_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.proximity_out_event);
-+ lpStruct->visibility_notify_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.visibility_notify_event);
-+ lpStruct->client_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.client_event);
-+ lpStruct->no_expose_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.no_expose_event);
-+ lpStruct->window_state_event = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.window_state_event);
-+ lpStruct->selection_get = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.selection_get);
-+ lpStruct->selection_received = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.selection_received);
-+ lpStruct->drag_begin = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_begin);
-+ lpStruct->drag_end = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_end);
-+ lpStruct->drag_data_get = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_data_get);
-+ lpStruct->drag_data_delete = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_data_delete);
-+ lpStruct->drag_leave = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_leave);
-+ lpStruct->drag_motion = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_motion);
-+ lpStruct->drag_drop = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_drop);
-+ lpStruct->drag_data_received = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.drag_data_received);
-+ lpStruct->popup_menu = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.popup_menu);
-+ lpStruct->show_help = (gboolean(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.show_help);
-+ lpStruct->get_accessible = (AtkObject*(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.get_accessible);
-+ lpStruct->screen_changed = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.screen_changed);
- return lpStruct;
- }
-
-@@ -1925,68 +1925,68 @@
- setGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.activate_signal, (jint)lpStruct->activate_signal);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.set_scroll_adjustments_signal, (jint)lpStruct->set_scroll_adjustments_signal);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed, (jint)lpStruct->dispatch_child_properties_changed);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show, (jint)lpStruct->show);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show_all, (jint)lpStruct->show_all);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hide, (jint)lpStruct->hide);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hide_all, (jint)lpStruct->hide_all);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.map, (jint)lpStruct->map);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unmap, (jint)lpStruct->unmap);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.realize, (jint)lpStruct->realize);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unrealize, (jint)lpStruct->unrealize);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.size_request, (jint)lpStruct->size_request);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.size_allocate, (jint)lpStruct->size_allocate);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.state_changed, (jint)lpStruct->state_changed);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.parent_set, (jint)lpStruct->parent_set);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hierarchy_changed, (jint)lpStruct->hierarchy_changed);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.style_set, (jint)lpStruct->style_set);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.direction_changed, (jint)lpStruct->direction_changed);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.grab_notify, (jint)lpStruct->grab_notify);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.child_notify, (jint)lpStruct->child_notify);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.mnemonic_activate, (jint)lpStruct->mnemonic_activate);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.grab_focus, (jint)lpStruct->grab_focus);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus, (jint)lpStruct->focus);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.event, (jint)lpStruct->event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.button_press_event, (jint)lpStruct->button_press_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.button_release_event, (jint)lpStruct->button_release_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.scroll_event, (jint)lpStruct->scroll_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.motion_notify_event, (jint)lpStruct->motion_notify_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.delete_event, (jint)lpStruct->delete_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.destroy_event, (jint)lpStruct->destroy_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.expose_event, (jint)lpStruct->expose_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.key_press_event, (jint)lpStruct->key_press_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.key_release_event, (jint)lpStruct->key_release_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.enter_notify_event, (jint)lpStruct->enter_notify_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.leave_notify_event, (jint)lpStruct->leave_notify_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.configure_event, (jint)lpStruct->configure_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus_in_event, (jint)lpStruct->focus_in_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus_out_event, (jint)lpStruct->focus_out_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.map_event, (jint)lpStruct->map_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unmap_event, (jint)lpStruct->unmap_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.property_notify_event, (jint)lpStruct->property_notify_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_clear_event, (jint)lpStruct->selection_clear_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_request_event, (jint)lpStruct->selection_request_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_notify_event, (jint)lpStruct->selection_notify_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.proximity_in_event, (jint)lpStruct->proximity_in_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.proximity_out_event, (jint)lpStruct->proximity_out_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.visibility_notify_event, (jint)lpStruct->visibility_notify_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.client_event, (jint)lpStruct->client_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.no_expose_event, (jint)lpStruct->no_expose_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.window_state_event, (jint)lpStruct->window_state_event);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_get, (jint)lpStruct->selection_get);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_received, (jint)lpStruct->selection_received);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_begin, (jint)lpStruct->drag_begin);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_end, (jint)lpStruct->drag_end);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_get, (jint)lpStruct->drag_data_get);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_delete, (jint)lpStruct->drag_data_delete);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_leave, (jint)lpStruct->drag_leave);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_motion, (jint)lpStruct->drag_motion);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_drop, (jint)lpStruct->drag_drop);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_received, (jint)lpStruct->drag_data_received);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.popup_menu, (jint)lpStruct->popup_menu);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show_help, (jint)lpStruct->show_help);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.get_accessible, (jint)lpStruct->get_accessible);
-- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.screen_changed, (jint)lpStruct->screen_changed);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed, (jlong)lpStruct->dispatch_child_properties_changed);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.show, (jlong)lpStruct->show);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.show_all, (jlong)lpStruct->show_all);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.hide, (jlong)lpStruct->hide);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.hide_all, (jlong)lpStruct->hide_all);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.map, (jlong)lpStruct->map);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.unmap, (jlong)lpStruct->unmap);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.realize, (jlong)lpStruct->realize);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.unrealize, (jlong)lpStruct->unrealize);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.size_request, (jlong)lpStruct->size_request);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.size_allocate, (jlong)lpStruct->size_allocate);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.state_changed, (jlong)lpStruct->state_changed);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.parent_set, (jlong)lpStruct->parent_set);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.hierarchy_changed, (jlong)lpStruct->hierarchy_changed);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.style_set, (jlong)lpStruct->style_set);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.direction_changed, (jlong)lpStruct->direction_changed);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.grab_notify, (jlong)lpStruct->grab_notify);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.child_notify, (jlong)lpStruct->child_notify);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.mnemonic_activate, (jlong)lpStruct->mnemonic_activate);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.grab_focus, (jlong)lpStruct->grab_focus);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.focus, (jlong)lpStruct->focus);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.event, (jlong)lpStruct->event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.button_press_event, (jlong)lpStruct->button_press_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.button_release_event, (jlong)lpStruct->button_release_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.scroll_event, (jlong)lpStruct->scroll_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.motion_notify_event, (jlong)lpStruct->motion_notify_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.delete_event, (jlong)lpStruct->delete_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.destroy_event, (jlong)lpStruct->destroy_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.expose_event, (jlong)lpStruct->expose_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.key_press_event, (jlong)lpStruct->key_press_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.key_release_event, (jlong)lpStruct->key_release_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.enter_notify_event, (jlong)lpStruct->enter_notify_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.leave_notify_event, (jlong)lpStruct->leave_notify_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.configure_event, (jlong)lpStruct->configure_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.focus_in_event, (jlong)lpStruct->focus_in_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.focus_out_event, (jlong)lpStruct->focus_out_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.map_event, (jlong)lpStruct->map_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.unmap_event, (jlong)lpStruct->unmap_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.property_notify_event, (jlong)lpStruct->property_notify_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.selection_clear_event, (jlong)lpStruct->selection_clear_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.selection_request_event, (jlong)lpStruct->selection_request_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.selection_notify_event, (jlong)lpStruct->selection_notify_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.proximity_in_event, (jlong)lpStruct->proximity_in_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.proximity_out_event, (jlong)lpStruct->proximity_out_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.visibility_notify_event, (jlong)lpStruct->visibility_notify_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.client_event, (jlong)lpStruct->client_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.no_expose_event, (jlong)lpStruct->no_expose_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.window_state_event, (jlong)lpStruct->window_state_event);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.selection_get, (jlong)lpStruct->selection_get);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.selection_received, (jlong)lpStruct->selection_received);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_begin, (jlong)lpStruct->drag_begin);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_end, (jlong)lpStruct->drag_end);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_data_get, (jlong)lpStruct->drag_data_get);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_data_delete, (jlong)lpStruct->drag_data_delete);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_leave, (jlong)lpStruct->drag_leave);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_motion, (jlong)lpStruct->drag_motion);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_drop, (jlong)lpStruct->drag_drop);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.drag_data_received, (jlong)lpStruct->drag_data_received);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.popup_menu, (jlong)lpStruct->popup_menu);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.show_help, (jlong)lpStruct->show_help);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.get_accessible, (jlong)lpStruct->get_accessible);
-+ (*env)->SetLongField(env, lpObject, GtkWidgetClassFc.screen_changed, (jlong)lpStruct->screen_changed);
- }
- #endif
-
-@@ -2077,7 +2077,7 @@
- {
- if (PangoAttributeFc.cached) return;
- PangoAttributeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", "I");
-+ PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", "J");
- PangoAttributeFc.start_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "start_index", "I");
- PangoAttributeFc.end_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "end_index", "I");
- PangoAttributeFc.cached = 1;
-@@ -2086,7 +2086,7 @@
- PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct)
- {
- if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject);
-- lpStruct->klass = (const PangoAttrClass *)(*env)->GetIntField(env, lpObject, PangoAttributeFc.klass);
-+ lpStruct->klass = (const PangoAttrClass *)(*env)->GetLongField(env, lpObject, PangoAttributeFc.klass);
- lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.start_index);
- lpStruct->end_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.end_index);
- return lpStruct;
-@@ -2095,7 +2095,7 @@
- void setPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct)
- {
- if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, PangoAttributeFc.klass, (jint)lpStruct->klass);
-+ (*env)->SetLongField(env, lpObject, PangoAttributeFc.klass, (jlong)lpStruct->klass);
- (*env)->SetIntField(env, lpObject, PangoAttributeFc.start_index, (jint)lpStruct->start_index);
- (*env)->SetIntField(env, lpObject, PangoAttributeFc.end_index, (jint)lpStruct->end_index);
- }
-@@ -2117,12 +2117,12 @@
- PangoItemFc.offset = (*env)->GetFieldID(env, PangoItemFc.clazz, "offset", "I");
- PangoItemFc.length = (*env)->GetFieldID(env, PangoItemFc.clazz, "length", "I");
- PangoItemFc.num_chars = (*env)->GetFieldID(env, PangoItemFc.clazz, "num_chars", "I");
-- PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", "I");
-- PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", "I");
-- PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", "I");
-+ PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", "J");
-+ PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", "J");
-+ PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", "J");
- PangoItemFc.analysis_level = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_level", "B");
-- PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", "I");
-- PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", "I");
-+ PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", "J");
-+ PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", "J");
- PangoItemFc.cached = 1;
- }
-
-@@ -2132,12 +2132,12 @@
- lpStruct->offset = (*env)->GetIntField(env, lpObject, PangoItemFc.offset);
- lpStruct->length = (*env)->GetIntField(env, lpObject, PangoItemFc.length);
- lpStruct->num_chars = (*env)->GetIntField(env, lpObject, PangoItemFc.num_chars);
-- lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_shape_engine);
-- lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_lang_engine);
-- lpStruct->analysis.font = (PangoFont *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_font);
-+ lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_shape_engine);
-+ lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_lang_engine);
-+ lpStruct->analysis.font = (PangoFont *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_font);
- lpStruct->analysis.level = (*env)->GetByteField(env, lpObject, PangoItemFc.analysis_level);
-- lpStruct->analysis.language = (PangoLanguage *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_language);
-- lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_extra_attrs);
-+ lpStruct->analysis.language = (PangoLanguage *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_language);
-+ lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetLongField(env, lpObject, PangoItemFc.analysis_extra_attrs);
- return lpStruct;
- }
-
-@@ -2147,12 +2147,12 @@
- (*env)->SetIntField(env, lpObject, PangoItemFc.offset, (jint)lpStruct->offset);
- (*env)->SetIntField(env, lpObject, PangoItemFc.length, (jint)lpStruct->length);
- (*env)->SetIntField(env, lpObject, PangoItemFc.num_chars, (jint)lpStruct->num_chars);
-- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_shape_engine, (jint)lpStruct->analysis.shape_engine);
-- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_lang_engine, (jint)lpStruct->analysis.lang_engine);
-- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_font, (jint)lpStruct->analysis.font);
-+ (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_shape_engine, (jlong)lpStruct->analysis.shape_engine);
-+ (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_lang_engine, (jlong)lpStruct->analysis.lang_engine);
-+ (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_font, (jlong)lpStruct->analysis.font);
- (*env)->SetByteField(env, lpObject, PangoItemFc.analysis_level, (jbyte)lpStruct->analysis.level);
-- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_language, (jint)lpStruct->analysis.language);
-- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jint)lpStruct->analysis.extra_attrs);
-+ (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_language, (jlong)lpStruct->analysis.language);
-+ (*env)->SetLongField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jlong)lpStruct->analysis.extra_attrs);
- }
- #endif
-
-@@ -2169,30 +2169,30 @@
- {
- if (PangoLayoutLineFc.cached) return;
- PangoLayoutLineFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", "I");
-+ PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", "J");
- PangoLayoutLineFc.start_index = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "start_index", "I");
- PangoLayoutLineFc.length = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "length", "I");
-- PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", "I");
-+ PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", "J");
- PangoLayoutLineFc.cached = 1;
- }
-
- PangoLayoutLine *getPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct)
- {
- if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject);
-- lpStruct->layout = (PangoLayout *)(*env)->GetIntField(env, lpObject, PangoLayoutLineFc.layout);
-+ lpStruct->layout = (PangoLayout *)(*env)->GetLongField(env, lpObject, PangoLayoutLineFc.layout);
- lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.start_index);
- lpStruct->length = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.length);
-- lpStruct->runs = (GSList *)(*env)->GetIntField(env, lpObject, PangoLayoutLineFc.runs);
-+ lpStruct->runs = (GSList *)(*env)->GetLongField(env, lpObject, PangoLayoutLineFc.runs);
- return lpStruct;
- }
-
- void setPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct)
- {
- if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.layout, (jint)lpStruct->layout);
-+ (*env)->SetLongField(env, lpObject, PangoLayoutLineFc.layout, (jlong)lpStruct->layout);
- (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.start_index, (jint)lpStruct->start_index);
- (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.length, (jint)lpStruct->length);
-- (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.runs, (jint)lpStruct->runs);
-+ (*env)->SetLongField(env, lpObject, PangoLayoutLineFc.runs, (jlong)lpStruct->runs);
- }
- #endif
-
-@@ -2209,24 +2209,24 @@
- {
- if (PangoLayoutRunFc.cached) return;
- PangoLayoutRunFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", "I");
-- PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", "I");
-+ PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", "J");
-+ PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", "J");
- PangoLayoutRunFc.cached = 1;
- }
-
- PangoLayoutRun *getPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct)
- {
- if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject);
-- lpStruct->item = (PangoItem *)(*env)->GetIntField(env, lpObject, PangoLayoutRunFc.item);
-- lpStruct->glyphs = (PangoGlyphString *)(*env)->GetIntField(env, lpObject, PangoLayoutRunFc.glyphs);
-+ lpStruct->item = (PangoItem *)(*env)->GetLongField(env, lpObject, PangoLayoutRunFc.item);
-+ lpStruct->glyphs = (PangoGlyphString *)(*env)->GetLongField(env, lpObject, PangoLayoutRunFc.glyphs);
- return lpStruct;
- }
-
- void setPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct)
- {
- if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject);
-- (*env)->SetIntField(env, lpObject, PangoLayoutRunFc.item, (jint)lpStruct->item);
-- (*env)->SetIntField(env, lpObject, PangoLayoutRunFc.glyphs, (jint)lpStruct->glyphs);
-+ (*env)->SetLongField(env, lpObject, PangoLayoutRunFc.item, (jlong)lpStruct->item);
-+ (*env)->SetLongField(env, lpObject, PangoLayoutRunFc.glyphs, (jlong)lpStruct->glyphs);
- }
- #endif
-
-@@ -2342,10 +2342,10 @@
- if (XAnyEventFc.cached) return;
- cacheXEventFields(env, lpObject);
- XAnyEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", "I");
-+ XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", "J");
- XAnyEventFc.send_event = (*env)->GetFieldID(env, XAnyEventFc.clazz, "send_event", "I");
-- XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", "I");
-- XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", "I");
-+ XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", "J");
-+ XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", "J");
- XAnyEventFc.cached = 1;
- }
-
-@@ -2353,10 +2353,10 @@
- {
- if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject);
- getXEventFields(env, lpObject, (XEvent *)lpStruct);
-- lpStruct->serial = (*env)->GetIntField(env, lpObject, XAnyEventFc.serial);
-+ lpStruct->serial = (*env)->GetLongField(env, lpObject, XAnyEventFc.serial);
- lpStruct->send_event = (*env)->GetIntField(env, lpObject, XAnyEventFc.send_event);
-- lpStruct->display = (Display *)(*env)->GetIntField(env, lpObject, XAnyEventFc.display);
-- lpStruct->window = (Window)(*env)->GetIntField(env, lpObject, XAnyEventFc.window);
-+ lpStruct->display = (Display *)(*env)->GetLongField(env, lpObject, XAnyEventFc.display);
-+ lpStruct->window = (Window)(*env)->GetLongField(env, lpObject, XAnyEventFc.window);
- return lpStruct;
- }
-
-@@ -2364,10 +2364,10 @@
- {
- if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject);
- setXEventFields(env, lpObject, (XEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, XAnyEventFc.serial, (jint)lpStruct->serial);
-+ (*env)->SetLongField(env, lpObject, XAnyEventFc.serial, (jlong)lpStruct->serial);
- (*env)->SetIntField(env, lpObject, XAnyEventFc.send_event, (jint)lpStruct->send_event);
-- (*env)->SetIntField(env, lpObject, XAnyEventFc.display, (jint)lpStruct->display);
-- (*env)->SetIntField(env, lpObject, XAnyEventFc.window, (jint)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, XAnyEventFc.display, (jlong)lpStruct->display);
-+ (*env)->SetLongField(env, lpObject, XAnyEventFc.window, (jlong)lpStruct->window);
- }
- #endif
-
-@@ -2446,13 +2446,13 @@
- if (XClientMessageEventFc.cached) return;
- XClientMessageEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
- XClientMessageEventFc.type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "type", "I");
-- XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", "I");
-+ XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", "J");
- XClientMessageEventFc.send_event = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "send_event", "Z");
-- XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", "I");
-- XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", "I");
-- XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", "I");
-+ XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", "J");
-+ XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", "J");
-+ XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", "J");
- XClientMessageEventFc.format = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "format", "I");
-- XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", "[I");
-+ XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", "[J");
- XClientMessageEventFc.cached = 1;
- }
-
-@@ -2460,15 +2460,15 @@
- {
- if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject);
- lpStruct->type = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.type);
-- lpStruct->serial = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.serial);
-+ lpStruct->serial = (*env)->GetLongField(env, lpObject, XClientMessageEventFc.serial);
- lpStruct->send_event = (*env)->GetBooleanField(env, lpObject, XClientMessageEventFc.send_event);
-- lpStruct->display = (Display *)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.display);
-- lpStruct->window = (Window)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.window);
-- lpStruct->message_type = (Atom)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.message_type);
-+ lpStruct->display = (Display *)(*env)->GetLongField(env, lpObject, XClientMessageEventFc.display);
-+ lpStruct->window = (Window)(*env)->GetLongField(env, lpObject, XClientMessageEventFc.window);
-+ lpStruct->message_type = (Atom)(*env)->GetLongField(env, lpObject, XClientMessageEventFc.message_type);
- lpStruct->format = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.format);
- {
-- jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-- (*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
-+ jlongArray lpObject1 = (jlongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-+ (*env)->GetLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 8, (jlong *)lpStruct->data.l);
- }
- return lpStruct;
- }
-@@ -2477,15 +2477,15 @@
- {
- if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.type, (jint)lpStruct->type);
-- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.serial, (jint)lpStruct->serial);
-+ (*env)->SetLongField(env, lpObject, XClientMessageEventFc.serial, (jlong)lpStruct->serial);
- (*env)->SetBooleanField(env, lpObject, XClientMessageEventFc.send_event, (jboolean)lpStruct->send_event);
-- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.display, (jint)lpStruct->display);
-- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.window, (jint)lpStruct->window);
-- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.message_type, (jint)lpStruct->message_type);
-+ (*env)->SetLongField(env, lpObject, XClientMessageEventFc.display, (jlong)lpStruct->display);
-+ (*env)->SetLongField(env, lpObject, XClientMessageEventFc.window, (jlong)lpStruct->window);
-+ (*env)->SetLongField(env, lpObject, XClientMessageEventFc.message_type, (jlong)lpStruct->message_type);
- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.format, (jint)lpStruct->format);
- {
-- jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-- (*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
-+ jlongArray lpObject1 = (jlongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
-+ (*env)->SetLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 8, (jlong *)lpStruct->data.l);
- }
- }
- #endif
-@@ -2504,8 +2504,8 @@
- if (XCrossingEventFc.cached) return;
- cacheXAnyEventFields(env, lpObject);
- XCrossingEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
-- XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", "I");
-- XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", "I");
-+ XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", "J");
-+ XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", "J");
- XCrossingEventFc.time = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "time", "I");
- XCrossingEventFc.x = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "x", "I");
- XCrossingEventFc.y = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "y", "I");
-@@ -2523,8 +2523,8 @@
- {
- if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
- getXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
-- lpStruct->root = (Window)(*env)->GetIntField(env, lpObject, XCrossingEventFc.root);
-- lpStruct->subwindow = (Window)(*env)->GetIntField(env, lpObject, XCrossingEventFc.subwindow);
-+ lpStruct->root = (Window)(*env)->GetLongField(env, lpObject, XCrossingEventFc.root);
-+ lpStruct->subwindow = (Window)(*env)->GetLongField(env, lpObject, XCrossingEventFc.subwindow);
- lpStruct->time = (Time)(*env)->GetIntField(env, lpObject, XCrossingEventFc.time);
- lpStruct->x = (*env)->GetIntField(env, lpObject, XCrossingEventFc.x);
- lpStruct->y = (*env)->GetIntField(env, lpObject, XCrossingEventFc.y);
-@@ -2542,8 +2542,8 @@
- {
- if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
- setXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
-- (*env)->SetIntField(env, lpObject, XCrossingEventFc.root, (jint)lpStruct->root);
-- (*env)->SetIntField(env, lpObject, XCrossingEventFc.subwindow, (jint)lpStruct->subwindow);
-+ (*env)->SetLongField(env, lpObject, XCrossingEventFc.root, (jlong)lpStruct->root);
-+ (*env)->SetLongField(env, lpObject, XCrossingEventFc.subwindow, (jlong)lpStruct->subwindow);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.time, (jint)lpStruct->time);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.x, (jint)lpStruct->x);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.y, (jint)lpStruct->y);
-@@ -2685,17 +2685,17 @@
- if (XRenderPictureAttributesFc.cached) return;
- XRenderPictureAttributesFc.clazz = (*env)->GetObjectClass(env, lpObject);
- XRenderPictureAttributesFc.repeat = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "repeat", "Z");
-- XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", "I");
-+ XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", "J");
- XRenderPictureAttributesFc.alpha_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_x_origin", "I");
- XRenderPictureAttributesFc.alpha_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_y_origin", "I");
- XRenderPictureAttributesFc.clip_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_x_origin", "I");
- XRenderPictureAttributesFc.clip_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_y_origin", "I");
-- XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", "I");
-+ XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", "J");
- XRenderPictureAttributesFc.graphics_exposures = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "graphics_exposures", "Z");
- XRenderPictureAttributesFc.subwindow_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "subwindow_mode", "I");
- XRenderPictureAttributesFc.poly_edge = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_edge", "I");
- XRenderPictureAttributesFc.poly_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_mode", "I");
-- XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", "I");
-+ XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", "J");
- XRenderPictureAttributesFc.component_alpha = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "component_alpha", "Z");
- XRenderPictureAttributesFc.cached = 1;
- }
-@@ -2704,17 +2704,17 @@
- {
- if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
- lpStruct->repeat = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat);
-- lpStruct->alpha_map = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
-+ lpStruct->alpha_map = (*env)->GetLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
- lpStruct->alpha_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin);
- lpStruct->alpha_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin);
- lpStruct->clip_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin);
- lpStruct->clip_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin);
-- lpStruct->clip_mask = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
-+ lpStruct->clip_mask = (*env)->GetLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
- lpStruct->graphics_exposures = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures);
- lpStruct->subwindow_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode);
- lpStruct->poly_edge = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge);
- lpStruct->poly_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode);
-- lpStruct->dither = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.dither);
-+ lpStruct->dither = (*env)->GetLongField(env, lpObject, XRenderPictureAttributesFc.dither);
- lpStruct->component_alpha = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha);
- return lpStruct;
- }
-@@ -2723,17 +2723,17 @@
- {
- if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
- (*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat, (jboolean)lpStruct->repeat);
-- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jint)lpStruct->alpha_map);
-+ (*env)->SetLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jlong)lpStruct->alpha_map);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin, (jint)lpStruct->alpha_x_origin);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin, (jint)lpStruct->alpha_y_origin);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin, (jint)lpStruct->clip_x_origin);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin, (jint)lpStruct->clip_y_origin);
-- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jint)lpStruct->clip_mask);
-+ (*env)->SetLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jlong)lpStruct->clip_mask);
- (*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures, (jboolean)lpStruct->graphics_exposures);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge, (jint)lpStruct->poly_edge);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode, (jint)lpStruct->poly_mode);
-- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.dither, (jint)lpStruct->dither);
-+ (*env)->SetLongField(env, lpObject, XRenderPictureAttributesFc.dither, (jlong)lpStruct->dither);
- (*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha, (jboolean)lpStruct->component_alpha);
- }
- #endif
-@@ -2790,7 +2790,7 @@
- XWindowChangesFc.width = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "width", "I");
- XWindowChangesFc.height = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "height", "I");
- XWindowChangesFc.border_width = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "border_width", "I");
-- XWindowChangesFc.sibling = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "sibling", "I");
-+ XWindowChangesFc.sibling = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "sibling", "J");
- XWindowChangesFc.stack_mode = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "stack_mode", "I");
- XWindowChangesFc.cached = 1;
- }
-@@ -2803,7 +2803,7 @@
- lpStruct->width = (*env)->GetIntField(env, lpObject, XWindowChangesFc.width);
- lpStruct->height = (*env)->GetIntField(env, lpObject, XWindowChangesFc.height);
- lpStruct->border_width = (*env)->GetIntField(env, lpObject, XWindowChangesFc.border_width);
-- lpStruct->sibling = (*env)->GetIntField(env, lpObject, XWindowChangesFc.sibling);
-+ lpStruct->sibling = (*env)->GetLongField(env, lpObject, XWindowChangesFc.sibling);
- lpStruct->stack_mode = (*env)->GetIntField(env, lpObject, XWindowChangesFc.stack_mode);
- return lpStruct;
- }
-@@ -2816,7 +2816,7 @@
- (*env)->SetIntField(env, lpObject, XWindowChangesFc.width, (jint)lpStruct->width);
- (*env)->SetIntField(env, lpObject, XWindowChangesFc.height, (jint)lpStruct->height);
- (*env)->SetIntField(env, lpObject, XWindowChangesFc.border_width, (jint)lpStruct->border_width);
-- (*env)->SetIntField(env, lpObject, XWindowChangesFc.sibling, (jint)lpStruct->sibling);
-+ (*env)->SetLongField(env, lpObject, XWindowChangesFc.sibling, (jlong)lpStruct->sibling);
- (*env)->SetIntField(env, lpObject, XWindowChangesFc.stack_mode, (jint)lpStruct->stack_mode);
- }
- #endif
-diff -ur x86/xpcom.cpp x86_64/xpcom.cpp
---- x86/xpcom.cpp 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcom.cpp 2009-02-11 17:53:48.000000000 -0500
-@@ -16,17 +16,17 @@
- #define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func
-
- #ifndef NO_Call
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(Call)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(Call)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
- {
- jbyte *lparg3=NULL;
- jint *lparg6=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, Call_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-- rc = (jint)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
-+ rc = (jlong)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
- fail:
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-@@ -36,43 +36,43 @@
- #endif
-
- #ifndef NO_NS_1GetComponentManager
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)(JNIEnv *env, jclass that, jintArray arg0);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)(JNIEnv *env, jclass that, jlongArray arg0);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)
-- (JNIEnv *env, jclass that, jintArray arg0)
-+ (JNIEnv *env, jclass that, jlongArray arg0)
- {
-- jint *lparg0=NULL;
-+ jlong *lparg0=NULL;
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentManager_FUNC);
-- if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
-+ if (arg0) if ((lparg0 = env->GetLongArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)NS_GetComponentManager((nsIComponentManager**)lparg0);
- fail:
-- if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
-+ if (arg0 && lparg0) env->ReleaseLongArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentManager_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_NS_1GetServiceManager
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)(JNIEnv *env, jclass that, jintArray arg0);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)(JNIEnv *env, jclass that, jlongArray arg0);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)
-- (JNIEnv *env, jclass that, jintArray arg0)
-+ (JNIEnv *env, jclass that, jlongArray arg0)
- {
-- jint *lparg0=NULL;
-+ jlong *lparg0=NULL;
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1GetServiceManager_FUNC);
-- if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
-+ if (arg0) if ((lparg0 = env->GetLongArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)NS_GetServiceManager((nsIServiceManager**)lparg0);
- fail:
-- if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
-+ if (arg0 && lparg0) env->ReleaseLongArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, NS_1GetServiceManager_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_NS_1InitXPCOM2
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1InitXPCOM2_FUNC);
-@@ -83,680 +83,680 @@
- #endif
-
- #ifndef NO_NS_1NewLocalFile
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+ (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlongArray arg2)
- {
-- jint *lparg2=NULL;
-+ jlong *lparg2=NULL;
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1NewLocalFile_FUNC);
-- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2);
- fail:
-- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, NS_1NewLocalFile_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+#ifndef NO_VtblCall__IJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint))(*(jint **)arg1)[arg0])(arg1);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong))(*(jlong **)arg1)[arg0])(arg1);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIF
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
-+#ifndef NO_VtblCall__IJF
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jfloat arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJF)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jfloat arg2)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIF_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat))(*(jint **)arg1)[arg0])(arg1, arg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIF_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJF_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jfloat))(*(jlong **)arg1)[arg0])(arg1, arg2);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJF_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
-+#ifndef NO_VtblCall__IJI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
-+#ifndef NO_VtblCall__IJII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
-+#ifndef NO_VtblCall__IJIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+#ifndef NO_VtblCall__IJIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+#ifndef NO_VtblCall__IJIIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-+#ifndef NO_VtblCall__IJIIIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIIIIIIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+#ifndef NO_VtblCall__IJIIIIIIIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIIIIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIIIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIIIIIIIIIIIISI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
-+#ifndef NO_VtblCall__IJIIIIIIIIIIIIISI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIIIIIIIIIISI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIIIIIIIIIISI_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIIIIIIIIIISI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIIIII_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
-+#ifndef NO_VtblCall__IJIIIIII_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIII_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
- {
- jchar *lparg8=NULL;
- jint *lparg9=NULL;
- jint *lparg10=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIII_3C_3I_3I_FUNC);
- if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
- if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
- if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
- fail:
- if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
- if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
- if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIII_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIIIJII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
-+#ifndef NO_VtblCall__IJIIIIJII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIIIJII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIJII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIJII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIIIJII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jlong, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIIIJII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIII_3CIIIII_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
-+#ifndef NO_VtblCall__IJIIII_3CIIIII_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3CIIIII_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
- {
- jchar *lparg6=NULL;
- jint *lparg12=NULL;
- jint *lparg13=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg12) if ((lparg12 = env->GetIntArrayElements(arg12, NULL)) == NULL) goto fail;
- if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
- fail:
- if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
- if (arg12 && lparg12) env->ReleaseIntArrayElements(arg12, lparg12, 0);
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIII_3C_3BIIIII_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
-+#ifndef NO_VtblCall__IJIIII_3C_3BIIIII_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3BIIIII_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
- {
- jchar *lparg6=NULL;
- jbyte *lparg7=NULL;
- jint *lparg13=NULL;
- jint *lparg14=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
- if (arg14) if ((lparg14 = env->GetIntArrayElements(arg14, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
- fail:
- if (arg14 && lparg14) env->ReleaseIntArrayElements(arg14, lparg14, 0);
- if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
- if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIII_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-+#ifndef NO_VtblCall__IJIIII_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
- {
- jchar *lparg6=NULL;
- jint *lparg7=NULL;
- jint *lparg8=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3C_3I_3I_FUNC);
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
- fail:
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIII_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
-+#ifndef NO_VtblCall__IJIIII_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIII_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
- {
- jint *lparg6=NULL;
- jint *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIII_3I_3I_FUNC);
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIII_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIII_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
-+#ifndef NO_VtblCall__IJIII_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
- {
- jchar *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIII_3C_FUNC);
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIII_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIII_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJIII_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIII_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
- {
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIII_3I_FUNC);
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIII_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIIJJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-+#ifndef NO_VtblCall__IJIIJJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIIJJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIJJJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIJJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIIJJJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIIJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
-+#ifndef NO_VtblCall__IJII_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jbyteArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jbyteArray arg4)
- {
- jbyte *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3B_FUNC);
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jbyte *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4)
-+#ifndef NO_VtblCall__IJII_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4)
- {
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3C_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3CIJI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
-+#ifndef NO_VtblCall__IJII_3CIJI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CIJI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
- {
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CIJI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3CIJI_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jchar *, jint, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CIJI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3CIJI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3CJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
-+#ifndef NO_VtblCall__IJII_3CJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3CJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
- {
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3CJJJ_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jchar *, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CJJJ_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3CJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3C_3CI_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
-+#ifndef NO_VtblCall__IJII_3C_3CI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3C_3CI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
- {
- jchar *lparg4=NULL;
- jchar *lparg5=NULL;
- jint *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3C_3CI_3I_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jchar *, jchar *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3C_3CI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJII_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jintArray arg4)
- {
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3I_FUNC);
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIII_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJII_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJII_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jint arg3, jlongArray arg4)
- {
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJII_3J_FUNC);
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJII_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIIJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4)
-+#ifndef NO_VtblCall__IJIJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJIJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jlong arg3, jlong arg4)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJIJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJIJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
-+#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3)
- {
- nsID _arg3, *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, nsID *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jobject arg3, jintArray arg4)
- {
- nsID _arg3, *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, nsID *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
-+#ifndef NO_VtblCall__IJI_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3)
- {
- jbyte *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jbyte *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3BI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
-+#ifndef NO_VtblCall__IJI_3BI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4)
- {
- jbyte *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3BI_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jbyte *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3BI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3BI_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJI_3BI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3BI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
- {
- jbyte *lparg3=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3BI_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jbyte *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3BI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3B_3B_3BI_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
-+#ifndef NO_VtblCall__IJI_3B_3B_3BI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3B_3BI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
- {
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
- jbyte *lparg5=NULL;
- jint *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_3B_3BI_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_3B_3BI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3B_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
-+#ifndef NO_VtblCall__IJI_3B_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
- {
- jbyte *lparg3=NULL;
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_3C_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jbyte *, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3B_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJI_3B_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3B_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
- {
- jbyte *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3B_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3B_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3)
-+#ifndef NO_VtblCall__IJI_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3)
- {
- jchar *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3CI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4)
-+#ifndef NO_VtblCall__IJI_3CI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3CI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jint arg4)
- {
- jchar *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3CI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3CI_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3CI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3CI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4)
-+#ifndef NO_VtblCall__IJI_3C_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
-+#ifndef NO_VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -767,7 +767,7 @@
- jint *lparg10=NULL;
- jint *lparg11=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-@@ -776,7 +776,7 @@
- if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
- if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
- if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
- fail:
- if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
- if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
-@@ -786,15 +786,15 @@
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3CI_3I_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
-+#ifndef NO_VtblCall__IJI_3C_3CI_3I_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3CI_3I_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -802,54 +802,54 @@
- jint *lparg7=NULL;
- jint *lparg8=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
- fail:
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3C_3C_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
-+#ifndef NO_VtblCall__IJI_3C_3C_3C_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jchar *lparg5=NULL;
- jint *lparg6=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3C_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jchar *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
- fail:
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3C_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3C_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
-+#ifndef NO_VtblCall__IJI_3C_3C_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -857,51 +857,51 @@
- jint *lparg6=NULL;
- jint *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3C_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJI_3C_3C_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3C_3I_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-+#ifndef NO_VtblCall__IJI_3C_3C_3I_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -910,14 +910,14 @@
- jint *lparg7=NULL;
- jint *lparg8=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
- fail:
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-@@ -925,15 +925,15 @@
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3C_3C_3I_3I_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
-+#ifndef NO_VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -943,7 +943,7 @@
- jint *lparg8=NULL;
- jint *lparg9=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-@@ -951,7 +951,7 @@
- if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
- fail:
- if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-@@ -960,658 +960,658 @@
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
-+#ifndef NO_VtblCall__IJI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3)
- {
- jint *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__III_3I_3I_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
-+#ifndef NO_VtblCall__IJI_3I_3I_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJI_3I_3I_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
- {
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint *lparg5=NULL;
- jint *lparg6=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint, jint *, jint *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
- fail:
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJI_3I_3I_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2)
-+#ifndef NO_VtblCall__IJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3)
-+#ifndef NO_VtblCall__IJJI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJI_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJIIJIIIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
-+#ifndef NO_VtblCall__IJJIIJIIIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJIIJIIIIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJIIJIIIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJIIJIIIIIIIIISJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
-+#ifndef NO_VtblCall__IJJIIJIIIIIIIIISJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJIIIIIIIIISJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJIIJ_3I_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
-+#ifndef NO_VtblCall__IJJIIJ_3I_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJIIJ_3I_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
- {
- jint *lparg6=NULL;
- jlong *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJIIJ_3I_3J_FUNC);
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jint, jlong, jint *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJIIJ_3I_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJI_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJJI_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJI_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jint arg3, jlongArray arg4)
- {
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJI_3J_FUNC);
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJI_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3)
-+#ifndef NO_VtblCall__IJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4)
-+#ifndef NO_VtblCall__IJJJI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJI_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
-+#ifndef NO_VtblCall__IJJJII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
-+#ifndef NO_VtblCall__IJJJIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIIII_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJIIII_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJIJ_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-+#ifndef NO_VtblCall__IJJJIJ_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJIJ_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
- {
- jchar *lparg6=NULL;
- jint *lparg7=NULL;
- jint *lparg8=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJIJ_3C_3I_3I_FUNC);
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
- fail:
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJIJ_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJI_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
-+#ifndef NO_VtblCall__IJJJI_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
- {
- jchar *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJI_3C_FUNC);
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJI_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJI_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJJJI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
- {
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJI_3I_FUNC);
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4)
-+#ifndef NO_VtblCall__IJJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
-+#ifndef NO_VtblCall__IJJJJI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJI_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJI_3CJJIJI_3J_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
-+#ifndef NO_VtblCall__IJJJJI_3CJJIJI_3J_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3CJJIJI_3J_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
- {
- jchar *lparg6=NULL;
- jlong *lparg12=NULL;
- jlong *lparg13=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg12) if ((lparg12 = env->GetLongArrayElements(arg12, NULL)) == NULL) goto fail;
- if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
- fail:
- if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
- if (arg12 && lparg12) env->ReleaseLongArrayElements(arg12, lparg12, 0);
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
-+#ifndef NO_VtblCall__IJJJJI_3C_3BJJIJI_3J_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
- {
- jchar *lparg6=NULL;
- jbyte *lparg7=NULL;
- jlong *lparg13=NULL;
- jlong *lparg14=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
- if (arg14) if ((lparg14 = env->GetLongArrayElements(arg14, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
- fail:
- if (arg14 && lparg14) env->ReleaseLongArrayElements(arg14, lparg14, 0);
- if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
- if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJJIJ_3C_3I_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
-+#ifndef NO_VtblCall__IJJJJJIJ_3C_3I_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJIJ_3C_3I_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
- {
- jchar *lparg8=NULL;
- jint *lparg9=NULL;
- jlong *lparg10=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
- if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
- if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
- if (arg10) if ((lparg10 = env->GetLongArrayElements(arg10, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
- fail:
- if (arg10 && lparg10) env->ReleaseLongArrayElements(arg10, lparg10, 0);
- if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
- if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
-+#ifndef NO_VtblCall__IJJJJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-+#ifndef NO_VtblCall__IJJJJJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJJJJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
-+#ifndef NO_VtblCall__IJJJJJJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJJJJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
- {
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJJ_FUNC);
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJJJJJJ_FUNC);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJJJJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJ_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4)
-+#ifndef NO_VtblCall__IJJJ_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
- {
- jbyte *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3B_FUNC);
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jbyte *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJ_3CIJI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
-+#ifndef NO_VtblCall__IJJJ_3CIJI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CIJI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
- {
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CIJI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3CIJI_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jchar *, jint, jlong, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CIJI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3CIJI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJ_3CJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
-+#ifndef NO_VtblCall__IJJJ_3CJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3CJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
- {
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3CJJJ_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3CJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJ_3C_3CI_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
-+#ifndef NO_VtblCall__IJJJ_3C_3CI_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3C_3CI_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
- {
- jchar *lparg4=NULL;
- jchar *lparg5=NULL;
- jlong *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3C_3CI_3J_FUNC);
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3C_3CI_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJJ_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJJJ_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJJ_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlong arg3, jintArray arg4)
- {
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJJ_3I_FUNC);
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJJ_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3)
-+#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3)
- {
- nsID _arg3, *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, nsID *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jobject arg3, jlongArray arg4)
- {
- nsID _arg3, *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, nsID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3)
-+#ifndef NO_VtblCall__IJJ_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3)
- {
- jbyte *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3B_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jbyte *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3BI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4)
-+#ifndef NO_VtblCall__IJJ_3BI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jint arg4)
- {
- jbyte *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3BI_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jbyte *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3BI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3BJ_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
-+#ifndef NO_VtblCall__IJJ_3BJ_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3BJ_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
- {
- jbyte *lparg3=NULL;
- jlong *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3BJ_3J_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jbyte *, jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3BJ_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3B_3B_3BJ_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
-+#ifndef NO_VtblCall__IJJ_3B_3B_3BJ_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3B_3BJ_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
- {
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
- jbyte *lparg5=NULL;
- jlong *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
- if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3B_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
-+#ifndef NO_VtblCall__IJJ_3B_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3B_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
- {
- jbyte *lparg3=NULL;
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3B_3C_FUNC);
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jbyte *, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3B_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3CI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4)
-+#ifndef NO_VtblCall__IJJ_3CI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3CI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jint arg4)
- {
- jchar *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3CI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3CI_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jint))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3CI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3CI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
-+#ifndef NO_VtblCall__IJJ_3C_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
-+#ifndef NO_VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -1622,7 +1622,7 @@
- jint *lparg10=NULL;
- jint *lparg11=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
-@@ -1631,7 +1631,7 @@
- if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
- if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
- if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
- fail:
- if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
- if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
-@@ -1641,15 +1641,15 @@
- if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3CI_3J_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
-+#ifndef NO_VtblCall__IJJ_3C_3CI_3J_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3CI_3J_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -1657,54 +1657,54 @@
- jint *lparg7=NULL;
- jint *lparg8=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
- fail:
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
-+#ifndef NO_VtblCall__IJJ_3C_3C_3C_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jchar *lparg5=NULL;
- jint *lparg6=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3C_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jchar *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
- fail:
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3C_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
-+#ifndef NO_VtblCall__IJJ_3C_3C_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -1712,74 +1712,74 @@
- jint *lparg6=NULL;
- jint *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJJ_3C_3C_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
-+#ifndef NO_VtblCall__IJJ_3C_3C_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
- jlong *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3J_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C_3J_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
-+#ifndef NO_VtblCall__IJJ_3C_3C_3J_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -1788,14 +1788,14 @@
- jint *lparg7=NULL;
- jint *lparg8=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
- fail:
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
-@@ -1803,15 +1803,15 @@
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
-+#ifndef NO_VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
- {
- jchar *lparg3=NULL;
- jchar *lparg4=NULL;
-@@ -1821,7 +1821,7 @@
- jint *lparg8=NULL;
- jint *lparg9=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-@@ -1829,7 +1829,7 @@
- if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
- if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
- fail:
- if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
- if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
-@@ -1838,198 +1838,198 @@
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3)
-+#ifndef NO_VtblCall__IJJ_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jintArray arg3)
- {
- jint *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3I_FUNC);
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IIJ_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3)
-+#ifndef NO_VtblCall__IJJ_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlongArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJJ_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlong arg2, jlongArray arg3)
- {
- jlong *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJJ_3J_FUNC);
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, arg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJJ_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3)
- {
- nsID _arg2, *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3);
- fail:
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
- {
- nsID _arg2, *lparg2=NULL;
- nsID _arg4, *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jint, nsID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3)
- {
- nsID _arg2, *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3);
- fail:
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
- {
- nsID _arg2, *lparg2=NULL;
- nsID _arg4, *lparg4=NULL;
- jlong *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jlong, nsID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jintArray arg4)
- {
- nsID _arg2, *lparg2=NULL;
- nsID _arg3, *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, nsID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jobject arg3, jlongArray arg4)
- {
- nsID _arg2, *lparg2=NULL;
- nsID _arg3, *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, nsID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
- {
- nsID _arg2, *lparg2=NULL;
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jbyte *, jbyte *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
- fail:
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
- {
- nsID _arg2, *lparg2=NULL;
- jbyte *lparg3=NULL;
-@@ -2037,51 +2037,51 @@
- jbyte *lparg6=NULL;
- jbyte *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
- {
- nsID _arg2, *lparg2=NULL;
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jbyte *, jbyte *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
- fail:
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
- {
- nsID _arg2, *lparg2=NULL;
- jbyte *lparg3=NULL;
-@@ -2089,939 +2089,939 @@
- jbyte *lparg6=NULL;
- jbyte *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
- if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jintArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jintArray arg3)
- {
- nsID _arg2, *lparg2=NULL;
- jint *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3)
-+#ifndef NO_VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlongArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jobject arg2, jlongArray arg3)
- {
- nsID _arg2, *lparg2=NULL;
- jlong *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, nsID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
-+#ifndef NO_VtblCall__IJ_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2)
- {
- jbyte *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *))(*(jlong **)arg1)[arg0])(arg1, lparg2);
- fail:
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
-+#ifndef NO_VtblCall__IJ_3BI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3)
- {
- jbyte *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3);
- fail:
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BII_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
-+#ifndef NO_VtblCall__IJ_3BII_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BII_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
- {
- jbyte *lparg2=NULL;
- jint *lparg5=NULL;
- jint *lparg6=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BII_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BII_3I_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
- fail:
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BII_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BII_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BIJ_3J_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
-+#ifndef NO_VtblCall__IJ_3BIJ_3J_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BIJ_3J_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
- {
- jbyte *lparg2=NULL;
- jlong *lparg5=NULL;
- jint *lparg6=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BIJ_3J_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
- if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint, jlong, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
- fail:
- if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BIJ_3J_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
- {
- jbyte *lparg2=NULL;
- nsID _arg4, *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint, nsID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BI_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3BI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
- {
- jbyte *lparg2=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BI_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJ_3BI_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
- {
- jbyte *lparg2=NULL;
- jint *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_3I_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BI_3J_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJ_3BI_3J_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BI_3J_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
- {
- jbyte *lparg2=NULL;
- jlong *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3J_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BI_3J_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3J_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BI_3J_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3)
-+#ifndef NO_VtblCall__IJ_3BJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlong arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlong arg3)
- {
- jbyte *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BJ_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3);
- fail:
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJ_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
-+#ifndef NO_VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
- {
- jbyte *lparg2=NULL;
- nsID _arg4, *lparg4=NULL;
- jlong *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jlong, nsID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4)
-+#ifndef NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jint arg4)
- {
- jbyte *lparg2=NULL;
- nsID _arg3, *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, nsID *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4)
-+#ifndef NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
- {
- jbyte *lparg2=NULL;
- nsID _arg3, *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, nsID *, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
- {
- jbyte *lparg2=NULL;
- nsID _arg3, *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, nsID *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
- {
- jbyte *lparg2=NULL;
- nsID _arg3, *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, nsID *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3B
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
-+#ifndef NO_VtblCall__IJ_3B_3B
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jbyte *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3BI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
-+#ifndef NO_VtblCall__IJ_3B_3BI
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3BI)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3BI_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3BI_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jbyte *, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
- fail:
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3BI_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3BI_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3B_3BII_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
-+#ifndef NO_VtblCall__IJ_3B_3B_3BII_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
- jint *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3BII_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3BII_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3B_3BII_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
-+#ifndef NO_VtblCall__IJ_3B_3B_3BII_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3BII_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jbyte *lparg4=NULL;
- jlong *lparg7=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3BII_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
- fail:
- if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
- if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3BII_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3B_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3B_3B_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3B_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJ_3B_3B_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3B_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
- {
- jbyte *lparg2=NULL;
- jbyte *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3B_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jbyte *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3B_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3)
-+#ifndef NO_VtblCall__IJ_3B_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3)
- {
- jbyte *lparg2=NULL;
- jint *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3B_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
- {
- jbyte *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3I_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJ_3B_3I_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3I_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
- {
- jbyte *lparg2=NULL;
- jint *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3I_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jint *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3I_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3)
-+#ifndef NO_VtblCall__IJ_3B_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlongArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlongArray arg3)
- {
- jbyte *lparg2=NULL;
- jlong *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3B_3J_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3B_3J_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3B_3J_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
- {
- jbyte *lparg2=NULL;
- jlong *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3B_3J_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jbyte *, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3B_3J_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
-+#ifndef NO_VtblCall__IJ_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2)
- {
- jchar *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_FUNC);
- if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *))(*(jlong **)arg1)[arg0])(arg1, lparg2);
- fail:
- if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3CIIII
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
-+#ifndef NO_VtblCall__IJ_3CIIII
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIIII)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
- {
- jchar *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIIII_FUNC);
- if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint, jint, jint))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
- fail:
- if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIIII_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3CIJJJ
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
-+#ifndef NO_VtblCall__IJ_3CIJJJ
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CIJJJ)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
- {
- jchar *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIJJJ_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CIJJJ_FUNC);
- if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jlong, jlong, jlong))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
- fail:
- if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIJJJ_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CIJJJ_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3CI_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3CI_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CI_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jint arg3, jintArray arg4)
- {
- jchar *lparg2=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CI_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CI_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jint, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CI_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CI_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3CJ_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJ_3CJ_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3CJ_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
- {
- jchar *lparg2=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CJ_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3CJ_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CJ_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3CJ_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3C_3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3)
-+#ifndef NO_VtblCall__IJ_3C_3C
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jcharArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3C_3C)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jcharArray arg2, jcharArray arg3)
- {
- jchar *lparg2=NULL;
- jchar *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3C_3C_FUNC);
- if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jchar *, jchar *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3C_3C_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3F
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2)
-+#ifndef NO_VtblCall__IJ_3F
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jfloatArray arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3F)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jfloatArray arg2)
- {
- jfloat *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3F_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3F_FUNC);
- if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jfloat *))(*(jlong **)arg1)[arg0])(arg1, lparg2);
- fail:
- if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3F_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3F_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
-+#ifndef NO_VtblCall__IJ_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2)
- {
- jint *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2);
- fail:
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
-+#ifndef NO_VtblCall__IJ_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jintArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jintArray arg3)
- {
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3I_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
- {
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3I_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I_3I_3I_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
-+#ifndef NO_VtblCall__IJ_3I_3I_3I_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3I_3I_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
- {
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint *lparg5=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3I_3I_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jint *, jint *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
- fail:
- if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3I_3I_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3)
-+#ifndef NO_VtblCall__IJ_3I_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jlongArray arg3);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jlongArray arg3)
- {
- jint *lparg2=NULL;
- jlong *lparg3=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3);
- fail:
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I_3J_3I
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
-+#ifndef NO_VtblCall__IJ_3I_3J_3I
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3I)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
- {
- jint *lparg2=NULL;
- jlong *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3J_3I_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jlong *, jint *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3J_3I_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3I_3J_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJ_3I_3J_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3I_3J_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
- {
- jint *lparg2=NULL;
- jlong *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3I_3J_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jint *, jlong *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3I_3J_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
-+#ifndef NO_VtblCall__IJ_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2)
- {
- jlong *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2);
- fail:
- if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3J_3J_3J
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
-+#ifndef NO_VtblCall__IJ_3J_3J_3J
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3J_3J_3J)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
- {
- jlong *lparg2=NULL;
- jlong *lparg3=NULL;
- jlong *lparg4=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_3J_3J_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3J_3J_3J_FUNC);
- if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
- if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jlong *, jlong *, jlong *))(*(jlong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
- fail:
- if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_3J_3J_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3J_3J_3J_FUNC);
- return rc;
- }
- #endif
-
--#ifndef NO_VtblCall__II_3S
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2)
-+#ifndef NO_VtblCall__IJ_3S
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jlong arg1, jshortArray arg2);
-+JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IJ_3S)
-+ (JNIEnv *env, jclass that, jint arg0, jlong arg1, jshortArray arg2)
- {
- jshort *lparg2=NULL;
- jint rc = 0;
-- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3S_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, VtblCall__IJ_3S_FUNC);
- if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
-- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort *))(*(jint **)arg1)[arg0])(arg1, lparg2);
-+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jlong, jshort *))(*(jlong **)arg1)[arg0])(arg1, lparg2);
- fail:
- if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
-- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3S_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, VtblCall__IJ_3S_FUNC);
- return rc;
- }
- #endif
-@@ -3056,40 +3056,40 @@
- }
- #endif
-
--#ifndef NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I
--extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
--JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)
-- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-+#ifndef NO_memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I
-+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2);
-+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)
-+ (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
- {
- nsID _arg1, *lparg1=NULL;
-- XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- if (arg1) if ((lparg1 = getnsIDFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
- fail:
- if (arg1 && lparg1) setnsIDFields(env, arg1, lparg1);
-- XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- }
- #endif
-
--#ifndef NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II
--extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2);
--JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
-+#ifndef NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI
-+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2);
-+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)
-+ (JNIEnv *env, jclass that, jobject arg0, jlong arg1, jint arg2)
- {
- nsID _arg0, *lparg0=NULL;
-- XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
-+ XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
- if (arg0) if ((lparg0 = getnsIDFields(env, arg0, &_arg0)) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- fail:
- if (arg0 && lparg0) setnsIDFields(env, arg0, lparg0);
-- XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
-+ XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
- }
- #endif
-
- #ifndef NO_nsEmbedCString_1Length
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)(JNIEnv *env, jclass that, jint arg0);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)(JNIEnv *env, jclass that, jlong arg0);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1Length_FUNC);
-@@ -3100,9 +3100,9 @@
- #endif
-
- #ifndef NO_nsEmbedCString_1delete
--extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)(JNIEnv *env, jclass that, jint arg0);
-+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)(JNIEnv *env, jclass that, jlong arg0);
- JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1delete_FUNC);
- delete (nsEmbedCString *)arg0;
-@@ -3111,54 +3111,54 @@
- #endif
-
- #ifndef NO_nsEmbedCString_1get
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)(JNIEnv *env, jclass that, jint arg0);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)
-- (JNIEnv *env, jclass that, jint arg0)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1get)(JNIEnv *env, jclass that, jlong arg0);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1get)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
-- rc = (jint)((nsEmbedCString *)arg0)->get();
-+ rc = (jlong)((nsEmbedCString *)arg0)->get();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_nsEmbedCString_1new__
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)(JNIEnv *env, jclass that);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)(JNIEnv *env, jclass that);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
-- rc = (jint)new nsEmbedCString();
-+ rc = (jlong)new nsEmbedCString();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_nsEmbedCString_1new__II
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new__II_FUNC);
-- rc = (jint)new nsEmbedCString((const char *)arg0, arg1);
-+ rc = (jlong)new nsEmbedCString((const char *)arg0, arg1);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new__II_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_nsEmbedCString_1new___3BI
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
- {
- jbyte *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
- if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-- rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
-+ rc = (jlong)new nsEmbedCString((const char *)lparg0, arg1);
- fail:
- if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
-@@ -3167,9 +3167,9 @@
- #endif
-
- #ifndef NO_nsEmbedString_1Length
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)(JNIEnv *env, jclass that, jint arg0);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)(JNIEnv *env, jclass that, jlong arg0);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
-@@ -3180,9 +3180,9 @@
- #endif
-
- #ifndef NO_nsEmbedString_1delete
--extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)(JNIEnv *env, jclass that, jint arg0);
-+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)(JNIEnv *env, jclass that, jlong arg0);
- JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1delete_FUNC);
- delete (nsEmbedString *)arg0;
-@@ -3191,41 +3191,41 @@
- #endif
-
- #ifndef NO_nsEmbedString_1get
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)(JNIEnv *env, jclass that, jint arg0);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)
-- (JNIEnv *env, jclass that, jint arg0)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedString_1get)(JNIEnv *env, jclass that, jlong arg0);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedString_1get)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
-- rc = (jint)((nsEmbedString *)arg0)->get();
-+ rc = (jlong)((nsEmbedString *)arg0)->get();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_nsEmbedString_1new__
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)(JNIEnv *env, jclass that);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedString_1new__)(JNIEnv *env, jclass that);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedString_1new__)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
-- rc = (jint)new nsEmbedString();
-+ rc = (jlong)new nsEmbedString();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
- return rc;
- }
- #endif
-
- #ifndef NO_nsEmbedString_1new___3C
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)
- (JNIEnv *env, jclass that, jcharArray arg0)
- {
- jchar *lparg0=NULL;
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
- if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
-- rc = (jint)new nsEmbedString((PRUnichar *)lparg0);
-+ rc = (jlong)new nsEmbedString((PRUnichar *)lparg0);
- fail:
- if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
-@@ -3234,9 +3234,9 @@
- #endif
-
- #ifndef NO_nsID_1Equals
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)(JNIEnv *env, jclass that, jlong arg0, jlong arg1);
- JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)
-- (JNIEnv *env, jclass that, jint arg0, jint arg1)
-+ (JNIEnv *env, jclass that, jlong arg0, jlong arg1)
- {
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
-@@ -3247,9 +3247,9 @@
- #endif
-
- #ifndef NO_nsID_1delete
--extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jint arg0);
-+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jlong arg0);
- JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)
-- (JNIEnv *env, jclass that, jint arg0)
-+ (JNIEnv *env, jclass that, jlong arg0)
- {
- XPCOM_NATIVE_ENTER(env, that, nsID_1delete_FUNC);
- delete (nsID *)arg0;
-@@ -3258,13 +3258,13 @@
- #endif
-
- #ifndef NO_nsID_1new
--extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)(JNIEnv *env, jclass that);
--JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)
-+extern "C" JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsID_1new)(JNIEnv *env, jclass that);
-+JNIEXPORT jlong JNICALL XPCOM_NATIVE(nsID_1new)
- (JNIEnv *env, jclass that)
- {
-- jint rc = 0;
-+ jlong rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
-- rc = (jint)new nsID();
-+ rc = (jlong)new nsID();
- XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
- return rc;
- }
-diff -ur x86/xpcominit.cpp x86_64/xpcominit.cpp
---- x86/xpcominit.cpp 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcominit.cpp 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -29,9 +29,9 @@
- #endif
-
- #ifndef NO_GRE_1GetGREPathWithProperties
--extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jint arg5);
- JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)
-- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jlong arg2, jint arg3, jlong arg4, jint arg5)
- {
- GREVersionRange _arg0, *lparg0=NULL;
- jint rc = 0;
-diff -ur x86/xpcominit_stats.cpp x86_64/xpcominit_stats.cpp
---- x86/xpcominit_stats.cpp 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcominit_stats.cpp 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/xpcominit_stats.h x86_64/xpcominit_stats.h
---- x86/xpcominit_stats.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcominit_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/xpcominit_structs.cpp x86_64/xpcominit_structs.cpp
---- x86/xpcominit_structs.cpp 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcominit_structs.cpp 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-@@ -25,9 +25,9 @@
- {
- if (GREVersionRangeFc.cached) return;
- GREVersionRangeFc.clazz = env->GetObjectClass(lpObject);
-- GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", "I");
-+ GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", "J");
- GREVersionRangeFc.lowerInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "lowerInclusive", "Z");
-- GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", "I");
-+ GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", "J");
- GREVersionRangeFc.upperInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "upperInclusive", "Z");
- GREVersionRangeFc.cached = 1;
- }
-@@ -35,9 +35,9 @@
- GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
- {
- if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
-- lpStruct->lower = (const char *)env->GetIntField(lpObject, GREVersionRangeFc.lower);
-+ lpStruct->lower = (const char *)env->GetLongField(lpObject, GREVersionRangeFc.lower);
- lpStruct->lowerInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive);
-- lpStruct->upper = (const char *)env->GetIntField(lpObject, GREVersionRangeFc.upper);
-+ lpStruct->upper = (const char *)env->GetLongField(lpObject, GREVersionRangeFc.upper);
- lpStruct->upperInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.upperInclusive);
- return lpStruct;
- }
-@@ -45,9 +45,9 @@
- void setGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
- {
- if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
-- env->SetIntField(lpObject, GREVersionRangeFc.lower, (jint)lpStruct->lower);
-+ env->SetLongField(lpObject, GREVersionRangeFc.lower, (jlong)lpStruct->lower);
- env->SetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive, (jboolean)lpStruct->lowerInclusive);
-- env->SetIntField(lpObject, GREVersionRangeFc.upper, (jint)lpStruct->upper);
-+ env->SetLongField(lpObject, GREVersionRangeFc.upper, (jlong)lpStruct->upper);
- env->SetBooleanField(lpObject, GREVersionRangeFc.upperInclusive, (jboolean)lpStruct->upperInclusive);
- }
- #endif
-diff -ur x86/xpcominit_structs.h x86_64/xpcominit_structs.h
---- x86/xpcominit_structs.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcominit_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/xpcom_stats.cpp x86_64/xpcom_stats.cpp
---- x86/xpcom_stats.cpp 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcom_stats.cpp 2009-02-11 17:53:48.000000000 -0500
-@@ -22,156 +22,156 @@
- "NS_1GetServiceManager",
- "NS_1InitXPCOM2",
- "NS_1NewLocalFile",
-- "VtblCall__II",
-- "VtblCall__IIF",
-- "VtblCall__III",
-- "VtblCall__IIII",
-- "VtblCall__IIIII",
-- "VtblCall__IIIIII",
-- "VtblCall__IIIIIII",
-- "VtblCall__IIIIIIII",
-- "VtblCall__IIIIIIIIIIII",
-- "VtblCall__IIIIIIIIIIIIIIISI",
-- "VtblCall__IIIIIIII_3C_3I_3I",
-- "VtblCall__IIIIIIJII",
-- "VtblCall__IIIIII_3CIIIII_3I_3I",
-- "VtblCall__IIIIII_3C_3BIIIII_3I_3I",
-- "VtblCall__IIIIII_3C_3I_3I",
-- "VtblCall__IIIIII_3I_3I",
-- "VtblCall__IIIII_3C",
-- "VtblCall__IIIII_3I",
-- "VtblCall__IIIIJJJJ",
-- "VtblCall__IIII_3B",
-- "VtblCall__IIII_3C",
-- "VtblCall__IIII_3CIJI",
-- "VtblCall__IIII_3CJJJ",
-- "VtblCall__IIII_3C_3CI_3I",
-- "VtblCall__IIII_3I",
-- "VtblCall__IIII_3J",
-- "VtblCall__IIIJJ",
-- "VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
-- "VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-- "VtblCall__III_3B",
-- "VtblCall__III_3BI",
-- "VtblCall__III_3BI_3I",
-- "VtblCall__III_3B_3B_3BI_3I",
-- "VtblCall__III_3B_3C",
-- "VtblCall__III_3B_3I",
-- "VtblCall__III_3C",
-- "VtblCall__III_3CI",
-- "VtblCall__III_3C_3C",
-- "VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
-- "VtblCall__III_3C_3CI_3I_3I_3I",
-- "VtblCall__III_3C_3C_3C_3I",
-- "VtblCall__III_3C_3C_3C_3I_3I",
-- "VtblCall__III_3C_3C_3I",
-- "VtblCall__III_3C_3C_3I_3C_3I_3I",
-- "VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
-- "VtblCall__III_3I",
-- "VtblCall__III_3I_3I_3I_3I",
-- "VtblCall__IIJ",
-- "VtblCall__IIJI",
-- "VtblCall__IIJIIJIIIIII",
-- "VtblCall__IIJIIJIIIIIIIIISJ",
-- "VtblCall__IIJIIJ_3I_3J",
-- "VtblCall__IIJI_3J",
-- "VtblCall__IIJJ",
-- "VtblCall__IIJJI",
-- "VtblCall__IIJJII",
-- "VtblCall__IIJJIIII",
-- "VtblCall__IIJJIJ_3C_3I_3I",
-- "VtblCall__IIJJI_3C",
-- "VtblCall__IIJJI_3I",
-- "VtblCall__IIJJJ",
-- "VtblCall__IIJJJI",
-- "VtblCall__IIJJJI_3CJJIJI_3J_3J",
-- "VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
-- "VtblCall__IIJJJJIJ_3C_3I_3J",
-- "VtblCall__IIJJJJJ",
-- "VtblCall__IIJJJJJJ",
-- "VtblCall__IIJJJJJJJ",
-- "VtblCall__IIJJ_3B",
-- "VtblCall__IIJJ_3CIJI",
-- "VtblCall__IIJJ_3CJJJ",
-- "VtblCall__IIJJ_3C_3CI_3J",
-- "VtblCall__IIJJ_3I",
-- "VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
-- "VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-- "VtblCall__IIJ_3B",
-- "VtblCall__IIJ_3BI",
-- "VtblCall__IIJ_3BJ_3J",
-- "VtblCall__IIJ_3B_3B_3BJ_3J",
-- "VtblCall__IIJ_3B_3C",
-- "VtblCall__IIJ_3CI",
-- "VtblCall__IIJ_3C_3C",
-- "VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
-- "VtblCall__IIJ_3C_3CI_3J_3I_3I",
-- "VtblCall__IIJ_3C_3C_3C_3I",
-- "VtblCall__IIJ_3C_3C_3C_3I_3I",
-- "VtblCall__IIJ_3C_3C_3I",
-- "VtblCall__IIJ_3C_3C_3J",
-- "VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
-- "VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
-- "VtblCall__IIJ_3I",
-- "VtblCall__IIJ_3J",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-- "VtblCall__II_3B",
-- "VtblCall__II_3BI",
-- "VtblCall__II_3BII_3I_3I",
-- "VtblCall__II_3BIJ_3J_3I",
-- "VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-- "VtblCall__II_3BI_3I",
-- "VtblCall__II_3BI_3I_3I",
-- "VtblCall__II_3BI_3J_3I",
-- "VtblCall__II_3BJ",
-- "VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
-- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
-- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-- "VtblCall__II_3B_3B",
-- "VtblCall__II_3B_3BI",
-- "VtblCall__II_3B_3B_3BII_3I",
-- "VtblCall__II_3B_3B_3BII_3J",
-- "VtblCall__II_3B_3B_3I",
-- "VtblCall__II_3B_3B_3J",
-- "VtblCall__II_3B_3I",
-- "VtblCall__II_3B_3I_3I",
-- "VtblCall__II_3B_3I_3J",
-- "VtblCall__II_3B_3J",
-- "VtblCall__II_3B_3J_3I",
-- "VtblCall__II_3C",
-- "VtblCall__II_3CIIII",
-- "VtblCall__II_3CIJJJ",
-- "VtblCall__II_3CI_3I",
-- "VtblCall__II_3CJ_3J",
-- "VtblCall__II_3C_3C",
-- "VtblCall__II_3F",
-- "VtblCall__II_3I",
-- "VtblCall__II_3I_3I",
-- "VtblCall__II_3I_3I_3I",
-- "VtblCall__II_3I_3I_3I_3I",
-- "VtblCall__II_3I_3J",
-- "VtblCall__II_3I_3J_3I",
-- "VtblCall__II_3I_3J_3J",
-- "VtblCall__II_3J",
-- "VtblCall__II_3J_3J_3J",
-- "VtblCall__II_3S",
-+ "VtblCall__IJ",
-+ "VtblCall__IJF",
-+ "VtblCall__IJI",
-+ "VtblCall__IJII",
-+ "VtblCall__IJIII",
-+ "VtblCall__IJIIII",
-+ "VtblCall__IJIIIII",
-+ "VtblCall__IJIIIIII",
-+ "VtblCall__IJIIIIIIIIII",
-+ "VtblCall__IJIIIIIIIIIIIIISI",
-+ "VtblCall__IJIIIIII_3C_3I_3I",
-+ "VtblCall__IJIIIIJII",
-+ "VtblCall__IJIIII_3CIIIII_3I_3I",
-+ "VtblCall__IJIIII_3C_3BIIIII_3I_3I",
-+ "VtblCall__IJIIII_3C_3I_3I",
-+ "VtblCall__IJIIII_3I_3I",
-+ "VtblCall__IJIII_3C",
-+ "VtblCall__IJIII_3I",
-+ "VtblCall__IJIIJJJJ",
-+ "VtblCall__IJII_3B",
-+ "VtblCall__IJII_3C",
-+ "VtblCall__IJII_3CIJI",
-+ "VtblCall__IJII_3CJJJ",
-+ "VtblCall__IJII_3C_3CI_3I",
-+ "VtblCall__IJII_3I",
-+ "VtblCall__IJII_3J",
-+ "VtblCall__IJIJJ",
-+ "VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2",
-+ "VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-+ "VtblCall__IJI_3B",
-+ "VtblCall__IJI_3BI",
-+ "VtblCall__IJI_3BI_3I",
-+ "VtblCall__IJI_3B_3B_3BI_3I",
-+ "VtblCall__IJI_3B_3C",
-+ "VtblCall__IJI_3B_3I",
-+ "VtblCall__IJI_3C",
-+ "VtblCall__IJI_3CI",
-+ "VtblCall__IJI_3C_3C",
-+ "VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I",
-+ "VtblCall__IJI_3C_3CI_3I_3I_3I",
-+ "VtblCall__IJI_3C_3C_3C_3I",
-+ "VtblCall__IJI_3C_3C_3C_3I_3I",
-+ "VtblCall__IJI_3C_3C_3I",
-+ "VtblCall__IJI_3C_3C_3I_3C_3I_3I",
-+ "VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I",
-+ "VtblCall__IJI_3I",
-+ "VtblCall__IJI_3I_3I_3I_3I",
-+ "VtblCall__IJJ",
-+ "VtblCall__IJJI",
-+ "VtblCall__IJJIIJIIIIII",
-+ "VtblCall__IJJIIJIIIIIIIIISJ",
-+ "VtblCall__IJJIIJ_3I_3J",
-+ "VtblCall__IJJI_3J",
-+ "VtblCall__IJJJ",
-+ "VtblCall__IJJJI",
-+ "VtblCall__IJJJII",
-+ "VtblCall__IJJJIIII",
-+ "VtblCall__IJJJIJ_3C_3I_3I",
-+ "VtblCall__IJJJI_3C",
-+ "VtblCall__IJJJI_3I",
-+ "VtblCall__IJJJJ",
-+ "VtblCall__IJJJJI",
-+ "VtblCall__IJJJJI_3CJJIJI_3J_3J",
-+ "VtblCall__IJJJJI_3C_3BJJIJI_3J_3J",
-+ "VtblCall__IJJJJJIJ_3C_3I_3J",
-+ "VtblCall__IJJJJJJ",
-+ "VtblCall__IJJJJJJJ",
-+ "VtblCall__IJJJJJJJJ",
-+ "VtblCall__IJJJ_3B",
-+ "VtblCall__IJJJ_3CIJI",
-+ "VtblCall__IJJJ_3CJJJ",
-+ "VtblCall__IJJJ_3C_3CI_3J",
-+ "VtblCall__IJJJ_3I",
-+ "VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2",
-+ "VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-+ "VtblCall__IJJ_3B",
-+ "VtblCall__IJJ_3BI",
-+ "VtblCall__IJJ_3BJ_3J",
-+ "VtblCall__IJJ_3B_3B_3BJ_3J",
-+ "VtblCall__IJJ_3B_3C",
-+ "VtblCall__IJJ_3CI",
-+ "VtblCall__IJJ_3C_3C",
-+ "VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I",
-+ "VtblCall__IJJ_3C_3CI_3J_3I_3I",
-+ "VtblCall__IJJ_3C_3C_3C_3I",
-+ "VtblCall__IJJ_3C_3C_3C_3I_3I",
-+ "VtblCall__IJJ_3C_3C_3I",
-+ "VtblCall__IJJ_3C_3C_3J",
-+ "VtblCall__IJJ_3C_3C_3J_3C_3I_3I",
-+ "VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I",
-+ "VtblCall__IJJ_3I",
-+ "VtblCall__IJJ_3J",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-+ "VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-+ "VtblCall__IJ_3B",
-+ "VtblCall__IJ_3BI",
-+ "VtblCall__IJ_3BII_3I_3I",
-+ "VtblCall__IJ_3BIJ_3J_3I",
-+ "VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-+ "VtblCall__IJ_3BI_3I",
-+ "VtblCall__IJ_3BI_3I_3I",
-+ "VtblCall__IJ_3BI_3J_3I",
-+ "VtblCall__IJ_3BJ",
-+ "VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-+ "VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
-+ "VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
-+ "VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
-+ "VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
-+ "VtblCall__IJ_3B_3B",
-+ "VtblCall__IJ_3B_3BI",
-+ "VtblCall__IJ_3B_3B_3BII_3I",
-+ "VtblCall__IJ_3B_3B_3BII_3J",
-+ "VtblCall__IJ_3B_3B_3I",
-+ "VtblCall__IJ_3B_3B_3J",
-+ "VtblCall__IJ_3B_3I",
-+ "VtblCall__IJ_3B_3I_3I",
-+ "VtblCall__IJ_3B_3I_3J",
-+ "VtblCall__IJ_3B_3J",
-+ "VtblCall__IJ_3B_3J_3I",
-+ "VtblCall__IJ_3C",
-+ "VtblCall__IJ_3CIIII",
-+ "VtblCall__IJ_3CIJJJ",
-+ "VtblCall__IJ_3CI_3I",
-+ "VtblCall__IJ_3CJ_3J",
-+ "VtblCall__IJ_3C_3C",
-+ "VtblCall__IJ_3F",
-+ "VtblCall__IJ_3I",
-+ "VtblCall__IJ_3I_3I",
-+ "VtblCall__IJ_3I_3I_3I",
-+ "VtblCall__IJ_3I_3I_3I_3I",
-+ "VtblCall__IJ_3I_3J",
-+ "VtblCall__IJ_3I_3J_3I",
-+ "VtblCall__IJ_3I_3J_3J",
-+ "VtblCall__IJ_3J",
-+ "VtblCall__IJ_3J_3J_3J",
-+ "VtblCall__IJ_3S",
- "XPCOMGlueShutdown",
- "XPCOMGlueStartup",
-- "memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
-- "memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II",
-+ "memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I",
-+ "memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI",
- "nsEmbedCString_1Length",
- "nsEmbedCString_1delete",
- "nsEmbedCString_1get",
-diff -ur x86/xpcom_stats.h x86_64/xpcom_stats.h
---- x86/xpcom_stats.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcom_stats.h 2009-02-11 17:53:48.000000000 -0500
-@@ -30,156 +30,156 @@
- NS_1GetServiceManager_FUNC,
- NS_1InitXPCOM2_FUNC,
- NS_1NewLocalFile_FUNC,
-- VtblCall__II_FUNC,
-- VtblCall__IIF_FUNC,
-- VtblCall__III_FUNC,
-- VtblCall__IIII_FUNC,
-- VtblCall__IIIII_FUNC,
-- VtblCall__IIIIII_FUNC,
-- VtblCall__IIIIIII_FUNC,
-- VtblCall__IIIIIIII_FUNC,
-- VtblCall__IIIIIIIIIIII_FUNC,
-- VtblCall__IIIIIIIIIIIIIIISI_FUNC,
-- VtblCall__IIIIIIII_3C_3I_3I_FUNC,
-- VtblCall__IIIIIIJII_FUNC,
-- VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
-- VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
-- VtblCall__IIIIII_3C_3I_3I_FUNC,
-- VtblCall__IIIIII_3I_3I_FUNC,
-- VtblCall__IIIII_3C_FUNC,
-- VtblCall__IIIII_3I_FUNC,
-- VtblCall__IIIIJJJJ_FUNC,
-- VtblCall__IIII_3B_FUNC,
-- VtblCall__IIII_3C_FUNC,
-- VtblCall__IIII_3CIJI_FUNC,
-- VtblCall__IIII_3CJJJ_FUNC,
-- VtblCall__IIII_3C_3CI_3I_FUNC,
-- VtblCall__IIII_3I_FUNC,
-- VtblCall__IIII_3J_FUNC,
-- VtblCall__IIIJJ_FUNC,
-- VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-- VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-- VtblCall__III_3B_FUNC,
-- VtblCall__III_3BI_FUNC,
-- VtblCall__III_3BI_3I_FUNC,
-- VtblCall__III_3B_3B_3BI_3I_FUNC,
-- VtblCall__III_3B_3C_FUNC,
-- VtblCall__III_3B_3I_FUNC,
-- VtblCall__III_3C_FUNC,
-- VtblCall__III_3CI_FUNC,
-- VtblCall__III_3C_3C_FUNC,
-- VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-- VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
-- VtblCall__III_3C_3C_3C_3I_FUNC,
-- VtblCall__III_3C_3C_3C_3I_3I_FUNC,
-- VtblCall__III_3C_3C_3I_FUNC,
-- VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
-- VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
-- VtblCall__III_3I_FUNC,
-- VtblCall__III_3I_3I_3I_3I_FUNC,
-- VtblCall__IIJ_FUNC,
-- VtblCall__IIJI_FUNC,
-- VtblCall__IIJIIJIIIIII_FUNC,
-- VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
-- VtblCall__IIJIIJ_3I_3J_FUNC,
-- VtblCall__IIJI_3J_FUNC,
-- VtblCall__IIJJ_FUNC,
-- VtblCall__IIJJI_FUNC,
-- VtblCall__IIJJII_FUNC,
-- VtblCall__IIJJIIII_FUNC,
-- VtblCall__IIJJIJ_3C_3I_3I_FUNC,
-- VtblCall__IIJJI_3C_FUNC,
-- VtblCall__IIJJI_3I_FUNC,
-- VtblCall__IIJJJ_FUNC,
-- VtblCall__IIJJJI_FUNC,
-- VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
-- VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
-- VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
-- VtblCall__IIJJJJJ_FUNC,
-- VtblCall__IIJJJJJJ_FUNC,
-- VtblCall__IIJJJJJJJ_FUNC,
-- VtblCall__IIJJ_3B_FUNC,
-- VtblCall__IIJJ_3CIJI_FUNC,
-- VtblCall__IIJJ_3CJJJ_FUNC,
-- VtblCall__IIJJ_3C_3CI_3J_FUNC,
-- VtblCall__IIJJ_3I_FUNC,
-- VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-- VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-- VtblCall__IIJ_3B_FUNC,
-- VtblCall__IIJ_3BI_FUNC,
-- VtblCall__IIJ_3BJ_3J_FUNC,
-- VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
-- VtblCall__IIJ_3B_3C_FUNC,
-- VtblCall__IIJ_3CI_FUNC,
-- VtblCall__IIJ_3C_3C_FUNC,
-- VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-- VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
-- VtblCall__IIJ_3C_3C_3C_3I_FUNC,
-- VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
-- VtblCall__IIJ_3C_3C_3I_FUNC,
-- VtblCall__IIJ_3C_3C_3J_FUNC,
-- VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
-- VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
-- VtblCall__IIJ_3I_FUNC,
-- VtblCall__IIJ_3J_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-- VtblCall__II_3B_FUNC,
-- VtblCall__II_3BI_FUNC,
-- VtblCall__II_3BII_3I_3I_FUNC,
-- VtblCall__II_3BIJ_3J_3I_FUNC,
-- VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-- VtblCall__II_3BI_3I_FUNC,
-- VtblCall__II_3BI_3I_3I_FUNC,
-- VtblCall__II_3BI_3J_3I_FUNC,
-- VtblCall__II_3BJ_FUNC,
-- VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-- VtblCall__II_3B_3B_FUNC,
-- VtblCall__II_3B_3BI_FUNC,
-- VtblCall__II_3B_3B_3BII_3I_FUNC,
-- VtblCall__II_3B_3B_3BII_3J_FUNC,
-- VtblCall__II_3B_3B_3I_FUNC,
-- VtblCall__II_3B_3B_3J_FUNC,
-- VtblCall__II_3B_3I_FUNC,
-- VtblCall__II_3B_3I_3I_FUNC,
-- VtblCall__II_3B_3I_3J_FUNC,
-- VtblCall__II_3B_3J_FUNC,
-- VtblCall__II_3B_3J_3I_FUNC,
-- VtblCall__II_3C_FUNC,
-- VtblCall__II_3CIIII_FUNC,
-- VtblCall__II_3CIJJJ_FUNC,
-- VtblCall__II_3CI_3I_FUNC,
-- VtblCall__II_3CJ_3J_FUNC,
-- VtblCall__II_3C_3C_FUNC,
-- VtblCall__II_3F_FUNC,
-- VtblCall__II_3I_FUNC,
-- VtblCall__II_3I_3I_FUNC,
-- VtblCall__II_3I_3I_3I_FUNC,
-- VtblCall__II_3I_3I_3I_3I_FUNC,
-- VtblCall__II_3I_3J_FUNC,
-- VtblCall__II_3I_3J_3I_FUNC,
-- VtblCall__II_3I_3J_3J_FUNC,
-- VtblCall__II_3J_FUNC,
-- VtblCall__II_3J_3J_3J_FUNC,
-- VtblCall__II_3S_FUNC,
-+ VtblCall__IJ_FUNC,
-+ VtblCall__IJF_FUNC,
-+ VtblCall__IJI_FUNC,
-+ VtblCall__IJII_FUNC,
-+ VtblCall__IJIII_FUNC,
-+ VtblCall__IJIIII_FUNC,
-+ VtblCall__IJIIIII_FUNC,
-+ VtblCall__IJIIIIII_FUNC,
-+ VtblCall__IJIIIIIIIIII_FUNC,
-+ VtblCall__IJIIIIIIIIIIIIISI_FUNC,
-+ VtblCall__IJIIIIII_3C_3I_3I_FUNC,
-+ VtblCall__IJIIIIJII_FUNC,
-+ VtblCall__IJIIII_3CIIIII_3I_3I_FUNC,
-+ VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC,
-+ VtblCall__IJIIII_3C_3I_3I_FUNC,
-+ VtblCall__IJIIII_3I_3I_FUNC,
-+ VtblCall__IJIII_3C_FUNC,
-+ VtblCall__IJIII_3I_FUNC,
-+ VtblCall__IJIIJJJJ_FUNC,
-+ VtblCall__IJII_3B_FUNC,
-+ VtblCall__IJII_3C_FUNC,
-+ VtblCall__IJII_3CIJI_FUNC,
-+ VtblCall__IJII_3CJJJ_FUNC,
-+ VtblCall__IJII_3C_3CI_3I_FUNC,
-+ VtblCall__IJII_3I_FUNC,
-+ VtblCall__IJII_3J_FUNC,
-+ VtblCall__IJIJJ_FUNC,
-+ VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-+ VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-+ VtblCall__IJI_3B_FUNC,
-+ VtblCall__IJI_3BI_FUNC,
-+ VtblCall__IJI_3BI_3I_FUNC,
-+ VtblCall__IJI_3B_3B_3BI_3I_FUNC,
-+ VtblCall__IJI_3B_3C_FUNC,
-+ VtblCall__IJI_3B_3I_FUNC,
-+ VtblCall__IJI_3C_FUNC,
-+ VtblCall__IJI_3CI_FUNC,
-+ VtblCall__IJI_3C_3C_FUNC,
-+ VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-+ VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC,
-+ VtblCall__IJI_3C_3C_3C_3I_FUNC,
-+ VtblCall__IJI_3C_3C_3C_3I_3I_FUNC,
-+ VtblCall__IJI_3C_3C_3I_FUNC,
-+ VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC,
-+ VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC,
-+ VtblCall__IJI_3I_FUNC,
-+ VtblCall__IJI_3I_3I_3I_3I_FUNC,
-+ VtblCall__IJJ_FUNC,
-+ VtblCall__IJJI_FUNC,
-+ VtblCall__IJJIIJIIIIII_FUNC,
-+ VtblCall__IJJIIJIIIIIIIIISJ_FUNC,
-+ VtblCall__IJJIIJ_3I_3J_FUNC,
-+ VtblCall__IJJI_3J_FUNC,
-+ VtblCall__IJJJ_FUNC,
-+ VtblCall__IJJJI_FUNC,
-+ VtblCall__IJJJII_FUNC,
-+ VtblCall__IJJJIIII_FUNC,
-+ VtblCall__IJJJIJ_3C_3I_3I_FUNC,
-+ VtblCall__IJJJI_3C_FUNC,
-+ VtblCall__IJJJI_3I_FUNC,
-+ VtblCall__IJJJJ_FUNC,
-+ VtblCall__IJJJJI_FUNC,
-+ VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC,
-+ VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC,
-+ VtblCall__IJJJJJIJ_3C_3I_3J_FUNC,
-+ VtblCall__IJJJJJJ_FUNC,
-+ VtblCall__IJJJJJJJ_FUNC,
-+ VtblCall__IJJJJJJJJ_FUNC,
-+ VtblCall__IJJJ_3B_FUNC,
-+ VtblCall__IJJJ_3CIJI_FUNC,
-+ VtblCall__IJJJ_3CJJJ_FUNC,
-+ VtblCall__IJJJ_3C_3CI_3J_FUNC,
-+ VtblCall__IJJJ_3I_FUNC,
-+ VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
-+ VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-+ VtblCall__IJJ_3B_FUNC,
-+ VtblCall__IJJ_3BI_FUNC,
-+ VtblCall__IJJ_3BJ_3J_FUNC,
-+ VtblCall__IJJ_3B_3B_3BJ_3J_FUNC,
-+ VtblCall__IJJ_3B_3C_FUNC,
-+ VtblCall__IJJ_3CI_FUNC,
-+ VtblCall__IJJ_3C_3C_FUNC,
-+ VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
-+ VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC,
-+ VtblCall__IJJ_3C_3C_3C_3I_FUNC,
-+ VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC,
-+ VtblCall__IJJ_3C_3C_3I_FUNC,
-+ VtblCall__IJJ_3C_3C_3J_FUNC,
-+ VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC,
-+ VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
-+ VtblCall__IJJ_3I_FUNC,
-+ VtblCall__IJJ_3J_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-+ VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-+ VtblCall__IJ_3B_FUNC,
-+ VtblCall__IJ_3BI_FUNC,
-+ VtblCall__IJ_3BII_3I_3I_FUNC,
-+ VtblCall__IJ_3BIJ_3J_3I_FUNC,
-+ VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-+ VtblCall__IJ_3BI_3I_FUNC,
-+ VtblCall__IJ_3BI_3I_3I_FUNC,
-+ VtblCall__IJ_3BI_3J_3I_FUNC,
-+ VtblCall__IJ_3BJ_FUNC,
-+ VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-+ VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-+ VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
-+ VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
-+ VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
-+ VtblCall__IJ_3B_3B_FUNC,
-+ VtblCall__IJ_3B_3BI_FUNC,
-+ VtblCall__IJ_3B_3B_3BII_3I_FUNC,
-+ VtblCall__IJ_3B_3B_3BII_3J_FUNC,
-+ VtblCall__IJ_3B_3B_3I_FUNC,
-+ VtblCall__IJ_3B_3B_3J_FUNC,
-+ VtblCall__IJ_3B_3I_FUNC,
-+ VtblCall__IJ_3B_3I_3I_FUNC,
-+ VtblCall__IJ_3B_3I_3J_FUNC,
-+ VtblCall__IJ_3B_3J_FUNC,
-+ VtblCall__IJ_3B_3J_3I_FUNC,
-+ VtblCall__IJ_3C_FUNC,
-+ VtblCall__IJ_3CIIII_FUNC,
-+ VtblCall__IJ_3CIJJJ_FUNC,
-+ VtblCall__IJ_3CI_3I_FUNC,
-+ VtblCall__IJ_3CJ_3J_FUNC,
-+ VtblCall__IJ_3C_3C_FUNC,
-+ VtblCall__IJ_3F_FUNC,
-+ VtblCall__IJ_3I_FUNC,
-+ VtblCall__IJ_3I_3I_FUNC,
-+ VtblCall__IJ_3I_3I_3I_FUNC,
-+ VtblCall__IJ_3I_3I_3I_3I_FUNC,
-+ VtblCall__IJ_3I_3J_FUNC,
-+ VtblCall__IJ_3I_3J_3I_FUNC,
-+ VtblCall__IJ_3I_3J_3J_FUNC,
-+ VtblCall__IJ_3J_FUNC,
-+ VtblCall__IJ_3J_3J_3J_FUNC,
-+ VtblCall__IJ_3S_FUNC,
- XPCOMGlueShutdown_FUNC,
- XPCOMGlueStartup_FUNC,
-- memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-- memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC,
-+ memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
-+ memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC,
- nsEmbedCString_1Length_FUNC,
- nsEmbedCString_1delete_FUNC,
- nsEmbedCString_1get_FUNC,
-diff -ur x86/xpcom_structs.cpp x86_64/xpcom_structs.cpp
---- x86/xpcom_structs.cpp 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcom_structs.cpp 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
-diff -ur x86/xpcom_structs.h x86_64/xpcom_structs.h
---- x86/xpcom_structs.h 2009-06-24 21:14:00.000000000 -0400
-+++ x86_64/xpcom_structs.h 2009-02-11 17:53:48.000000000 -0500
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2007 IBM Corporation and others.
-+ * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
diff --git a/debian/patches/common/01-make_linux.patch b/debian/patches/common/01-make_linux.patch
index de321f1..2c83d26 100644
--- a/debian/patches/common/01-make_linux.patch
+++ b/debian/patches/common/01-make_linux.patch
@@ -1,6 +1,35 @@
---- swt-gtk-3.4.2.orig/make_linux.mak
-+++ swt-gtk-3.4.2/make_linux.mak
-@@ -64,6 +65,7 @@
+diff --git a/.topdeps b/.topdeps
+new file mode 100644
+index 0000000..1f7391f
+--- /dev/null
++++ b/.topdeps
+@@ -0,0 +1 @@
++master
+diff --git a/.topmsg b/.topmsg
+new file mode 100644
+index 0000000..b315ddc
+--- /dev/null
++++ b/.topmsg
+@@ -0,0 +1,6 @@
++From: Adrian Perez <adrianperez.deb at gmail.com>
++Subject: [PATCH] debian/makefile
++
++Tweak Linux Makefile.
++
++Signed-off-by: Adrian Perez <adrianperez.deb at gmail.com>
+diff --git a/make_linux.mak b/make_linux.mak
+index c1bc1a1..f410762 100644
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -50,6 +50,7 @@ GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthrea
+
+ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
+
++AWT_LIB_PATH=/usr/lib/jvm/default-java/lib
+ AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared
+
+ ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
+@@ -64,6 +65,7 @@ GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
@@ -8,19 +37,20 @@
MOZILLACFLAGS = -O \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
-@@ -76,8 +78,10 @@
+@@ -76,8 +78,11 @@ MOZILLACFLAGS = -O \
-I. \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
+ `pkg-config --cflags libxul-embedding` \
${SWT_PTR_CFLAGS}
-MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
++
+MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \
+ `pkg-config --libs libxul-embedding`
- MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
-
- SWT_OBJECTS = swt.o c.o c_stats.o callback.o
-@@ -92,7 +96,7 @@
+ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+ -DNO__1XPCOMGlueStartup \
+ -DNO__1XPCOMGlueLoadXULFunctions \
+@@ -101,7 +106,7 @@ XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomx
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
@@ -29,7 +59,7 @@
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
-DLINUX -DGTK \
-@@ -102,6 +106,7 @@
+@@ -111,6 +116,7 @@ CFLAGS = -O -Wall \
${SWT_PTR_CFLAGS}
LIBS = -shared -fPIC
diff --git a/debian/rules b/debian/rules
index 95de0b9..f0b6fa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
AWT_LIB_DIR = ppc
endif
-DEB_MAKE_INVOKE += -DAWT_LIB_PATH=/usr/lib/java/jvm/default-java/jvm/\
+DEB_MAKE_INVOKE += -DAWT_LIB_PATH=/usr/lib/jvm/default-java/lib/\
$(AWT_LIB_DIR)
include /usr/share/cdbs/1/rules/simple-patchsys.mk
diff --git a/glx.c b/glx.c
index 1bb295d..7adc742 100644
--- a/glx.c
+++ b/glx.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -52,14 +52,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glViewport)
#endif
#ifndef NO__1glXChooseVisual
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXChooseVisual)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXChooseVisual)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2)
{
jint *lparg2=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXChooseVisual_FUNC);
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- rc = (jint)glXChooseVisual((Display *)arg0, arg1, lparg2);
+ rc = (jintLong)glXChooseVisual((Display *)arg0, arg1, lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
GLX_NATIVE_EXIT(env, that, _1glXChooseVisual_FUNC);
@@ -69,7 +69,7 @@ fail:
#ifndef NO__1glXCopyContext
JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
{
GLX_NATIVE_ENTER(env, that, _1glXCopyContext_FUNC);
glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
@@ -78,14 +78,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
#endif
#ifndef NO__1glXCreateContext
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateContext)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateContext)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jboolean arg3)
{
XVisualInfo _arg1, *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXCreateContext_FUNC);
if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
- rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
+ rc = (jintLong)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
fail:
if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
GLX_NATIVE_EXIT(env, that, _1glXCreateContext_FUNC);
@@ -94,14 +94,14 @@ fail:
#endif
#ifndef NO__1glXCreateGLXPixmap
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
{
XVisualInfo _arg1, *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXCreateGLXPixmap_FUNC);
if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
- rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
+ rc = (jintLong)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
fail:
if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
GLX_NATIVE_EXIT(env, that, _1glXCreateGLXPixmap_FUNC);
@@ -111,7 +111,7 @@ fail:
#ifndef NO__1glXDestroyContext
JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
GLX_NATIVE_ENTER(env, that, _1glXDestroyContext_FUNC);
glXDestroyContext((Display *)arg0, (GLXContext)arg1);
@@ -121,7 +121,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
#ifndef NO__1glXDestroyGLXPixmap
JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
GLX_NATIVE_ENTER(env, that, _1glXDestroyGLXPixmap_FUNC);
glXDestroyGLXPixmap((Display *)arg0, (GLXPixmap)arg1);
@@ -130,12 +130,12 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
#endif
#ifndef NO__1glXGetClientString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetClientString)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXGetClientString_FUNC);
- rc = (jint)glXGetClientString((Display *)arg0, arg1);
+ rc = (jintLong)glXGetClientString((Display *)arg0, arg1);
GLX_NATIVE_EXIT(env, that, _1glXGetClientString_FUNC);
return rc;
}
@@ -143,7 +143,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
#ifndef NO__1glXGetConfig
JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetConfig)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jintArray arg3)
{
XVisualInfo _arg1, *lparg1=NULL;
jint *lparg3=NULL;
@@ -161,24 +161,24 @@ fail:
#endif
#ifndef NO__1glXGetCurrentContext
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentContext)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentContext)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXGetCurrentContext_FUNC);
- rc = (jint)glXGetCurrentContext();
+ rc = (jintLong)glXGetCurrentContext();
GLX_NATIVE_EXIT(env, that, _1glXGetCurrentContext_FUNC);
return rc;
}
#endif
#ifndef NO__1glXGetCurrentDrawable
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXGetCurrentDrawable_FUNC);
- rc = (jint)glXGetCurrentDrawable();
+ rc = (jintLong)glXGetCurrentDrawable();
GLX_NATIVE_EXIT(env, that, _1glXGetCurrentDrawable_FUNC);
return rc;
}
@@ -186,7 +186,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
#ifndef NO__1glXIsDirect
JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXIsDirect_FUNC);
@@ -198,7 +198,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
#ifndef NO__1glXMakeCurrent
JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jboolean rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXMakeCurrent_FUNC);
@@ -210,7 +210,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
#ifndef NO__1glXQueryExtension
JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryExtension)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -228,24 +228,24 @@ fail:
#endif
#ifndef NO__1glXQueryExtensionsString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXQueryExtensionsString_FUNC);
- rc = (jint)glXQueryExtensionsString((Display *)arg0, arg1);
+ rc = (jintLong)glXQueryExtensionsString((Display *)arg0, arg1);
GLX_NATIVE_EXIT(env, that, _1glXQueryExtensionsString_FUNC);
return rc;
}
#endif
#ifndef NO__1glXQueryServerString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXQueryServerString)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
GLX_NATIVE_ENTER(env, that, _1glXQueryServerString_FUNC);
- rc = (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
+ rc = (jintLong)glXQueryServerString((Display *)arg0, arg1, arg2);
GLX_NATIVE_EXIT(env, that, _1glXQueryServerString_FUNC);
return rc;
}
@@ -253,7 +253,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
#ifndef NO__1glXQueryVersion
JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryVersion)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -272,7 +272,7 @@ fail:
#ifndef NO__1glXSwapBuffers
JNIEXPORT void JNICALL GLX_NATIVE(_1glXSwapBuffers)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
GLX_NATIVE_ENTER(env, that, _1glXSwapBuffers_FUNC);
glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
@@ -302,7 +302,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXWaitX)
#ifndef NO_memmove
JNIEXPORT void JNICALL GLX_NATIVE(memmove)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
{
XVisualInfo _arg0, *lparg0=NULL;
GLX_NATIVE_ENTER(env, that, memmove_FUNC);
diff --git a/glx_stats.c b/glx_stats.c
index da88c6f..1d62603 100644
--- a/glx_stats.c
+++ b/glx_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/glx_stats.h b/glx_stats.h
index 49a3f32..3c39671 100644
--- a/glx_stats.h
+++ b/glx_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/glx_structs.c b/glx_structs.c
index 9b60aa1..7aec87e 100644
--- a/glx_structs.c
+++ b/glx_structs.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,7 +25,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");
+ XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", I_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");
@@ -41,7 +41,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)->GetIntField(env, lpObject, XVisualInfoFc.visual);
+ lpStruct->visual = (Visual *)(*env)->GetIntLongField(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);
@@ -57,7 +57,7 @@ XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lp
void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
{
if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, XVisualInfoFc.visual, (jint)lpStruct->visual);
+ (*env)->SetIntLongField(env, lpObject, XVisualInfoFc.visual, (jintLong)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/glx_structs.h b/glx_structs.h
index a60c3b9..7a30ea6 100644
--- a/glx_structs.h
+++ b/glx_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/gnome.c b/gnome.c
index 7645212..c74ea71 100644
--- a/gnome.c
+++ b/gnome.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -33,7 +33,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(GnomeVFSMimeApplication_1sizeof)
#ifndef NO__1g_1free
JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
GNOME_NATIVE_ENTER(env, that, _1g_1free_FUNC);
g_free((gpointer)arg0);
@@ -42,12 +42,12 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1free)
#endif
#ifndef NO__1g_1list_1append
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1append)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1g_1list_1append)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
- rc = (jint)g_list_append((GList *)arg0, (gpointer)arg1);
+ rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1);
GNOME_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
return rc;
}
@@ -55,7 +55,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1append)
#ifndef NO__1g_1list_1free
JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1list_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
GNOME_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
g_list_free((GList *)arg0);
@@ -64,12 +64,12 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1list_1free)
#endif
#ifndef NO__1g_1list_1next
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1next)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1g_1list_1next)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
- rc = (jint)g_list_next(arg0);
+ rc = (jintLong)g_list_next(arg0);
GNOME_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
return rc;
}
@@ -77,7 +77,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1g_1list_1next)
#ifndef NO__1g_1object_1unref
JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1object_1unref)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
GNOME_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
g_object_unref((gpointer)arg0);
@@ -86,20 +86,20 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1g_1object_1unref)
#endif
#ifndef NO__1gnome_1icon_1lookup
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1lookup)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1icon_1lookup)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintLong arg4, jbyteArray arg5, jint arg6, jintArray arg7)
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jbyte *lparg5=NULL;
jint *lparg7=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1lookup_FUNC);
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
- rc = (jint)gnome_icon_lookup((GnomeIconTheme *)arg0, (GnomeThumbnailFactory *)arg1, (const char *)lparg2, (const char *)lparg3, (GnomeVFSFileInfo *)arg4, (const char *)lparg5, (GnomeIconLookupFlags)arg6, (GnomeIconLookupResultFlags *)lparg7);
+ rc = (jintLong)gnome_icon_lookup((GnomeIconTheme *)arg0, (GnomeThumbnailFactory *)arg1, (const char *)lparg2, (const char *)lparg3, (GnomeVFSFileInfo *)arg4, (const char *)lparg5, (GnomeIconLookupFlags)arg6, (GnomeIconLookupResultFlags *)lparg7);
fail:
if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
@@ -111,43 +111,43 @@ fail:
#endif
#ifndef NO__1gnome_1icon_1theme_1lookup_1icon
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1lookup_1icon)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1lookup_1icon)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3, jintArray arg4)
{
- jint *lparg3=NULL;
+ jintLong *lparg3=NULL;
jint *lparg4=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1theme_1lookup_1icon_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
- rc = (jint)gnome_icon_theme_lookup_icon((GnomeIconTheme *)arg0, (const char *)arg1, arg2, (const GnomeIconData **)lparg3, lparg4);
+ rc = (jintLong)gnome_icon_theme_lookup_icon((GnomeIconTheme *)arg0, (const char *)arg1, arg2, (const GnomeIconData **)lparg3, lparg4);
fail:
if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
GNOME_NATIVE_EXIT(env, that, _1gnome_1icon_1theme_1lookup_1icon_FUNC);
return rc;
}
#endif
#ifndef NO__1gnome_1icon_1theme_1new
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1new)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1icon_1theme_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1icon_1theme_1new_FUNC);
- rc = (jint)gnome_icon_theme_new();
+ rc = (jintLong)gnome_icon_theme_new();
GNOME_NATIVE_EXIT(env, that, _1gnome_1icon_1theme_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gnome_1vfs_1get_1registered_1mime_1types
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1get_1registered_1mime_1types)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
- rc = (jint)gnome_vfs_get_registered_mime_types();
+ rc = (jintLong)gnome_vfs_get_registered_mime_types();
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1get_1registered_1mime_1types_FUNC);
return rc;
}
@@ -166,14 +166,14 @@ JNIEXPORT jboolean JNICALL GNOME_NATIVE(_1gnome_1vfs_1init)
#endif
#ifndef NO__1gnome_1vfs_1make_1uri_1from_1input
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1make_1uri_1from_1input_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gnome_vfs_make_uri_from_input((const char *)lparg0);
+ rc = (jintLong)gnome_vfs_make_uri_from_input((const char *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1make_1uri_1from_1input_FUNC);
@@ -182,29 +182,20 @@ fail:
#endif
#ifndef NO__1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs)
(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1make_1uri_1from_1input_1with_1dirs_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
/*
- rc = (jint)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1);
+ rc = (jintLong)gnome_vfs_make_uri_from_input_with_dirs((const char *)lparg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(const char *, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gnome_vfs_make_uri_from_input_with_dirs_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gnome_vfs_make_uri_from_input_with_dirs");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((const char *)lparg0, arg1);
+ LOAD_FUNCTION(fp, gnome_vfs_make_uri_from_input_with_dirs)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, jint))fp)((const char *)lparg0, arg1);
}
}
fail:
@@ -216,7 +207,7 @@ fail:
#ifndef NO__1gnome_1vfs_1mime_1application_1free
JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1application_1free_FUNC);
gnome_vfs_mime_application_free((GnomeVFSMimeApplication *)arg0);
@@ -226,7 +217,7 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1free)
#ifndef NO__1gnome_1vfs_1mime_1application_1launch
JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1application_1launch_FUNC);
@@ -234,18 +225,9 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
rc = (jint)gnome_vfs_mime_application_launch((GnomeVFSMimeApplication *)arg0, (GList *)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GnomeVFSMimeApplication *, GList *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gnome_vfs_mime_application_launch_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gnome_vfs_mime_application_launch");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GnomeVFSMimeApplication *)arg0, (GList *)arg1);
+ LOAD_FUNCTION(fp, gnome_vfs_mime_application_launch)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(GnomeVFSMimeApplication *, GList *))fp)((GnomeVFSMimeApplication *)arg0, (GList *)arg1);
}
}
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1application_1launch_FUNC);
@@ -255,7 +237,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1application_1launch)
#ifndef NO__1gnome_1vfs_1mime_1extensions_1list_1free
JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1extensions_1list_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1extensions_1list_1free_FUNC);
gnome_vfs_mime_extensions_list_free((GList *)arg0);
@@ -264,14 +246,14 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1extensions_1list_1free)
#endif
#ifndef NO__1gnome_1vfs_1mime_1get_1default_1application
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1default_1application)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1default_1application_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gnome_vfs_mime_get_default_application((const char *)lparg0);
+ rc = (jintLong)gnome_vfs_mime_get_default_application((const char *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1default_1application_FUNC);
@@ -280,12 +262,12 @@ fail:
#endif
#ifndef NO__1gnome_1vfs_1mime_1get_1extensions_1list
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
- rc = (jint)gnome_vfs_mime_get_extensions_list((const char *)arg0);
+ rc = (jintLong)gnome_vfs_mime_get_extensions_list((const char *)arg0);
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1get_1extensions_1list_FUNC);
return rc;
}
@@ -293,7 +275,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1get_1extensions_1list)
#ifndef NO__1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free
JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1registered_1mime_1type_1list_1free_FUNC);
gnome_vfs_mime_registered_mime_type_list_free((GList *)arg0);
@@ -302,14 +284,14 @@ JNIEXPORT void JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1registered_1mime_1type_1
#endif
#ifndef NO__1gnome_1vfs_1mime_1type_1from_1name
-JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
+JNIEXPORT jintLong JNICALL GNOME_NATIVE(_1gnome_1vfs_1mime_1type_1from_1name)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1mime_1type_1from_1name_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gnome_vfs_mime_type_from_name((const char *)lparg0);
+ rc = (jintLong)gnome_vfs_mime_type_from_name((const char *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1mime_1type_1from_1name_FUNC);
@@ -319,7 +301,7 @@ fail:
#ifndef NO__1gnome_1vfs_1url_1show
JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
GNOME_NATIVE_ENTER(env, that, _1gnome_1vfs_1url_1show_FUNC);
@@ -327,18 +309,9 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
rc = (jint)gnome_vfs_url_show((const char *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(const char *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gnome_vfs_url_show_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gnome_vfs_url_show");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((const char *)arg0);
+ LOAD_FUNCTION(fp, gnome_vfs_url_show)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(const char *))fp)((const char *)arg0);
}
}
GNOME_NATIVE_EXIT(env, that, _1gnome_1vfs_1url_1show_FUNC);
@@ -348,7 +321,7 @@ JNIEXPORT jint JNICALL GNOME_NATIVE(_1gnome_1vfs_1url_1show)
#ifndef NO_memmove
JNIEXPORT void JNICALL GNOME_NATIVE(memmove)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
{
GnomeVFSMimeApplication _arg0, *lparg0=NULL;
GNOME_NATIVE_ENTER(env, that, memmove_FUNC);
diff --git a/gnome_stats.c b/gnome_stats.c
index cb56684..e541d8e 100644
--- a/gnome_stats.c
+++ b/gnome_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
diff --git a/gnome_stats.h b/gnome_stats.h
index 9cbb8b9..8aea1d9 100644
--- a/gnome_stats.h
+++ b/gnome_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
diff --git a/gnome_structs.c b/gnome_structs.c
index d575cbc..c6426d4 100644
--- a/gnome_structs.c
+++ b/gnome_structs.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -29,12 +29,12 @@ void cacheGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject)
{
if (GnomeVFSMimeApplicationFc.cached) return;
GnomeVFSMimeApplicationFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GnomeVFSMimeApplicationFc.id = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "id", "I");
- GnomeVFSMimeApplicationFc.name = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "name", "I");
- GnomeVFSMimeApplicationFc.command = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "command", "I");
+ GnomeVFSMimeApplicationFc.id = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "id", I_J);
+ GnomeVFSMimeApplicationFc.name = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "name", I_J);
+ GnomeVFSMimeApplicationFc.command = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "command", I_J);
GnomeVFSMimeApplicationFc.can_open_multiple_files = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "can_open_multiple_files", "Z");
GnomeVFSMimeApplicationFc.expects_uris = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "expects_uris", "I");
- GnomeVFSMimeApplicationFc.supported_uri_schemes = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "supported_uri_schemes", "I");
+ GnomeVFSMimeApplicationFc.supported_uri_schemes = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "supported_uri_schemes", I_J);
GnomeVFSMimeApplicationFc.requires_terminal = (*env)->GetFieldID(env, GnomeVFSMimeApplicationFc.clazz, "requires_terminal", "Z");
GnomeVFSMimeApplicationFc.cached = 1;
}
@@ -42,12 +42,12 @@ void cacheGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject)
GnomeVFSMimeApplication *getGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject, GnomeVFSMimeApplication *lpStruct)
{
if (!GnomeVFSMimeApplicationFc.cached) cacheGnomeVFSMimeApplicationFields(env, lpObject);
- lpStruct->id = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.id);
- lpStruct->name = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.name);
- lpStruct->command = (char *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.command);
+ lpStruct->id = (char *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.id);
+ lpStruct->name = (char *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.name);
+ lpStruct->command = (char *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.command);
lpStruct->can_open_multiple_files = (gboolean)(*env)->GetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.can_open_multiple_files);
lpStruct->expects_uris = (GnomeVFSMimeApplicationArgumentType)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.expects_uris);
- lpStruct->supported_uri_schemes = (GList *)(*env)->GetIntField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes);
+ lpStruct->supported_uri_schemes = (GList *)(*env)->GetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes);
lpStruct->requires_terminal = (gboolean)(*env)->GetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.requires_terminal);
return lpStruct;
}
@@ -55,12 +55,12 @@ GnomeVFSMimeApplication *getGnomeVFSMimeApplicationFields(JNIEnv *env, jobject l
void setGnomeVFSMimeApplicationFields(JNIEnv *env, jobject lpObject, GnomeVFSMimeApplication *lpStruct)
{
if (!GnomeVFSMimeApplicationFc.cached) cacheGnomeVFSMimeApplicationFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.id, (jint)lpStruct->id);
- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.name, (jint)lpStruct->name);
- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.command, (jint)lpStruct->command);
+ (*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.id, (jintLong)lpStruct->id);
+ (*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.name, (jintLong)lpStruct->name);
+ (*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.command, (jintLong)lpStruct->command);
(*env)->SetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.can_open_multiple_files, (jboolean)lpStruct->can_open_multiple_files);
(*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.expects_uris, (jint)lpStruct->expects_uris);
- (*env)->SetIntField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes, (jint)lpStruct->supported_uri_schemes);
+ (*env)->SetIntLongField(env, lpObject, GnomeVFSMimeApplicationFc.supported_uri_schemes, (jintLong)lpStruct->supported_uri_schemes);
(*env)->SetBooleanField(env, lpObject, GnomeVFSMimeApplicationFc.requires_terminal, (jboolean)lpStruct->requires_terminal);
}
#endif
diff --git a/gnome_structs.h b/gnome_structs.h
index 85747d0..6b6521f 100644
--- a/gnome_structs.h
+++ b/gnome_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
diff --git a/make_common.mak b/make_common.mak
index 7e128bd..7f77d9e 100644
--- a/make_common.mak
+++ b/make_common.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=3
-min_ver=452
-comma_ver=3,4,5,2
+min_ver=555
+comma_ver=3,5,5,5
diff --git a/make_linux.mak b/make_linux.mak
index 54384cf..c1bc1a1 100644
--- a/make_linux.mak
+++ b/make_linux.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -78,8 +78,17 @@ MOZILLACFLAGS = -O \
-I$(JAVA_HOME)/include/linux \
${SWT_PTR_CFLAGS}
MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
-
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+ -DNO__1XPCOMGlueStartup \
+ -DNO__1XPCOMGlueLoadXULFunctions \
+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
+ -DNO_nsDynamicFunctionLoad_1sizeof \
+ -DNO__1Call__IIIIII \
+ -DNO__1Call__JJJJJI \
+ -DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
+
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
AWT_OBJECTS = swt_awt.o
@@ -213,13 +222,13 @@ xpcom.o: xpcom.cpp
$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
xpcom_structs.o: xpcom_structs.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
xpcom_custom.o: xpcom_custom.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
xpcom_stats.o: xpcom_stats.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
#
# XULRunner lib
@@ -230,16 +239,16 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
xpcomxul_structs.o: xpcom_structs.cpp
- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
xpcomxul_custom.o: xpcom_custom.cpp
- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
xpcomxul_stats.o: xpcom_stats.cpp
- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
#
# XPCOMInit lib
diff --git a/make_solaris.mak b/make_solaris.mak
index 17c60ad..7ec8c67 100644
--- a/make_solaris.mak
+++ b/make_solaris.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2008 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -24,7 +24,9 @@ SWTPI_PREFIX = swt-pi
CAIRO_PREFIX = swt-cairo
ATK_PREFIX = swt-atk
GNOME_PREFIX = swt-gnome
-MOZILLA_PREFIX = swt-mozilla
+MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
+XULRUNNER_PREFIX = swt-xulrunner
+XPCOMINIT_PREFIX = swt-xpcominit
GLX_PREFIX = swt-glx
SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -35,6 +37,8 @@ CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -61,26 +65,26 @@ GLXLIBS = -G -K PIC -L/usr/X11R6/lib -lGL -lGLU -lm
#NATIVE_STATS = -DNATIVE_STATS
MOZILLACFLAGS = -O \
+ -DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
-DMOZILLA_STRICT_API=1 \
- -fno-rtti \
- -fno-exceptions \
- -Wall \
- -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) \
- -Wno-non-virtual-dtor \
- -fPIC \
+ -KPIC \
+ +w \
-I. \
- -I$(MOZILLA_SDK) \
- -include $(MOZILLA_SDK)/mozilla-config.h \
- -I$(MOZILLA_SDK)/nspr/include \
- -I$(MOZILLA_SDK)/xpcom/include \
- -I$(MOZILLA_SDK)/string/include \
- -I$(MOZILLA_SDK)/embed_base/include \
- -I$(MOZILLA_SDK)/embedstring/include
-MOZILLALIBS = -G -s -Wl,--version-script=mozilla_exports -Bsymbolic \
- -L$(MOZILLA_SDK)/embedstring/bin -lembedstring \
- -L$(MOZILLA_SDK)/embed_base/bin -lembed_base_s \
- -L$(MOZILLA_SDK)/xpcom/bin -lxpcomglue_s -lxpcom \
- -L$(MOZILLA_SDK)/nspr/bin -lnspr4 -lplds4 -lplc4
+ -I$(JAVA_HOME)/include \
+ -I$(JAVA_HOME)/include/solaris \
+ ${SWT_PTR_CFLAGS}
+MOZILLALIBS = -G
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+ -DNO__1XPCOMGlueStartup \
+ -DNO__1XPCOMGlueLoadXULFunctions \
+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
+ -DNO_nsDynamicFunctionLoad_1sizeof \
+ -DNO__1Call__IIIIII \
+ -DNO__1Call__JJJJJI \
+ -DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
@@ -90,11 +94,14 @@ CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
+XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
CFLAGS = -O \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
+ -DDTACTION_WARNING_DISABLED \
-DSOLARIS -DGTK -DCDE \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/solaris \
@@ -203,19 +210,56 @@ gnome_stats.o: gnome_stats.c gnome_stats.h
make_mozilla:$(MOZILLA_LIB)
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS)
+ $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
xpcom.o: xpcom.cpp
- $(CXX) $(MOZILLACFLAGS) -c xpcom.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
xpcom_structs.o: xpcom_structs.cpp
- $(CXX) $(MOZILLACFLAGS) -c xpcom_structs.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
xpcom_custom.o: xpcom_custom.cpp
- $(CXX) $(MOZILLACFLAGS) -c xpcom_custom.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
xpcom_stats.o: xpcom_stats.cpp
- $(CXX) $(MOZILLACFLAGS) -c xpcom_stats.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+
+#
+# XULRunner lib
+#
+make_xulrunner:$(XULRUNNER_LIB)
+
+$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
+ $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+
+xpcomxul.o: xpcom.cpp
+ $(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+
+xpcomxul_structs.o: xpcom_structs.cpp
+ $(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+
+xpcomxul_custom.o: xpcom_custom.cpp
+ $(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+
+xpcomxul_stats.o: xpcom_stats.cpp
+ $(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+
+#
+# XPCOMInit lib
+#
+make_xpcominit:$(XPCOMINIT_LIB)
+
+$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
+ $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+
+xpcominit.o: xpcominit.cpp
+ $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
+
+xpcominit_structs.o: xpcominit_structs.cpp
+ $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
+
+xpcominit_stats.o: xpcominit_stats.cpp
+ $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
#
# GLX lib
diff --git a/make_linux.mak b/make_solaris_x86.mak
similarity index 84%
copy from make_linux.mak
copy to make_solaris_x86.mak
index 54384cf..a6f8cd5 100644
--- a/make_linux.mak
+++ b/make_solaris_x86.mak
@@ -1,5 +1,5 @@
#*******************************************************************************
-# Copyright (c) 2000, 2007 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
#*******************************************************************************
-# Makefile for creating SWT libraries for Linux GTK
+# Makefile for creating SWT libraries for Solaris GTK (x86)
include make_common.mak
@@ -50,7 +50,7 @@ GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthrea
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared
+AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -G
ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
@@ -59,7 +59,7 @@ GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-
GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
GLXCFLAGS =
-GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
+GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
@@ -68,18 +68,24 @@ MOZILLACFLAGS = -O \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
-DMOZILLA_STRICT_API=1 \
- -fno-rtti \
- -fno-exceptions \
- -Wall \
- -Wno-non-virtual-dtor \
- -fPIC \
+ -KPIC \
+ +w \
-I. \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
${SWT_PTR_CFLAGS}
-MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
-
+MOZILLALIBS = -G
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+ -DNO__1XPCOMGlueStartup \
+ -DNO__1XPCOMGlueLoadXULFunctions \
+ -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
+ -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
+ -DNO_nsDynamicFunctionLoad_1sizeof \
+ -DNO__1Call__IIIIII \
+ -DNO__1Call__JJJJJI \
+ -DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
+
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
AWT_OBJECTS = swt_awt.o
@@ -92,15 +98,15 @@ XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomx
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-CFLAGS = -O -Wall \
+CFLAGS = -O +w \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
-DLINUX -DGTK \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -fPIC \
+ -KPIC \
${SWT_PTR_CFLAGS}
-LIBS = -shared -fPIC
+LIBS = -G -KPIC
ifndef NO_STRIP
AWT_LIBS := $(AWT_LIBS) -s
@@ -213,13 +219,13 @@ xpcom.o: xpcom.cpp
$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
xpcom_structs.o: xpcom_structs.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
xpcom_custom.o: xpcom_custom.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
xpcom_stats.o: xpcom_stats.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
#
# XULRunner lib
@@ -230,16 +236,16 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
xpcomxul_structs.o: xpcom_structs.cpp
- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
xpcomxul_custom.o: xpcom_custom.cpp
- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
xpcomxul_stats.o: xpcom_stats.cpp
- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
#
# XPCOMInit lib
diff --git a/nsIScriptContext.h b/nsIScriptContext.h
new file mode 100644
index 0000000..783cf3d
--- /dev/null
+++ b/nsIScriptContext.h
@@ -0,0 +1,468 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This file is derived from the Original Code provided by mozilla.org,
+ * whose Initial Developer is Netscape Communications Corporation. Changes
+ * to the original file were made by SWT on April 7, 2009 and are marked
+ * with trailing comment "//SWT-20090407".
+ */
+
+#ifndef nsIScriptContext_h__
+#define nsIScriptContext_h__
+
+#include "nscore.h"
+//#include "nsStringGlue.h" //SWT-20090407
+#include "nsISupports.h"
+#include "nsCOMPtr.h"
+#include "nsIProgrammingLanguage.h"
+
+class nsIScriptGlobalObject;
+class nsIScriptSecurityManager;
+class nsIPrincipal;
+class nsIAtom;
+class nsIArray;
+class nsIVariant;
+class nsIObjectInputStream;
+class nsIObjectOutputStream;
+class nsScriptObjectHolder;
+
+typedef void (*nsScriptTerminationFunc)(nsISupports* aRef);
+
+#define NS_ISCRIPTCONTEXT_IID \
+{ /* {e7b9871d-3adc-4bf7-850d-7fb9554886bf} */ \
+ 0xe7b9871d, 0x3adc, 0x4bf7, \
+ { 0x85, 0x0d, 0x7f, 0xb9, 0x55, 0x48, 0x86, 0xbf } }
+
+/* This MUST match JSVERSION_DEFAULT. This version stuff if we don't
+ know what language we have is a little silly... */
+#define SCRIPTVERSION_DEFAULT JSVERSION_DEFAULT
+
+/**
+ * It is used by the application to initialize a runtime and run scripts.
+ * A script runtime would implement this interface.
+ * <P><I>It does have a bit too much java script information now, that
+ * should be removed in a short time. Ideally this interface will be
+ * language neutral</I>
+ */
+class nsIScriptContext : public nsISupports
+{
+public:
+//NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTCONTEXT_IID) //SWT-20090407
+
+ /* Get the ID of this language. */
+ virtual PRUint32 GetScriptTypeID() = 0;
+
+ /**
+ * Compile and execute a script.
+ *
+ * @param aScript a string representing the script to be executed
+ * @param aScopeObject a script object for the scope to execute in, or
+ * nsnull to use a default scope
+ * @param aPrincipal the principal that produced the script
+ * @param aURL the URL or filename for error messages
+ * @param aLineNo the starting line number of the script for error messages
+ * @param aVersion the script language version to use when executing
+ * @param aRetValue the result of executing the script, or null for no result.
+ * If this is a JS context, it's the caller's responsibility to
+ * preserve aRetValue from GC across this call
+ * @param aIsUndefined true if the result of executing the script is the
+ * undefined value
+ *
+ * @return NS_OK if the script was valid and got executed
+ *
+ **/
+ virtual nsresult EvaluateString(const nsAString& aScript,
+ void *aScopeObject,
+ nsIPrincipal *aPrincipal,
+ const char *aURL,
+ PRUint32 aLineNo,
+ PRUint32 aVersion,
+ nsAString *aRetValue,
+ PRBool* aIsUndefined) = 0;
+
+ // Note JS bigotry remains here - 'void *aRetValue' is assumed to be a
+ // jsval. This must move to JSObject before it can be made agnostic.
+ virtual nsresult EvaluateStringWithValue(const nsAString& aScript,
+ void *aScopeObject,
+ nsIPrincipal *aPrincipal,
+ const char *aURL,
+ PRUint32 aLineNo,
+ PRUint32 aVersion,
+ void* aRetValue,
+ PRBool* aIsUndefined) = 0;
+
+ /**
+ * Compile a script.
+ *
+ * @param aText a PRUnichar buffer containing script source
+ * @param aTextLength number of characters in aText
+ * @param aScopeObject an object telling the scope in which to execute,
+ * or nsnull to use a default scope
+ * @param aPrincipal the principal that produced the script
+ * @param aURL the URL or filename for error messages
+ * @param aLineNo the starting line number of the script for error messages
+ * @param aVersion the script language version to use when executing
+ * @param aScriptObject an executable object that's the result of compiling
+ * the script.
+ *
+ * @return NS_OK if the script source was valid and got compiled.
+ *
+ **/
+ virtual nsresult CompileScript(const PRUnichar* aText,
+ PRInt32 aTextLength,
+ void* aScopeObject,
+ nsIPrincipal* aPrincipal,
+ const char* aURL,
+ PRUint32 aLineNo,
+ PRUint32 aVersion,
+ nsScriptObjectHolder &aScriptObject) = 0;
+
+ /**
+ * Execute a precompiled script object.
+ *
+ * @param aScriptObject an object representing the script to be executed
+ * @param aScopeObject an object telling the scope in which to execute,
+ * or nsnull to use a default scope
+ * @param aRetValue the result of executing the script, may be null in
+ * which case no result string is computed
+ * @param aIsUndefined true if the result of executing the script is the
+ * undefined value, may be null for "don't care"
+ *
+ * @return NS_OK if the script was valid and got executed
+ *
+ */
+ virtual nsresult ExecuteScript(void* aScriptObject,
+ void* aScopeObject,
+ nsAString* aRetValue,
+ PRBool* aIsUndefined) = 0;
+
+ /**
+ * Compile the event handler named by atom aName, with function body aBody
+ * into a function object returned if ok via aHandler. Does NOT bind the
+ * function to anything - BindCompiledEventHandler() should be used for that
+ * purpose. Note that this event handler is always considered 'shared' and
+ * hence is compiled without principals. Never call the returned object
+ * directly - it must be bound (and thereby cloned, and therefore have the
+ * correct principals) before use!
+ *
+ * @param aName an nsIAtom pointer naming the function; it must be lowercase
+ * and ASCII, and should not be longer than 63 chars. This bound on
+ * length is enforced only by assertions, so caveat caller!
+ * @param aEventName the name that the event object should be bound to
+ * @param aBody the event handler function's body
+ * @param aURL the URL or filename for error messages
+ * @param aLineNo the starting line number of the script for error messages
+ * @param aVersion the script language version to use when executing
+ * @param aHandler the out parameter in which a void pointer to the compiled
+ * function object is stored on success
+ *
+ * @return NS_OK if the function body was valid and got compiled
+ */
+ virtual nsresult CompileEventHandler(nsIAtom* aName,
+ PRUint32 aArgCount,
+ const char** aArgNames,
+ const nsAString& aBody,
+ const char* aURL,
+ PRUint32 aLineNo,
+ PRUint32 aVersion,
+ nsScriptObjectHolder &aHandler) = 0;
+
+ /**
+ * Call the function object with given args and return its boolean result,
+ * or true if the result isn't boolean.
+ *
+ * @param aTarget the event target
+ * @param aScript an object telling the scope in which to call the compiled
+ * event handler function.
+ * @param aHandler function object (function and static scope) to invoke.
+ * @param argv array of arguments. Note each element is assumed to
+ * be an nsIVariant.
+ * @param rval out parameter returning result
+ **/
+ virtual nsresult CallEventHandler(nsISupports* aTarget,
+ void *aScope, void* aHandler,
+ nsIArray *argv, nsIVariant **rval) = 0;
+
+ /**
+ * Bind an already-compiled event handler function to a name in the given
+ * scope object. The same restrictions on aName (lowercase ASCII, not too
+ * long) applies here as for CompileEventHandler. Scripting languages with
+ * static scoping must re-bind the scope chain for aHandler to begin (after
+ * the activation scope for aHandler itself, typically) with aTarget's scope.
+ *
+ * Logically, this 'bind' operation is more of a 'copy' - it simply
+ * stashes/associates the event handler function with the event target, so
+ * it can be fetched later with GetBoundEventHandler().
+ *
+ * @param aTarget an object telling the scope in which to bind the compiled
+ * event handler function. The context will presumably associate
+ * this nsISupports with a native script object.
+ * @param aName an nsIAtom pointer naming the function; it must be lowercase
+ * and ASCII, and should not be longer than 63 chars. This bound on
+ * length is enforced only by assertions, so caveat caller!
+ * @param aHandler the function object to name, created by an earlier call to
+ * CompileEventHandler
+ * @return NS_OK if the function was successfully bound to the name
+ *
+ * XXXmarkh - fold this in with SetProperty? Exactly the same concept!
+ */
+ virtual nsresult BindCompiledEventHandler(nsISupports* aTarget, void *aScope,
+ nsIAtom* aName,
+ void* aHandler) = 0;
+
+ /**
+ * Lookup a previously bound event handler for the specified target. This
+ * will return an object equivilent to the one passed to
+ * BindCompiledEventHandler (although the pointer may not be the same).
+ *
+ */
+ virtual nsresult GetBoundEventHandler(nsISupports* aTarget, void *aScope,
+ nsIAtom* aName,
+ nsScriptObjectHolder &aHandler) = 0;
+
+ /**
+ * Compile a function that isn't used as an event handler.
+ *
+ * NOTE: Not yet language agnostic (main problem is XBL - not yet agnostic)
+ * Caller must make sure aFunctionObject is a JS GC root.
+ *
+ **/
+ virtual nsresult CompileFunction(void* aTarget,
+ const nsACString& aName,
+ PRUint32 aArgCount,
+ const char** aArgArray,
+ const nsAString& aBody,
+ const char* aURL,
+ PRUint32 aLineNo,
+ PRUint32 aVersion,
+ PRBool aShared,
+ void **aFunctionObject) = 0;
+
+ /**
+ * Set the default scripting language version for this context, which must
+ * be a context specific to a particular scripting language.
+ *
+ **/
+ virtual void SetDefaultLanguageVersion(PRUint32 aVersion) = 0;
+
+ /**
+ * Return the global object.
+ *
+ **/
+ virtual nsIScriptGlobalObject *GetGlobalObject() = 0;
+
+ /**
+ * Return the native script context
+ *
+ **/
+ virtual void *GetNativeContext() = 0;
+
+ /**
+ * Return the native global object for this context.
+ *
+ **/
+ virtual void *GetNativeGlobal() = 0;
+
+ /**
+ * Create a new global object that will be used for an inner window.
+ * Return the native global and an nsISupports 'holder' that can be used
+ * to manage the lifetime of it.
+ */
+ virtual nsresult CreateNativeGlobalForInner(
+ nsIScriptGlobalObject *aNewInner,
+ PRBool aIsChrome,
+ void **aNativeGlobal,
+ nsISupports **aHolder) = 0;
+
+ /**
+ * Connect this context to a new inner window, to allow "prototype"
+ * chaining from the inner to the outer.
+ * Called after both the the inner and outer windows are initialized
+ **/
+ virtual nsresult ConnectToInner(nsIScriptGlobalObject *aNewInner,
+ void *aOuterGlobal) = 0;
+
+
+ /**
+ * Init this context ready for use. If aGlobalObject is not NULL, this
+ * function may initialize based on this global (for example, using the
+ * global to locate a chrome window, create a new 'scope' for this
+ * global, etc)
+ *
+ * @param aGlobalObject the gobal object, which may be nsnull.
+ *
+ * @return NS_OK if context initialization was successful
+ *
+ **/
+ virtual nsresult InitContext(nsIScriptGlobalObject *aGlobalObject) = 0;
+
+ /**
+ * Check to see if context is as yet intialized. Used to prevent
+ * reentrancy issues during the initialization process.
+ *
+ * @return PR_TRUE if initialized, PR_FALSE if not
+ *
+ */
+ virtual PRBool IsContextInitialized() = 0;
+
+ /**
+ * Called as the global object discards its reference to the context.
+ */
+ virtual void FinalizeContext() = 0;
+
+ /**
+ * For garbage collected systems, do a synchronous collection pass.
+ * May be a no-op on other systems
+ *
+ * @return NS_OK if the method is successful
+ */
+ virtual void GC() = 0;
+
+ /**
+ * Inform the context that a script was evaluated.
+ * A GC may be done if "necessary."
+ * This call is necessary if script evaluation is done
+ * without using the EvaluateScript method.
+ * @param aTerminated If true then call termination function if it was
+ * previously set. Within DOM this will always be true, but outside
+ * callers (such as xpconnect) who may do script evaluations nested
+ * inside DOM script evaluations can pass false to avoid premature
+ * calls to the termination function.
+ * @return NS_OK if the method is successful
+ */
+ virtual void ScriptEvaluated(PRBool aTerminated) = 0;
+
+ virtual nsresult Serialize(nsIObjectOutputStream* aStream,
+ void *aScriptObject) = 0;
+
+ /* Deserialize a script from a stream.
+ */
+ virtual nsresult Deserialize(nsIObjectInputStream* aStream,
+ nsScriptObjectHolder &aResult) = 0;
+
+ /**
+ * JS only - this function need not be implemented by languages other
+ * than JS (ie, this should be moved to a private interface!)
+ * Called to specify a function that should be called when the current
+ * script (if there is one) terminates. Generally used if breakdown
+ * of script state needs to happen, but should be deferred till
+ * the end of script evaluation.
+ *
+ * @throws NS_ERROR_OUT_OF_MEMORY if that happens
+ */
+ virtual nsresult SetTerminationFunction(nsScriptTerminationFunc aFunc,
+ nsISupports* aRef) = 0;
+
+ /**
+ * Called to disable/enable script execution in this context.
+ */
+ virtual PRBool GetScriptsEnabled() = 0;
+ virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
+
+ // SetProperty is suspect and jst believes should not be needed. Currenly
+ // used only for "arguments".
+ virtual nsresult SetProperty(void *aTarget, const char *aPropName, nsISupports *aVal) = 0;
+ /**
+ * Called to set/get information if the script context is
+ * currently processing a script tag
+ */
+ virtual PRBool GetProcessingScriptTag() = 0;
+ virtual void SetProcessingScriptTag(PRBool aResult) = 0;
+
+ /**
+ * Tell the context whether or not to GC when destroyed. An optimization
+ * used when the window is a [i]frame, so GC will happen anyway.
+ */
+ virtual void SetGCOnDestruction(PRBool aGCOnDestruction) = 0;
+
+ /**
+ * Initialize DOM classes on aGlobalObj, always call
+ * WillInitializeContext() before calling InitContext(), and always
+ * call DidInitializeContext() when a context is fully
+ * (successfully) initialized.
+ */
+ virtual nsresult InitClasses(void *aGlobalObj) = 0;
+
+ /**
+ * Clear the scope object - may be called either as we are being torn down,
+ * or before we are attached to a different document.
+ *
+ * aClearFromProtoChain is probably somewhat JavaScript specific. It
+ * indicates that the global scope polluter should be removed from the
+ * prototype chain and that the objects in the prototype chain should
+ * also have their scopes cleared. We don't do this all the time
+ * because the prototype chain is shared between inner and outer
+ * windows, and needs to stay with inner windows that we're keeping
+ * around.
+ */
+ virtual void ClearScope(void* aGlobalObj, PRBool aClearFromProtoChain) = 0;
+
+ /**
+ * Tell the context we're about to be reinitialize it.
+ */
+ virtual void WillInitializeContext() = 0;
+
+ /**
+ * Tell the context we're done reinitializing it.
+ */
+ virtual void DidInitializeContext() = 0;
+
+ /**
+ * Tell the context our global has a new document, and the scope
+ * used by it. Use nsISupports to avoid dependency issues - but expect
+ * a QI for nsIDOMDocument and/or nsIDocument.
+ */
+ virtual void DidSetDocument(nsISupports *aDoc, void *aGlobal) = 0;
+
+ /* Memory managment for script objects. Used by the implementation of
+ * nsScriptObjectHolder to manage the lifetimes of the held script objects.
+ *
+ * See also nsIScriptRuntime, which has identical methods and is useful
+ * in situations when you do not have an nsIScriptContext.
+ *
+ */
+ virtual nsresult DropScriptObject(void *object) = 0;
+ virtual nsresult HoldScriptObject(void *object) = 0;
+
+ /* Report a pending exception if there is one on the native context */
+ virtual void ReportPendingException() = 0;
+};
+
+//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContext, NS_ISCRIPTCONTEXT_IID) //SWT-20090407
+
+#endif // nsIScriptContext_h__
diff --git a/nsIScriptGlobalObject.h b/nsIScriptGlobalObject.h
new file mode 100644
index 0000000..276d40f
--- /dev/null
+++ b/nsIScriptGlobalObject.h
@@ -0,0 +1,196 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sw=2 et tw=80: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * This file is derived from the Original Code provided by mozilla.org,
+ * whose Initial Developer is Netscape Communications Corporation. Changes
+ * to the original file were made by SWT on April 7, 2009 and are marked
+ * with trailing comment "//SWT-20090407".
+ */
+
+#ifndef nsIScriptGlobalObject_h__
+#define nsIScriptGlobalObject_h__
+
+#include "nsISupports.h"
+//#include "nsEvent.h" //SWT-20090407
+#include "nsIProgrammingLanguage.h"
+
+class nsIScriptContext;
+class nsIDOMDocument;
+class nsIDOMEvent;
+class nsPresContext;
+class nsIScriptGlobalObjectOwner;
+class nsIArray;
+class nsScriptErrorEvent;
+class nsIScriptGlobalObject;
+//enum nsEventStatus; //SWT-20090407
+struct JSObject; // until we finally remove GetGlobalJSObject...
+
+// Some helpers for working with integer "script type IDs", and specifically
+// for working with arrays of such objects. For example, it is common for
+// implementations supporting multiple script languages to keep each
+// language's nsIScriptContext in an array indexed by the language ID.
+
+// Implementation note: We always ignore nsIProgrammingLanguage::UNKNOWN and
+// nsIProgrammingLanguage::CPLUSPLUS - this gives javascript slot 0. An
+// attempted micro-optimization tried to avoid us going all the way to
+// nsIProgrammingLanguage::MAX; however:
+// * Someone is reportedly working on a PHP impl - that has value 9
+// * nsGenericElement therefore allows 4 bits for the value.
+// So there is no good reason for us to be more restrictive again...
+
+#define NS_STID_FIRST nsIProgrammingLanguage::JAVASCRIPT
+// like nsGenericElement, only 4 bits worth is valid...
+#define NS_STID_LAST (nsIProgrammingLanguage::MAX > 0x000FU ? \
+ 0x000FU : nsIProgrammingLanguage::MAX)
+
+// Use to declare the array size
+#define NS_STID_ARRAY_UBOUND (NS_STID_LAST-NS_STID_FIRST+1)
+
+// Is a language ID valid?
+#define NS_STID_VALID(langID) (langID >= NS_STID_FIRST && langID <= NS_STID_LAST)
+
+// Return an index for a given ID.
+#define NS_STID_INDEX(langID) (langID-NS_STID_FIRST)
+
+// Create a 'for' loop iterating over all possible language IDs (*not* indexes)
+#define NS_STID_FOR_ID(varName) \
+ for (varName=NS_STID_FIRST;varName<=NS_STID_LAST;varName++)
+
+// Create a 'for' loop iterating over all indexes (when you don't need to know
+// what language it is)
+#define NS_STID_FOR_INDEX(varName) \
+ for (varName=0;varName<=NS_STID_INDEX(NS_STID_LAST);varName++)
+
+// A helper function for nsIScriptGlobalObject implementations to use
+// when handling a script error. Generally called by the global when a context
+// notifies it of an error via nsIScriptGlobalObject::HandleScriptError.
+// Returns PR_TRUE if HandleDOMEvent was actually called, in which case
+// aStatus will be filled in with the status.
+//PRBool //SWT-20090407
+//NS_HandleScriptError(nsIScriptGlobalObject *aScriptGlobal, //SWT-20090407
+// nsScriptErrorEvent *aErrorEvent, //SWT-20090407
+// nsEventStatus *aStatus); //SWT-20090407
+
+
+#define NS_ISCRIPTGLOBALOBJECT_IID \
+{ /* {6afecd40-0b9a-4cfd-8c42-0f645cd91829} */ \
+ 0x6afecd40, 0x0b9a, 0x4cfd, \
+ { 0x8c, 0x42, 0x0f, 0x64, 0x5c, 0xd9, 0x18, 0x29 } }
+
+/**
++ * The global object which keeps a script context for each supported script
++ * language. This often used to store per-window global state.
+ */
+
+class nsIScriptGlobalObject : public nsISupports
+{
+public:
+//NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20090407
+
+ /**
+ * Ensure that the script global object is initialized for working with the
+ * specified script language ID. This will set up the nsIScriptContext
+ * and 'script global' for that language, allowing these to be fetched
+ * and manipulated.
+ * @return NS_OK if successful; error conditions include that the language
+ * has not been registered, as well as 'normal' errors, such as
+ * out-of-memory
+ */
+ virtual nsresult EnsureScriptEnvironment(PRUint32 aLangID) = 0;
+ /**
+ * Get a script context (WITHOUT added reference) for the specified language.
+ */
+ virtual nsIScriptContext *GetScriptContext(PRUint32 lang) = 0;
+
+ /**
+ * Get the opaque "global" object for the specified lang.
+ */
+ virtual void *GetScriptGlobal(PRUint32 lang) = 0;
+
+ // Set/GetContext deprecated methods - use GetScriptContext/Global
+ virtual JSObject *GetGlobalJSObject() {
+ return (JSObject *)GetScriptGlobal(nsIProgrammingLanguage::JAVASCRIPT);
+ }
+
+ virtual nsIScriptContext *GetContext() {
+ return GetScriptContext(nsIProgrammingLanguage::JAVASCRIPT);
+ }
+
+ /**
+ * Set a new language context for this global. The native global for the
+ * context is created by the context's GetNativeGlobal() method.
+ */
+
+ virtual nsresult SetScriptContext(PRUint32 lang, nsIScriptContext *aContext) = 0;
+
+ /**
+ * Called when the global script for a language is finalized, typically as
+ * part of its GC process. By the time this call is made, the
+ * nsIScriptContext for the language has probably already been removed.
+ * After this call, the passed object is dead - which should generally be the
+ * same object the global is using for a global for that language.
+ */
+
+ virtual void OnFinalize(PRUint32 aLangID, void *aScriptGlobal) = 0;
+
+ /**
+ * Called to enable/disable scripts.
+ */
+ virtual void SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
+
+ /** Set a new arguments object for this window. This will be set on
+ * the window right away (if there's an existing document) and it
+ * will also be installed on the window when the next document is
+ * loaded. Each language impl is responsible for converting to
+ * an array of args as appropriate for that language.
+ */
+ virtual nsresult SetNewArguments(nsIArray *aArguments) = 0;
+
+ /** Handle a script error. Generally called by a script context.
+ */
+//virtual nsresult HandleScriptError(nsScriptErrorEvent *aErrorEvent, //SWT-20090407
+// nsEventStatus *aEventStatus) { //SWT-20090407
+// return NS_HandleScriptError(this, aErrorEvent, aEventStatus); //SWT-20090407
+//}
+};
+
+//NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptGlobalObject, //SWT-20090407
+// NS_ISCRIPTGLOBALOBJECT_IID) //SWT-20090407
+
+#endif
diff --git a/org/eclipse/swt/SWT.java b/org/eclipse/swt/SWT.java
index fb9b8a2..9369dc3 100644
--- a/org/eclipse/swt/SWT.java
+++ b/org/eclipse/swt/SWT.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -876,11 +876,13 @@ public class SWT {
/**
* Style constant for drop down menu/list behavior (value is 1<<2).
+ * <br>Note that for <code>DateTime</code> this is a <em>HINT</em>.
* <p><b>Used By:</b><ul>
* <li><code>Menu</code></li>
* <li><code>ToolItem</code></li>
* <li><code>CoolItem</code></li>
* <li><code>Combo</code></li>
+ * <li><code>DateTime</code></li>
* </ul></p>
*/
public static final int DROP_DOWN = 1 << 2;
@@ -965,6 +967,8 @@ public class SWT {
* <p><b>Used By:</b><ul>
* <li><code>Text</code></li>
* <li><code>List</code></li>
+ * <li><code>Table</code></li>
+ * <li><code>Tree</code></li>
* <li><code>FileDialog</code></li>
* </ul></p>
*/
@@ -1230,6 +1234,25 @@ public class SWT {
* </ul></p>
*/
public static final int ON_TOP = 1 << 14;
+
+ /**
+ * Style constant for sheet window behavior (value is 1<<28).
+ * <p>
+ * A sheet window is a window intended to be used as a temporary modal
+ * dialog that is attached to a parent window. It is typically used to
+ * prompt the user before proceeding. The window trim, positioning and
+ * general look of a sheet window is platform specific. For example,
+ * on the Macintosh, at the time this documentation was written, the
+ * window title is not visible.
+ * <br>Note that this is a <em>HINT</em>.
+ * </p><p><b>Used By:</b><ul>
+ * <li><code>Dialog</code> and subclasses</li>
+ * <li><code>Shell</code> and subclasses</li>
+ * </ul></p>
+ *
+ * @since 3.5
+ */
+ public static final int SHEET = 1 << 28;
/**
* Trim style convenience constant for the most common top level shell appearance
@@ -1393,6 +1416,7 @@ public class SWT {
* Style constant for preventing child radio group behavior (value is 1<<22).
* <p><b>Used By:</b><ul>
* <li><code>Composite</code></li>
+ * <li><code>Menu</code></li>
* </ul></p>
*/
public static final int NO_RADIO_GROUP = 1 << 22;
@@ -1548,6 +1572,24 @@ public class SWT {
public static final int UNDERLINE_SQUIGGLE = 3;
/**
+ * Style constant to indicate link underline (value is 0).
+ * <p>
+ * If the text color or the underline color are not set in the range
+ * the usage of <code>UNDERLINE_LINK</code> will change these colors
+ * to the preferred link color of the platform.<br>
+ * Note that clients that use this style, such as <code>StyledText</code>,
+ * will include code to track the mouse and change the cursor to the hand
+ * cursor when mouse is over the link.
+ * </p>
+ * <p><b>Used By:</b><ul>
+ * <li><code>TextStyle</code></li>
+ * </ul></p>
+ *
+ * @since 3.5
+ */
+ public static final int UNDERLINE_LINK = 4;
+
+ /**
* Style constant to indicate solid border (value is 1).
* <p><b>Used By:</b><ul>
* <li><code>TextStyle</code></li>
@@ -2449,6 +2491,41 @@ public class SWT {
* behavior (value is 1<<4).
*/
public static final int ICON_WORKING = 1 << 4;
+
+ /**
+ * The style constant for "search" icon. This style constant is
+ * used with <code>Text</code> in combination with <code>SWT.SEARCH
+ * </code> (value is 1<<9).
+ * <br>Note that this is a <em>HINT</em>.
+ *
+ * <p><b>Used By:</b><ul>
+ * <li><code>Text</code></li>
+ * </ul></p>
+ *
+ * @see #SEARCH
+ * @see #ICON_CANCEL
+ *
+ * @since 3.5
+ */
+ public static final int ICON_SEARCH = 1 << 9;
+
+ /**
+ * The style constant for "cancel" icon. This style constant is
+ * used with <code>Text</code> in combination with <code>SWT.SEARCH
+ * </code> (value is 1<<8).
+ * <br>Note that this is a <em>HINT</em>.
+ *
+ * <p><b>Used By:</b><ul>
+ * <li><code>Text</code></li>
+ * </ul></p>
+ *
+ * @see #SEARCH
+ * @see #ICON_SEARCH
+ *
+ * @since 3.5
+ */
+ public static final int ICON_CANCEL = 1 << 8;
+
/**
* The <code>MessageBox</code> style constant for an OK button;
@@ -2474,12 +2551,10 @@ public class SWT {
/**
* The <code>MessageBox</code> style constant for a CANCEL button;
* valid combinations are OK|CANCEL, YES|NO|CANCEL, RETRY|CANCEL
- * (value is 1<<8). This style constant is also used with
- * <code>Text</code> in combination with SEARCH.
+ * (value is 1<<8).
*
* <p><b>Used By:</b><ul>
* <li><code>MessageBox</code></li>
- * <li><code>Text</code></li>
* </ul></p>
*/
public static final int CANCEL = 1 << 8;
@@ -3078,6 +3153,32 @@ public class SWT {
*/
public static final int ERROR_INVALID_FONT = 48;
+ /**
+ * SWT error constant indicating that an attempt was made to
+ * use an BrowserFunction object which had already been disposed
+ * (value is 49).
+ *
+ * @since 3.5
+ */
+ public static final int ERROR_FUNCTION_DISPOSED = 49;
+
+ /**
+ * SWT error constant indicating that an exception happened
+ * when evaluating a javascript expression
+ * (value is 50).
+ *
+ * @since 3.5
+ */
+ public static final int ERROR_FAILED_EVALUATE = 50;
+
+ /**
+ * SWT error constant indicating that an invalid value was returned
+ * (value is 51).
+ *
+ * @since 3.5
+ */
+ public static final int ERROR_INVALID_RETURN_VALUE = 51;
+
/**
* Constant indicating that an image or operation is of type bitmap (value is 0).
*/
@@ -3585,6 +3686,7 @@ static String findErrorText (int code) {
case ERROR_NO_MORE_CALLBACKS: return "No more callbacks"; //$NON-NLS-1$
case ERROR_NULL_ARGUMENT: return "Argument cannot be null"; //$NON-NLS-1$
case ERROR_INVALID_ARGUMENT: return "Argument not valid"; //$NON-NLS-1$
+ case ERROR_INVALID_RETURN_VALUE: return "Return value not valid"; //$NON-NLS-1$
case ERROR_INVALID_RANGE: return "Index out of bounds"; //$NON-NLS-1$
case ERROR_CANNOT_BE_ZERO: return "Argument cannot be zero"; //$NON-NLS-1$
case ERROR_CANNOT_GET_ITEM: return "Cannot get item"; //$NON-NLS-1$
@@ -3614,7 +3716,9 @@ static String findErrorText (int code) {
case ERROR_INVALID_SUBCLASS: return "Subclassing not allowed"; //$NON-NLS-1$
case ERROR_GRAPHIC_DISPOSED: return "Graphic is disposed"; //$NON-NLS-1$
case ERROR_DEVICE_DISPOSED: return "Device is disposed"; //$NON-NLS-1$
+ case ERROR_FUNCTION_DISPOSED: return "BrowserFunction is disposed"; //$NON-NLS-1$
case ERROR_FAILED_EXEC: return "Failed to execute runnable"; //$NON-NLS-1$
+ case ERROR_FAILED_EVALUATE: return "Failed to evaluate javascript expression"; //$NON-NLS-1$
case ERROR_FAILED_LOAD_LIBRARY: return "Unable to load library"; //$NON-NLS-1$
case ERROR_CANNOT_INVERT_MATRIX: return "Cannot invert matrix"; //$NON-NLS-1$
case ERROR_NO_GRAPHICS_LIBRARY: return "Unable to load graphics library"; //$NON-NLS-1$
@@ -3639,7 +3743,7 @@ public static String getMessage(String key) {
/**
* Returns the SWT platform name.
- * Examples: "win32", "motif", "gtk", "photon", "carbon"
+ * Examples: "win32", "motif", "gtk", "photon", "carbon", "cocoa", "wpf"
*
* @return the SWT platform name
*/
@@ -3767,12 +3871,15 @@ public static void error (int code, Throwable throwable, String detail) {
case ERROR_WIDGET_DISPOSED:
case ERROR_GRAPHIC_DISPOSED:
case ERROR_DEVICE_DISPOSED:
+ case ERROR_FUNCTION_DISPOSED:
case ERROR_INVALID_IMAGE:
case ERROR_UNSUPPORTED_DEPTH:
case ERROR_UNSUPPORTED_FORMAT:
case ERROR_FAILED_EXEC:
+ case ERROR_FAILED_EVALUATE:
case ERROR_CANNOT_INVERT_MATRIX:
case ERROR_NO_GRAPHICS_LIBRARY:
+ case ERROR_INVALID_RETURN_VALUE:
case ERROR_IO: {
SWTException exception = new SWTException (code, message);
exception.throwable = throwable;
@@ -3827,7 +3934,7 @@ static {
* to stop the compiler from inlining.
*/
String platform = getPlatform ();
- if ("carbon".equals (platform)) { //$NON-NLS-1$
+ if ("carbon".equals (platform) || "cocoa".equals (platform)) { //$NON-NLS-1$ //$NON-NLS-2$
MOD1 = COMMAND;
MOD2 = SHIFT;
MOD3 = ALT;
diff --git a/org/eclipse/swt/accessibility/ACC.java b/org/eclipse/swt/accessibility/ACC.java
index f9ba2f5..79179c5 100644
--- a/org/eclipse/swt/accessibility/ACC.java
+++ b/org/eclipse/swt/accessibility/ACC.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -51,6 +51,8 @@ public class ACC {
public static final int ROLE_PUSHBUTTON = 0x2b;
public static final int ROLE_CHECKBUTTON = 0x2c;
public static final int ROLE_RADIOBUTTON = 0x2d;
+ /** @since 3.5 */
+ public static final int ROLE_SPLITBUTTON = 0x3e;
public static final int ROLE_COMBOBOX = 0x2e;
public static final int ROLE_TEXT = 0x2a;
public static final int ROLE_TOOLBAR = 0x16;
diff --git a/org/eclipse/swt/accessibility/Accessible.java b/org/eclipse/swt/accessibility/Accessible.java
index bda2baf..6a2a5d5 100644
--- a/org/eclipse/swt/accessibility/Accessible.java
+++ b/org/eclipse/swt/accessibility/Accessible.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -46,6 +46,12 @@ public class Accessible {
AccessibleObject accessibleObject;
Control control;
+ /**
+ * @since 3.5
+ */
+ protected Accessible() {
+ }
+
Accessible (Control control) {
super ();
this.control = control;
@@ -209,9 +215,6 @@ public class Accessible {
accessibleObject.release ();
accessibleObject = null;
}
- accessibleListeners = null;
- controlListeners = null;
- textListeners = null;
}
/**
* Removes the listener from the collection of listeners who will
diff --git a/org/eclipse/swt/accessibility/AccessibleFactory.java b/org/eclipse/swt/accessibility/AccessibleFactory.java
index 82a13dc..c6f6300 100644
--- a/org/eclipse/swt/accessibility/AccessibleFactory.java
+++ b/org/eclipse/swt/accessibility/AccessibleFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@ class AccessibleFactory {
static final int[] actionRoles = {
ACC.ROLE_CHECKBUTTON, ACC.ROLE_COMBOBOX, ACC.ROLE_LINK,
ACC.ROLE_MENUITEM, ACC.ROLE_PUSHBUTTON, ACC.ROLE_RADIOBUTTON,
+ ACC.ROLE_SPLITBUTTON,
};
static final int[] hypertextRoles = {ACC.ROLE_LINK};
static final int[] selectionRoles = {
diff --git a/org/eclipse/swt/accessibility/AccessibleListener.java b/org/eclipse/swt/accessibility/AccessibleListener.java
index eb2afab..e54c7ea 100644
--- a/org/eclipse/swt/accessibility/AccessibleListener.java
+++ b/org/eclipse/swt/accessibility/AccessibleListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/accessibility/AccessibleObject.java b/org/eclipse/swt/accessibility/AccessibleObject.java
index 34ce187..00b05d5 100644
--- a/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -74,7 +74,7 @@ class AccessibleObject {
AccessibleListener[] listeners = object.getAccessibleListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleEvent event = new AccessibleEvent (object);
+ AccessibleEvent event = new AccessibleEvent (object.accessible);
event.childID = object.id;
if (parentResult != 0) {
int length = OS.strlen (parentResult);
@@ -109,7 +109,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
if (parentResult != 0) {
int length = OS.strlen (parentResult);
@@ -153,7 +153,7 @@ class AccessibleObject {
OS.memmove (parentY, y, 4);
OS.memmove (parentWidth, width, 4);
OS.memmove (parentHeight, height, 4);
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.x = parentX [0]; event.y = parentY [0];
event.width = parentWidth [0]; event.height = parentHeight [0];
@@ -211,7 +211,7 @@ class AccessibleObject {
int[] parentX = new int [1], parentY = new int [1];
OS.memmove (parentX, x, 4);
OS.memmove (parentY, y, 4);
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.x = parentX [0]; event.y = parentY [0];
if (coord_type == ATK.ATK_XY_WINDOW) {
@@ -266,7 +266,7 @@ class AccessibleObject {
int[] parentWidth = new int [1], parentHeight = new int [1];
OS.memmove (parentWidth, width, 4);
OS.memmove (parentHeight, height, 4);
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.width = parentWidth [0]; event.height = parentHeight [0];
for (int i = 0; i < listeners.length; i++) {
@@ -293,7 +293,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.x = (int)/*64*/x; event.y = (int)/*64*/y;
if (coord_type == ATK.ATK_XY_WINDOW) {
@@ -350,7 +350,7 @@ class AccessibleObject {
AccessibleListener[] listeners = object.getAccessibleListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleEvent event = new AccessibleEvent (object);
+ AccessibleEvent event = new AccessibleEvent (object.accessible);
event.childID = object.id;
if (parentResult != 0) {
int length = OS.strlen (parentResult);
@@ -383,7 +383,7 @@ class AccessibleObject {
AccessibleListener[] listeners = object.getAccessibleListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleEvent event = new AccessibleEvent (object);
+ AccessibleEvent event = new AccessibleEvent (object.accessible);
event.childID = object.id;
if (parentResult != 0) {
int length = OS.strlen (parentResult);
@@ -416,7 +416,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.detail = (int)/*64*/parentResult;
for (int i = 0; i < listeners.length; i++) {
@@ -455,7 +455,7 @@ class AccessibleObject {
if (object == null) return 0;
if (object.getAccessibleListeners ().length != 0) {
AccessibleControlListener[] listeners = object.getControlListeners ();
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.detail = -1;
for (int i = 0; i < listeners.length; i++) {
@@ -492,6 +492,7 @@ class AccessibleObject {
case ACC.ROLE_TREE: return ATK.ATK_ROLE_TREE;
case ACC.ROLE_TREEITEM: return ATK.ATK_ROLE_LIST_ITEM;
case ACC.ROLE_RADIOBUTTON: return ATK.ATK_ROLE_RADIO_BUTTON;
+ case ACC.ROLE_SPLITBUTTON: return ATK.ATK_ROLE_PUSH_BUTTON;
case ACC.ROLE_WINDOW: return ATK.ATK_ROLE_WINDOW;
}
}
@@ -535,7 +536,7 @@ class AccessibleObject {
if (listeners.length == 0) return parentResult;
int /*long*/ set = parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
event.detail = -1;
for (int i = 0; i < listeners.length; i++) {
@@ -579,7 +580,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
for (int i = 0; i < listeners.length; i++) {
listeners [i].getSelection (event);
@@ -607,7 +608,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = object.getControlListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleControlEvent event = new AccessibleControlEvent (object);
+ AccessibleControlEvent event = new AccessibleControlEvent (object.accessible);
event.childID = object.id;
for (int i = 0; i < listeners.length; i++) {
listeners [i].getSelection (event);
@@ -637,7 +638,7 @@ class AccessibleObject {
AccessibleTextListener[] listeners = object.getTextListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleTextEvent event = new AccessibleTextEvent (object);
+ AccessibleTextEvent event = new AccessibleTextEvent (object.accessible);
event.childID = object.id;
event.offset = (int)/*64*/parentResult;
for (int i = 0; i < listeners.length; i++) {
@@ -696,7 +697,7 @@ class AccessibleObject {
AccessibleTextListener[] listeners = object.getTextListeners ();
if (listeners.length == 0) return parentResult;
- AccessibleTextEvent event = new AccessibleTextEvent (object);
+ AccessibleTextEvent event = new AccessibleTextEvent (object.accessible);
event.childID = object.id;
for (int i = 0; i < listeners.length; i++) {
listeners [i].getSelectionRange (event);
@@ -721,7 +722,7 @@ class AccessibleObject {
AccessibleTextListener[] listeners = object.getTextListeners ();
if (listeners.length == 0) return 0;
- AccessibleTextEvent event = new AccessibleTextEvent (object);
+ AccessibleTextEvent event = new AccessibleTextEvent (object.accessible);
event.childID = object.id;
int[] parentStart = new int [1];
int[] parentEnd = new int [1];
@@ -1230,7 +1231,7 @@ class AccessibleObject {
}
AccessibleControlListener[] controlListeners = getControlListeners ();
if (controlListeners.length == 0) return parentText;
- AccessibleControlEvent event = new AccessibleControlEvent (this);
+ AccessibleControlEvent event = new AccessibleControlEvent (accessible);
event.childID = id;
event.result = parentText;
for (int i = 0; i < controlListeners.length; i++) {
@@ -1356,7 +1357,7 @@ class AccessibleObject {
AccessibleControlListener[] listeners = getControlListeners ();
if (listeners.length == 0) return;
- AccessibleControlEvent event = new AccessibleControlEvent (this);
+ AccessibleControlEvent event = new AccessibleControlEvent (accessible);
for (int i = 0; i < listeners.length; i++) {
listeners [i].getChildren (event);
}
diff --git a/org/eclipse/swt/accessibility/AccessibleTextListener.java b/org/eclipse/swt/accessibility/AccessibleTextListener.java
index 6d1a7ee..8169e72 100644
--- a/org/eclipse/swt/accessibility/AccessibleTextListener.java
+++ b/org/eclipse/swt/accessibility/AccessibleTextListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/awt/SWT_AWT.java b/org/eclipse/swt/awt/SWT_AWT.java
index 24fcdd5..2dead66 100644
--- a/org/eclipse/swt/awt/SWT_AWT.java
+++ b/org/eclipse/swt/awt/SWT_AWT.java
@@ -35,6 +35,7 @@ import java.awt.Window;
import java.awt.event.AWTEventListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
import java.awt.event.WindowEvent;
@@ -309,15 +310,22 @@ public static Shell new_Shell (final Display display, final Canvas parent) {
if (handle == 0) SWT.error (SWT.ERROR_INVALID_ARGUMENT, null, " [peer not created]");
final Shell shell = Shell.gtk_new (display, handle);
- parent.addComponentListener(new ComponentAdapter () {
+ final ComponentListener listener = new ComponentAdapter () {
public void componentResized (ComponentEvent e) {
display.syncExec (new Runnable () {
public void run () {
+ if (shell.isDisposed()) return;
Dimension dim = parent.getSize ();
shell.setSize (dim.width, dim.height);
}
});
}
+ };
+ parent.addComponentListener(listener);
+ shell.addListener(SWT.Dispose, new Listener() {
+ public void handleEvent(Event event) {
+ parent.removeComponentListener(listener);
+ }
});
shell.setVisible (true);
return shell;
diff --git a/org/eclipse/swt/browser/AppFileLocProvider.java b/org/eclipse/swt/browser/AppFileLocProvider.java
index e609b5a..8971565 100644
--- a/org/eclipse/swt/browser/AppFileLocProvider.java
+++ b/org/eclipse/swt/browser/AppFileLocProvider.java
@@ -20,7 +20,7 @@ class AppFileLocProvider {
XPCOMObject directoryServiceProvider;
XPCOMObject directoryServiceProvider2;
int refCount = 0;
- String mozillaPath, profilePath;
+ String mozillaPath, profilePath, componentsPath;
String[] pluginDirs;
boolean isXULRunner;
@@ -33,6 +33,13 @@ class AppFileLocProvider {
static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
+
+ static boolean IsSparc;
+ static {
+ String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+ String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
+ IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
AppFileLocProvider (String path) {
mozillaPath = path + SEPARATOR_OS;
@@ -118,6 +125,10 @@ int Release () {
return refCount;
}
+void setComponentsPath (String path) {
+ componentsPath = path;
+}
+
void setProfilePath (String path) {
profilePath = path;
if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$
@@ -170,18 +181,28 @@ int getFiles (int /*long*/ prop, int /*long*/ _retval) {
if (segment.length () > 0) segments.addElement (segment);
} while (end != -1);
int segmentsSize = segments.size ();
- pluginDirs = new String [segmentsSize + 2];
+ pluginDirs = new String [segmentsSize + (IsSparc ? 1 : 2)];
for (index = 0; index < segmentsSize; index++) {
pluginDirs[index] = (String)segments.elementAt (index);
}
}
}
if (pluginDirs == null) {
- pluginDirs = new String[2];
+ pluginDirs = new String[IsSparc ? 1 : 2];
}
/* set the next value to the GRE path + "plugins" */
- pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+
+ /*
+ * Bug on Solaris SPARC. Attempting to start the java plug-in fails with an
+ * error indicating that PR_NewMonitor could not be found. This is a well-
+ * known problem that many other apps have also encountered, with no
+ * resolution other than to remove this plug-in. The Browser workaround is
+ * to not add the directory containing this plug-in to the plug-in search path.
+ */
+ if (!IsSparc) {
+ pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
+ }
/* set the next value to the home directory + "/.mozilla/plugins" */
pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
@@ -264,7 +285,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
} else if (propertyName.equals (XPCOM.NS_GRE_DIR)) {
propertyValue = mozillaPath;
} else if (propertyName.equals (XPCOM.NS_GRE_COMPONENT_DIR)) {
- propertyValue = mozillaPath + COMPONENTS_DIR;
+ propertyValue = componentsPath != null ? componentsPath : mozillaPath + COMPONENTS_DIR;
} else if (propertyName.equals (XPCOM.NS_XPCOM_INIT_CURRENT_PROCESS_DIR)) {
propertyValue = mozillaPath;
} else if (propertyName.equals (XPCOM.NS_OS_CURRENT_PROCESS_DIR)) {
diff --git a/org/eclipse/swt/browser/AuthenticationEvent.java b/org/eclipse/swt/browser/AuthenticationEvent.java
new file mode 100644
index 0000000..9feeec1
--- /dev/null
+++ b/org/eclipse/swt/browser/AuthenticationEvent.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.browser;
+
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.events.*;
+
+/**
+ * An <code>AuthenticationEvent</code> is sent by a {@link Browser}
+ * to {@link AuthenticationListener}'s when the <code>Browser</code>
+ * navigates to a page that requires authentication. This event allows
+ * a client to either supply authentication credentials, cancel the
+ * authentication, or do nothing (which causes an authentication prompter
+ * to be shown to the user).
+ *
+ * @since 3.5
+ */
+public class AuthenticationEvent extends TypedEvent {
+ /** The location that triggered the authentication challenge */
+ public String location;
+
+ /** The user name to authenticate with */
+ public String user;
+
+ /** The password to authenticate with */
+ public String password;
+
+ /**
+ * A flag indicating whether the authentication should proceed.
+ * Setting this field to <code>false</code> will cancel the operation.
+ */
+ public boolean doit = true;
+
+ static final long serialVersionUID = -8322331206780057921L;
+
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param widget the widget that fired the event
+ *
+ * @since 3.5
+ */
+public AuthenticationEvent(Widget widget) {
+ super(widget);
+}
+
+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the event
+ */
+public String toString() {
+ String string = super.toString ();
+ return string.substring (0, string.length() - 1) // remove trailing '}'
+ + " name=" + user
+ + " password=" + password
+ + " location=" + location
+ + "}";
+}
+}
diff --git a/org/eclipse/swt/browser/AuthenticationListener.java b/org/eclipse/swt/browser/AuthenticationListener.java
new file mode 100644
index 0000000..4f8d342
--- /dev/null
+++ b/org/eclipse/swt/browser/AuthenticationListener.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.browser;
+
+import org.eclipse.swt.internal.SWTEventListener;
+
+/**
+ * This listener interface may be implemented in order to receive
+ * an {@link AuthenticationEvent} notification when the {@link Browser}
+ * encounters a page that requires authentication.
+ *
+ * @see Browser#addAuthenticationListener(AuthenticationListener)
+ * @see Browser#removeAuthenticationListener(AuthenticationListener)
+ *
+ * @since 3.5
+ */
+public interface AuthenticationListener extends SWTEventListener {
+
+/**
+ * This method is called when a page is navigated to that requires
+ * authentication.
+ * <p>
+ * Setting both the event's <code>user</code> and <code>password</code>
+ * fields causes these values to be used as credentials for authentication.
+ * Leaving one or both of these fields as <code>null</code> indicates
+ * that credentials are not known, so an authentication prompter should
+ * be shown to the user. Otherwise, setting the event's <code>doit</code>
+ * field to <code>false</code> cancels the authentication challenge, and
+ * the page will not be loaded.
+ * <p>
+ *
+ * <p>The following fields in the <code>AuthenticationEvent</code> apply:
+ * <ul>
+ * <li>(in) widget the <code>Browser</code> that is attempting to show the
+ * page that requires authentication
+ * <li>(in) location the location issuing the authentication challenge
+ * <li>(in/out) doit can be set to <code>false</code> to cancel the
+ * authentication challenge
+ * <li>(out) user the user name to authenticate with
+ * <li>(out) password the password to authenticate with
+ * </ul>
+ *
+ * @param event the <code>AuthenticationEvent</code> that can be used to
+ * either supply authentication credentials, defer credential input to
+ * an authentication prompter, or cancel an authentication challenge.
+ */
+public void authenticate(AuthenticationEvent event);
+}
diff --git a/org/eclipse/swt/browser/Browser.java b/org/eclipse/swt/browser/Browser.java
index 2624d41..05fcc05 100644
--- a/org/eclipse/swt/browser/Browser.java
+++ b/org/eclipse/swt/browser/Browser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@ import org.eclipse.swt.widgets.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Browser extends Composite {
@@ -159,6 +160,10 @@ static int checkStyle(int style) {
return style;
}
+protected void checkWidget () {
+ super.checkWidget ();
+}
+
/**
* Clears all session cookies from all current Browser instances.
*
@@ -168,6 +173,84 @@ public static void clearSessions () {
WebBrowser.clearSessions ();
}
+/**
+ * Returns the value of a cookie that is associated with a URL.
+ * Note that cookies are shared amongst all Browser instances.
+ *
+ * @param name the cookie name
+ * @param url the URL that the cookie is associated with
+ * @return the cookie value, or <code>null</code> if no such cookie exists
+ *
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT - if the name is null</li>
+ * <li>ERROR_NULL_ARGUMENT - if the url is null</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public static String getCookie (String name, String url) {
+ if (name == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ if (url == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ return WebBrowser.GetCookie (name, url);
+}
+
+/**
+ * Sets a cookie on a URL. Note that cookies are shared amongst all Browser instances.
+ *
+ * The <code>value</code> parameter must be a cookie header string that
+ * complies with <a href="http://www.ietf.org/rfc/rfc2109.txt">RFC 2109</code>.
+ * The value is passed through to the native browser unchanged.
+ * <p>
+ * Example value strings:
+ * <code>foo=bar</code> (basic session cookie)
+ * <code>foo=bar; path=/; domain=.eclipse.org</code> (session cookie)
+ * <code>foo=bar; expires=Thu, 01-Jan-2030 00:00:01 GMT</code> (persistent cookie)
+ * <code>foo=; expires=Thu, 01-Jan-1970 00:00:01 GMT</code> (deletes cookie <code>foo</code>)
+ *
+ * @param value the cookie value
+ * @param url the URL to associate the cookie with
+ * @return <code>true</code> if the cookie was successfully set and <code>false</code> otherwise
+ *
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT - if the value is null</li>
+ * <li>ERROR_NULL_ARGUMENT - if the url is null</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public static boolean setCookie (String value, String url) {
+ if (value == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ if (url == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ return WebBrowser.SetCookie (value, url);
+}
+
+/**
+ * Adds the listener to the collection of listeners who will be
+ * notified when authentication is required.
+ * <p>
+ * This notification occurs when a page requiring authentication is
+ * encountered.
+ * </p>
+ *
+ * @param listener the listener which should be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ * <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void addAuthenticationListener (AuthenticationListener listener) {
+ checkWidget();
+ if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ webBrowser.addAuthenticationListener (listener);
+}
+
/**
* Adds the listener to the collection of listeners who will be
* notified when the window hosting the receiver should be closed.
@@ -377,10 +460,12 @@ protected void checkSubclass () {
}
/**
- * Execute the specified script.
- *
+ * Executes the specified script.
* <p>
- * Execute a script containing javascript commands in the context of the current document.
+ * Executes a script containing javascript commands in the context of the current document.
+ * If document-defined functions or properties are accessed by the script then this method
+ * should not be invoked until the document has finished loading (<code>ProgressListener.completed()</code>
+ * gives notification of this).
*
* @param script the script with javascript commands
*
@@ -395,6 +480,8 @@ protected void checkSubclass () {
* <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
* </ul>
*
+ * @see ProgressListener#completed(ProgressEvent)
+ *
* @since 3.1
*/
public boolean execute (String script) {
@@ -404,6 +491,55 @@ public boolean execute (String script) {
}
/**
+ * Returns the result, if any, of executing the specified script.
+ * <p>
+ * Evaluates a script containing javascript commands in the context of
+ * the current document. If document-defined functions or properties
+ * are accessed by the script then this method should not be invoked
+ * until the document has finished loading (<code>ProgressListener.completed()</code>
+ * gives notification of this).
+ * </p><p>
+ * If the script returns a value with a supported type then a java
+ * representation of the value is returned. The supported
+ * javascript -> java mappings are:
+ * <ul>
+ * <li>javascript null or undefined -> <code>null</code></li>
+ * <li>javascript number -> <code>java.lang.Double</code></li>
+ * <li>javascript string -> <code>java.lang.String</code></li>
+ * <li>javascript boolean -> <code>java.lang.Boolean</code></li>
+ * <li>javascript array whose elements are all of supported types -> <code>java.lang.Object[]</code></li>
+ * </ul>
+ *
+ * An <code>SWTException</code> is thrown if the return value has an
+ * unsupported type, or if evaluating the script causes a javascript
+ * error to be thrown.
+ *
+ * @param script the script with javascript commands
+ *
+ * @return the return value, if any, of executing the script
+ *
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT - if the script is null</li>
+ * </ul>
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_FAILED_EVALUATE when the script evaluation causes a javascript error to be thrown</li>
+ * <li>ERROR_INVALID_RETURN_VALUE when the script returns a value of unsupported type</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ * <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
+ * </ul>
+ *
+ * @see ProgressListener#completed(ProgressEvent)
+ *
+ * @since 3.5
+ */
+public Object evaluate (String script) throws SWTException {
+ checkWidget();
+ if (script == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ return webBrowser.evaluate (script);
+}
+
+/**
* Navigate to the next session history item.
*
* @return <code>true</code> if the operation was successful and <code>false</code> otherwise
@@ -422,6 +558,39 @@ public boolean forward () {
return webBrowser.forward ();
}
+/**
+ * Returns the type of native browser being used by this instance.
+ * Examples: "mozilla", "ie", "safari", "voyager"
+ *
+ * @return the type of the native browser
+ *
+ * @since 3.5
+ */
+public String getBrowserType () {
+ checkWidget();
+ return webBrowser.getBrowserType ();
+}
+
+/**
+ * Returns <code>true</code> if javascript will be allowed to run in pages
+ * subsequently viewed in the receiver, and <code>false</code> otherwise.
+ *
+ * @return the receiver's javascript enabled state
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #setJavascriptEnabled
+ *
+ * @since 3.5
+ */
+public boolean getJavascriptEnabled () {
+ checkWidget();
+ return webBrowser.jsEnabled;
+}
+
public int getStyle () {
/*
* If SWT.BORDER was specified at creation time then getStyle() should answer
@@ -544,6 +713,29 @@ public void refresh () {
/**
* Removes the listener from the collection of listeners who will
+ * be notified when authentication is required.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ * <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void removeAuthenticationListener (AuthenticationListener listener) {
+ checkWidget();
+ if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ webBrowser.removeAuthenticationListener (listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
* be notified when the window hosting the receiver should be closed.
*
* @param listener the listener which should no longer be notified
@@ -707,7 +899,27 @@ public void removeVisibilityWindowListener (VisibilityWindowListener listener) {
}
/**
- * Renders HTML.
+ * Sets whether javascript will be allowed to run in pages subsequently
+ * viewed in the receiver. Note that setting this value does not affect
+ * the running of javascript in the current page.
+ *
+ * @param enabled the receiver's new javascript enabled state
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setJavascriptEnabled (boolean enabled) {
+ checkWidget();
+ webBrowser.jsEnabled = enabled;
+ webBrowser.jsEnabledChanged = true;
+}
+
+/**
+ * Renders a string containing HTML. The rendering of the content occurs asynchronously.
*
* <p>
* The html parameter is Unicode encoded since it is a java <code>String</code>.
@@ -738,7 +950,7 @@ public boolean setText (String html) {
}
/**
- * Loads a URL.
+ * Begins loading a URL. The loading of its content occurs asynchronously.
*
* @param url the URL to be loaded
*
diff --git a/org/eclipse/swt/browser/BrowserFunction.java b/org/eclipse/swt/browser/BrowserFunction.java
new file mode 100644
index 0000000..f87aef0
--- /dev/null
+++ b/org/eclipse/swt/browser/BrowserFunction.java
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.browser;
+
+import org.eclipse.swt.*;
+
+/**
+ * Instances of this class represent java-side "functions" that
+ * are invokable from javascript. Browser clients define these
+ * functions by subclassing <code>BrowserFunction</code> and
+ * overriding its <code>function(Object[])</code> method. This
+ * method will be invoked whenever javascript running in the
+ * Browser makes a call with the function's name.
+ *
+ * <p>
+ * Application code must explicitly invoke the
+ * <code>BrowserFunction.dispose()</code> method to release the
+ * resources managed by each instance when those instances are no
+ * longer required. Since there is usually a correlation between
+ * the registering of BrowserFunction(s) in a Browser and the
+ * loading of a page in the Browser that is aware of these
+ * functions, the <code>LocationListener.changed()</code> listener
+ * is often a good place to do this.
+ * </p><p>
+ * Note that disposing a Browser automatically disposes all
+ * BrowserFunctions associated with it.
+ * </p>
+ *
+ * @see #dispose()
+ * @see #function(Object[])
+ * @see org.eclipse.swt.browser.LocationListener#changed(LocationEvent)
+ *
+ * @since 3.5
+ */
+public class BrowserFunction {
+ Browser browser;
+ String name;
+ String functionString;
+ int index;
+ boolean isEvaluate;
+
+/**
+ * Constructs a new instance of this class, which will be invokable
+ * by javascript running in the specified Browser.
+ * <p>
+ * You must dispose the BrowserFunction when it is no longer required.
+ * A common place to do this is in a <code>LocationListener.changed()</code>
+ * listener.
+ * </p>
+ * @param browser the browser whose javascript can invoke this function
+ * @param name the name that javascript will use to invoke this function
+ *
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT - if the browser is null</li>
+ * <li>ERROR_NULL_ARGUMENT - if the name is null</li>
+ * </ul>
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the browser has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @see #dispose()
+ * @see org.eclipse.swt.browser.LocationListener#changed(LocationEvent)
+ */
+public BrowserFunction (Browser browser, String name) {
+ this (browser, name, true);
+}
+
+BrowserFunction (Browser browser, String name, boolean create) {
+ super ();
+ if (browser == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ if (name == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
+ if (browser.isDisposed ()) SWT.error (SWT.ERROR_WIDGET_DISPOSED);
+ browser.checkWidget ();
+ this.browser = browser;
+ this.name = name;
+ if (create) browser.webBrowser.createFunction (this);
+}
+
+/**
+ * Disposes of the resources associated with this BrowserFunction.
+ * Applications must dispose of all BrowserFunctions that they create.
+ * </p><p>
+ * Note that disposing a Browser automatically disposes all
+ * BrowserFunctions associated with it.
+ * </p>
+ */
+public void dispose () {
+ dispose (true);
+}
+
+void dispose (boolean remove) {
+ if (index < 0) return;
+ if (remove) browser.webBrowser.destroyFunction (this);
+ browser = null;
+ name = functionString = null;
+ index = -1;
+}
+
+/**
+ * Subclasses should override this method. This method is invoked when
+ * the receiver's function is called from javascript. If all of the
+ * arguments that are passed to the javascript function call are of
+ * supported types then this method is invoked with the argument values
+ * converted as follows:
+ *
+ * javascript null or undefined -> <code>null</code>
+ * javascript number -> <code>java.lang.Double</code>
+ * javascript string -> <code>java.lang.String</code>
+ * javascript boolean -> <code>java.lang.Boolean</code>
+ * javascript array whose elements are all of supported types -> <code>java.lang.Object[]</code>
+ *
+ * If any of the Javascript arguments are of unsupported types then the
+ * function invocation will fail and this method will not be called.
+ *
+ * This method must return a value with one of these supported types to
+ * the javascript caller (note that any subclass of <code>java.lang.Number</code>
+ * will be successfully converted to a javascript number).
+ *
+ * @param arguments the javascript arguments converted to java equivalents
+ * @return the value to return to the javascript caller
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ * <li>ERROR_FUNCTION_DISPOSED when the BrowserFunction has been disposed</li>
+ * </ul>
+ */
+public Object function (Object[] arguments) {
+ if (index < 0) SWT.error (SWT.ERROR_FUNCTION_DISPOSED);
+ browser.checkWidget ();
+ return null;
+}
+
+/**
+ * Returns the Browser whose pages can invoke this BrowserFunction.
+ *
+ * @return the Browser associated with this BrowserFunction
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ * <li>ERROR_FUNCTION_DISPOSED when the BrowserFunction has been disposed</li>
+ * </ul>
+ */
+public Browser getBrowser () {
+ if (index < 0) SWT.error (SWT.ERROR_FUNCTION_DISPOSED);
+ browser.checkWidget ();
+ return browser;
+}
+
+/**
+ * Returns the name that javascript can use to invoke this BrowserFunction.
+ *
+ * @return the BrowserFunction's name
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
+ * <li>ERROR_FUNCTION_DISPOSED when the BrowserFunction has been disposed</li>
+ * </ul>
+ */
+public String getName () {
+ if (index < 0) SWT.error (SWT.ERROR_FUNCTION_DISPOSED);
+ browser.checkWidget ();
+ return name;
+}
+
+/**
+ * Returns <code>true</code> if this BrowserFunction has been disposed
+ * and <code>false</code> otherwise.
+ * <p>
+ * This method gets the dispose state for the BrowserFunction.
+ * When a BrowserFunction has been disposed it is an error to
+ * invoke any of its methods.
+ * </p><p>
+ * Note that disposing a Browser automatically disposes all
+ * BrowserFunctions associated with it.
+ * </p>
+ * @return <code>true</code> if this BrowserFunction has been disposed
+ * and <code>false</code> otherwise
+ */
+public boolean isDisposed () {
+ return index < 0;
+}
+}
diff --git a/org/eclipse/swt/browser/CloseWindowListener.java b/org/eclipse/swt/browser/CloseWindowListener.java
index c384b79..b545054 100644
--- a/org/eclipse/swt/browser/CloseWindowListener.java
+++ b/org/eclipse/swt/browser/CloseWindowListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/browser/Download.java b/org/eclipse/swt/browser/Download.java
index 9608a96..b648b33 100644
--- a/org/eclipse/swt/browser/Download.java
+++ b/org/eclipse/swt/browser/Download.java
@@ -16,6 +16,12 @@ import org.eclipse.swt.internal.mozilla.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
+/**
+ * This class implements the nsIDownload interface for mozilla
+ * versions 1.4 - 1.7.x. For mozilla version 1.8.x this interface
+ * is implemented by class nsIDownload_1_8. Later versions of
+ * mozilla do not need to call this interface.
+ */
class Download {
XPCOMObject supports;
XPCOMObject download;
@@ -182,7 +188,7 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
nsISupports supports = new nsISupports (aTarget);
int /*long*/[] result = new int /*long*/[1];
rc = supports.QueryInterface (nsIURI.NS_IURI_IID, result);
- if (rc == 0) { /* >= 1.7 */
+ if (rc == XPCOM.NS_OK) { /* >= 1.7 */
nsIURI target = new nsIURI (result[0]);
result[0] = 0;
int /*long*/ aPath = XPCOM.nsEmbedCString_new ();
diff --git a/org/eclipse/swt/browser/Download_1_8.java b/org/eclipse/swt/browser/Download_1_8.java
index 5d10348..82819f1 100644
--- a/org/eclipse/swt/browser/Download_1_8.java
+++ b/org/eclipse/swt/browser/Download_1_8.java
@@ -16,6 +16,12 @@ import org.eclipse.swt.internal.mozilla.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
+/**
+ * This class implements the nsIDownload interface for mozilla
+ * version 1.8.x. For mozilla versions 1.4 - 1.7.x this interface
+ * is implemented by class nsIDownload. Mozilla versions later
+ * than 1.8.x do not need to call this interface.
+ */
class Download_1_8 {
XPCOMObject supports;
XPCOMObject download;
diff --git a/org/eclipse/swt/browser/External.java b/org/eclipse/swt/browser/External.java
new file mode 100644
index 0000000..53ed58f
--- /dev/null
+++ b/org/eclipse/swt/browser/External.java
@@ -0,0 +1,590 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.browser;
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.mozilla.*;
+
+class External {
+ public static final String EXTERNAL_IID_STR =
+ "ded01d20-ba6f-11dd-ad8b-0800200c9a66"; //$NON-NLS-1$
+
+ public static final nsID EXTERNAL_IID =
+ new nsID(EXTERNAL_IID_STR);
+
+ XPCOMObject supports;
+ XPCOMObject external;
+ XPCOMObject classInfo;
+ XPCOMObject securityCheckedComponent;
+ int refCount = 0;
+
+External () {
+ createCOMInterfaces ();
+}
+
+int AddRef () {
+ refCount++;
+ return refCount;
+}
+
+void createCOMInterfaces () {
+ /* Create each of the interfaces that this object implements */
+ supports = new XPCOMObject (new int[] {2, 0, 0}) {
+ public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+ public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+ public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ };
+
+ classInfo = new XPCOMObject (new int[] {2, 0, 0, 2, 2, 1, 1, 1, 1, 1, 1}) {
+ public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+ public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+ public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public int /*long*/ method3 (int /*long*/[] args) {return getInterfaces (args[0], args[1]);}
+ public int /*long*/ method4 (int /*long*/[] args) {return getHelperForLanguage ((int)/*64*/args[0], args[1]);}
+ public int /*long*/ method5 (int /*long*/[] args) {return getContractID (args[0]);}
+ public int /*long*/ method6 (int /*long*/[] args) {return getClassDescription (args[0]);}
+ public int /*long*/ method7 (int /*long*/[] args) {return getClassID (args[0]);}
+ public int /*long*/ method8 (int /*long*/[] args) {return getImplementationLanguage (args[0]);}
+ public int /*long*/ method9 (int /*long*/[] args) {return getFlags (args[0]);}
+ public int /*long*/ method10 (int /*long*/[] args) {return getClassIDNoAlloc (args[0]);}
+ };
+
+ securityCheckedComponent = new XPCOMObject (new int[] {2, 0, 0, 2, 3, 3, 3}) {
+ public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+ public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+ public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public int /*long*/ method3 (int /*long*/[] args) {return canCreateWrapper (args[0], args[1]);}
+ public int /*long*/ method4 (int /*long*/[] args) {return canCallMethod (args[0], args[1], args[2]);}
+ public int /*long*/ method5 (int /*long*/[] args) {return canGetProperty (args[0], args[1], args[2]);}
+ public int /*long*/ method6 (int /*long*/[] args) {return canSetProperty (args[0], args[1], args[2]);}
+ };
+
+ external = new XPCOMObject (new int[] {2, 0, 0, 3}) {
+ public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+ public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+ public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public int /*long*/ method3 (int /*long*/[] args) {return callJava ((int)/*64*/args[0], args[1], args[2]);}
+ };
+
+}
+
+void disposeCOMInterfaces () {
+ if (supports != null) {
+ supports.dispose ();
+ supports = null;
+ }
+ if (external != null) {
+ external.dispose ();
+ external = null;
+ }
+}
+
+int /*long*/ getAddress () {
+ return external.getAddress ();
+}
+
+int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
+ if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE;
+ nsID guid = new nsID ();
+ XPCOM.memmove (guid, riid, nsID.sizeof);
+
+ if (guid.Equals (nsISupports.NS_ISUPPORTS_IID)) {
+ XPCOM.memmove (ppvObject, new int /*long*/[] {supports.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsIClassInfo.NS_ICLASSINFO_IID)) {
+ XPCOM.memmove (ppvObject, new int /*long*/[] {classInfo.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID)) {
+ XPCOM.memmove (ppvObject, new int /*long*/[] {securityCheckedComponent.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+ if (guid.Equals (EXTERNAL_IID)) {
+ XPCOM.memmove (ppvObject, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
+ AddRef();
+ return XPCOM.NS_OK;
+ }
+
+ XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_ERROR_NO_INTERFACE;
+}
+
+int Release () {
+ refCount--;
+ if (refCount == 0) disposeCOMInterfaces ();
+ return refCount;
+}
+
+/* nsIClassInfo */
+
+int getClassDescription (int /*long*/ _retValue) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
+ int /*long*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+ C.memmove (_retValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+}
+
+int getClassID (int /*long*/ _retValue) {
+ return XPCOM.NS_OK;
+}
+
+int getClassIDNoAlloc (int /*long*/ _retValue) {
+ return XPCOM.NS_OK;
+}
+
+int getContractID (int /*long*/ _retValue) {
+ return XPCOM.NS_OK;
+}
+
+int getFlags (int /*long*/ flags) {
+ C.memmove (flags, new int[] {nsIClassInfo.MAIN_THREAD_ONLY}, 4); /* PRUint32 */
+ return XPCOM.NS_OK;
+}
+
+int getHelperForLanguage (int language, int /*long*/ _retValue) {
+ C.memmove (_retValue, new int /*long*/[] {0}, C.PTR_SIZEOF);
+ return XPCOM.NS_OK;
+}
+
+int getImplementationLanguage (int /*long*/ _retValue) {
+ C.memmove (_retValue, new int[] {5}, 4); /* nsIProgrammingLanguage.JAVA */ /* PRUint */
+ return XPCOM.NS_OK;
+}
+
+
+int getInterfaces (int /*long*/ count, int /*long*/ array) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ int /*long*/ securityCheckedComponentIID = memory.Alloc (nsID.sizeof);
+ XPCOM.memmove (securityCheckedComponentIID, nsISecurityCheckedComponent.NS_ISECURITYCHECKEDCOMPONENT_IID, nsID.sizeof);
+ int /*long*/ externalIID = memory.Alloc (nsID.sizeof);
+ XPCOM.memmove (externalIID, EXTERNAL_IID, nsID.sizeof);
+ int /*long*/ ptrArray = memory.Alloc (2 * C.PTR_SIZEOF);
+ C.memmove (ptrArray, new int /*long*/[] {securityCheckedComponentIID}, C.PTR_SIZEOF);
+ C.memmove (ptrArray + C.PTR_SIZEOF, new int /*long*/[] {externalIID}, C.PTR_SIZEOF);
+ C.memmove (array, new int /*long*/[] {ptrArray}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ C.memmove (count, new int[] {2}, 4); /* PRUint */
+ return XPCOM.NS_OK;
+}
+
+/* nsISecurityCheckedComponent */
+
+int canCreateWrapper (int /*long*/ iid, int /*long*/ _retVal) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
+ int /*long*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+ C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+}
+
+int canCallMethod (int /*long*/ iid, int /*long*/ methodName, int /*long*/ _retVal) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ int length = XPCOM.strlen_PRUnichar (methodName);
+ char[] dest = new char[length];
+ XPCOM.memmove (dest, methodName, length * 2);
+ String string = new String (dest);
+ byte[] bytes;
+ if (string.equals("callJava")) { //$NON-NLS-1$
+ bytes = MozillaDelegate.wcsToMbcs (null, "allAccess", true); //$NON-NLS-1$
+ } else {
+ bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
+ }
+ int /*long*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+ C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+}
+
+int canGetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
+ int /*long*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+ C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+}
+
+int canSetProperty (int /*long*/ iid, int /*long*/ propertyName, int /*long*/ _retVal) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "noAccess", true); //$NON-NLS-1$
+ int /*long*/ ptr = memory.Alloc (bytes.length);
+ C.memmove (ptr, bytes, bytes.length);
+ C.memmove (_retVal, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+ memory.Release ();
+
+ return XPCOM.NS_OK;
+}
+
+/* external */
+
+Object convertToJava (nsIVariant variant, short type) {
+ switch (type) {
+ case nsIDataType.VTYPE_EMPTY:
+ case nsIDataType.VTYPE_VOID:
+ return null;
+ case nsIDataType.VTYPE_EMPTY_ARRAY:
+ return new Object[0];
+ case nsIDataType.VTYPE_BOOL:
+ int[] boolResult = new int[1]; /*PRInt32*/
+ int rc = variant.GetAsBool (boolResult);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return new Boolean (boolResult[0] != 0);
+ case nsIDataType.VTYPE_INT32:
+ int[] intResult = new int[1]; /*PRInt32*/
+ rc = variant.GetAsInt32 (intResult);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return new Double (intResult[0]);
+ case nsIDataType.VTYPE_DOUBLE:
+ int /*long*/ doubleReturn = C.malloc (8);
+ rc = variant.GetAsDouble (doubleReturn);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ double[] doubleResult = new double[1];
+ C.memmove (doubleResult, doubleReturn, 8);
+ C.free (doubleReturn);
+ return new Double (doubleResult[0]);
+ case nsIDataType.VTYPE_WSTRING_SIZE_IS:
+ int[] size = new int[1]; /* PRInt32 */
+ int /*long*/[] wString = new int /*long*/[1];
+ rc = variant.GetAsWStringWithSize (size, wString);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ char[] chars = new char[size[0]];
+ C.memmove (chars, wString[0], size[0] * 2);
+ return new String (chars);
+ case nsIDataType.VTYPE_ARRAY:
+ Object[] arrayReturn = new Object[0];
+ int /*long*/ iid = C.malloc (nsID.sizeof);
+ C.memset (iid, 0, nsID.sizeof);
+ int[] count = new int[1]; /* PRUint32 */
+ short[] currentType = new short[1];
+ int /*long*/[] ptr = new int /*long*/[1];
+ rc = variant.GetAsArray (currentType, iid, count, ptr);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (ptr[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER);
+ nsID id = new nsID ();
+ XPCOM.memmove (id, iid, nsID.sizeof);
+ C.free (iid);
+
+ int /*long*/[] result = new int /*long*/[1];
+ rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+
+ if (id.Equals (nsIVariant.NS_IVARIANT_IID)) {
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+ int /*long*/[] arrayPtr = new int /*long*/[1];
+ C.memmove (arrayPtr, ptr[0] + i * C.PTR_SIZEOF, C.PTR_SIZEOF);
+ nsISupports supports = new nsISupports (arrayPtr[0]);
+ rc = supports.QueryInterface (nsIVariant.NS_IVARIANT_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIVariant currentVariant = new nsIVariant (result[0]);
+ result[0] = 0;
+ currentType[0] = 0;
+ rc = currentVariant.GetDataType (currentType);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ try {
+ arrayReturn[i] = convertToJava (currentVariant, currentType[0]);
+ currentVariant.Release ();
+ } catch (IllegalArgumentException e) {
+ /* invalid argument value type */
+ currentVariant.Release ();
+ memory.Free (ptr[0]);
+ memory.Release ();
+ throw e;
+ }
+ }
+ } else {
+ switch (currentType[0]) {
+ case nsIDataType.VTYPE_DOUBLE:
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+ double[] doubleValue = new double[1];
+ C.memmove (doubleValue, ptr[0] + i * 8, 8);
+ arrayReturn[i] = new Double (doubleValue[0]);
+ }
+ break;
+ case nsIDataType.VTYPE_BOOL:
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+ int[] boolValue = new int[1]; /* PRUInt32 */
+ C.memmove (boolValue, ptr[0] + i * 4, 4);
+ arrayReturn[i] = new Boolean (boolValue[0] != 0);
+ }
+ break;
+ case nsIDataType.VTYPE_INT32:
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+ int[] intValue = new int[1]; /* PRInt32 */
+ C.memmove (intValue, ptr[0] + i * 4, 4);
+ arrayReturn[i] = new Double (intValue[0]);
+ }
+ break;
+ case nsIDataType.VTYPE_WCHAR_STR:
+ arrayReturn = new Object[count[0]];
+ for (int i = 0; i < count[0]; i++) {
+ int /*long*/ currentPtr = ptr[0] + i * C.PTR_SIZEOF;
+ int /*long*/[] stringPtr = new int /*long*/[1];
+ C.memmove (stringPtr, currentPtr, C.PTR_SIZEOF);
+ int length = XPCOM.strlen_PRUnichar (stringPtr[0]);
+ char[] dest = new char[length];
+ XPCOM.memmove (dest, stringPtr[0], length * 2);
+ arrayReturn[i] = new String (dest);
+ }
+ break;
+ default:
+ memory.Free (ptr[0]);
+ memory.Release ();
+ SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+ }
+ }
+ memory.Free (ptr[0]);
+ memory.Release ();
+ return arrayReturn;
+ }
+ SWT.error (SWT.ERROR_INVALID_ARGUMENT);
+ return null;
+}
+
+nsIVariant convertToJS (Object value, nsIComponentManager componentManager) {
+ int /*long*/[] result = new int /*long*/[1];
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_VARIANT_CONTRACTID, true);
+ int rc = componentManager.CreateInstanceByContractID (aContractID, 0, nsIWritableVariant.NS_IWRITABLEVARIANT_IID, result);
+ nsIWritableVariant variant = new nsIWritableVariant (result[0]);
+ result[0] = 0;
+
+ if (value == null) {
+ rc = variant.SetAsVoid ();
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return variant;
+ }
+ if (value instanceof String) {
+ String stringValue = (String)value;
+ int length = stringValue.length ();
+ char[] chars = new char[length];
+ stringValue.getChars (0, length, chars, 0);
+ rc = variant.SetAsWStringWithSize (length, chars);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return variant;
+ }
+ if (value instanceof Boolean) {
+ Boolean booleanValue = (Boolean)value;
+ rc = variant.SetAsBool (booleanValue.booleanValue () ? 1 : 0);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return variant;
+ }
+ if (value instanceof Number) {
+ Number numberValue = (Number)value;
+ rc = variant.SetAsDouble (numberValue.doubleValue ());
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return variant;
+ }
+ if (value instanceof Object[]) {
+ Object[] arrayValue = (Object[])value;
+ int length = arrayValue.length;
+ if (length > 0) {
+ int /*long*/ arrayPtr = C.malloc (C.PTR_SIZEOF * length);
+ for (int i = 0; i < length; i++) {
+ Object currentObject = arrayValue[i];
+ try {
+ nsIVariant currentVariant = convertToJS (currentObject, componentManager);
+ C.memmove (arrayPtr + C.PTR_SIZEOF * i, new int /*long*/[] {currentVariant.getAddress ()}, C.PTR_SIZEOF);
+ } catch (SWTException e) {
+ /* invalid return value type */
+ C.free (arrayPtr);
+ variant.Release ();
+ /* release the variants that had previously been added to the array */
+ for (int j = 0; j < i; j++) {
+ int /*long*/[] ptr = new int /*long*/[1];
+ C.memmove (ptr, arrayPtr + C.PTR_SIZEOF * j, C.PTR_SIZEOF);
+ new nsISupports (ptr[0]).Release ();
+ }
+ throw e;
+ }
+ }
+ int /*long*/ idPtr = C.malloc (nsID.sizeof);
+ XPCOM.memmove (idPtr, nsIVariant.NS_IVARIANT_IID, nsID.sizeof);
+ rc = variant.SetAsArray (nsIDataType.VTYPE_INTERFACE_IS, idPtr, length, arrayPtr);
+ C.free (idPtr);
+ C.free (arrayPtr);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ return variant;
+ }
+ }
+
+ variant.Release ();
+ SWT.error (SWT.ERROR_INVALID_RETURN_VALUE);
+ return null;
+}
+
+int callJava (int functionId, int /*long*/ args, int /*long*/ returnPtr) {
+ Object key = new Integer (functionId);
+ BrowserFunction function = (BrowserFunction)Mozilla.AllFunctions.get (key);
+ Object returnValue = null;
+
+ if (function != null) {
+ short[] type = new short[1]; /* PRUint16 */
+ nsIVariant variant = new nsIVariant (args);
+ int rc = variant.GetDataType (type);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ try {
+ Object temp = (Object[])convertToJava (variant, type[0]);
+ if (temp instanceof Object[]) {
+ Object[] arguments = (Object[])temp;
+ try {
+ returnValue = function.function (arguments);
+ } catch (Exception e) {
+ /* exception during function invocation */
+ returnValue = WebBrowser.CreateErrorString (e.getLocalizedMessage ());
+ }
+ }
+ } catch (IllegalArgumentException e) {
+ /* invalid argument value type */
+ if (function.isEvaluate) {
+ /* notify the evaluate function so that a java exception can be thrown */
+ function.function (new String[] {WebBrowser.CreateErrorString (new SWTException (SWT.ERROR_INVALID_RETURN_VALUE).getLocalizedMessage ())});
+ }
+ returnValue = WebBrowser.CreateErrorString (e.getLocalizedMessage ());
+ }
+ }
+
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetComponentManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ nsIComponentManager componentManager = new nsIComponentManager (result[0]);
+ result[0] = 0;
+ nsIVariant variant;
+ try {
+ variant = convertToJS (returnValue, componentManager);
+ } catch (SWTException e) {
+ /* invalid return value type */
+ variant = convertToJS (WebBrowser.CreateErrorString (e.getLocalizedMessage ()), componentManager);
+ }
+ componentManager.Release ();
+ C.memmove (returnPtr, new int /*long*/[] {variant.getAddress ()}, C.PTR_SIZEOF);
+
+ return XPCOM.NS_OK;
+}
+}
diff --git a/org/eclipse/swt/browser/DownloadFactory.java b/org/eclipse/swt/browser/ExternalFactory.java
similarity index 91%
copy from org/eclipse/swt/browser/DownloadFactory.java
copy to org/eclipse/swt/browser/ExternalFactory.java
index 901786c..84462ec 100644
--- a/org/eclipse/swt/browser/DownloadFactory.java
+++ b/org/eclipse/swt/browser/ExternalFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,15 +10,15 @@
*******************************************************************************/
package org.eclipse.swt.browser;
-import org.eclipse.swt.internal.C;
+import org.eclipse.swt.internal.*;
import org.eclipse.swt.internal.mozilla.*;
-class DownloadFactory {
+class ExternalFactory {
XPCOMObject supports;
XPCOMObject factory;
int refCount = 0;
-DownloadFactory () {
+ExternalFactory () {
createCOMInterfaces ();
}
@@ -74,23 +74,23 @@ int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
AddRef ();
return XPCOM.NS_OK;
}
-
+
XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
-
+
int Release () {
refCount--;
if (refCount == 0) disposeCOMInterfaces ();
return refCount;
}
-
+
/* nsIFactory */
int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
- Download download = new Download ();
- download.AddRef ();
- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF);
+ External external = new External ();
+ external.AddRef ();
+ XPCOM.memmove (result, new int /*long*/[] {external.getAddress ()}, C.PTR_SIZEOF);
return XPCOM.NS_OK;
}
diff --git a/org/eclipse/swt/browser/FilePicker.java b/org/eclipse/swt/browser/FilePicker.java
index 1e22fd9..cb7b397 100644
--- a/org/eclipse/swt/browser/FilePicker.java
+++ b/org/eclipse/swt/browser/FilePicker.java
@@ -112,6 +112,12 @@ int Release () {
return refCount;
}
+Browser getBrowser (int /*long*/ aDOMWindow) {
+ if (aDOMWindow == 0) return null;
+ nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
+ return Mozilla.findBrowser (window);
+}
+
/*
* As of Mozilla 1.8 some of nsIFilePicker's string arguments changed type. This method
* answers a java string based on the type of string that is appropriate for the Mozilla
@@ -141,10 +147,12 @@ int Show (int /*long*/ _retval) {
/* picking a file */
int style = mode == nsIFilePicker.modeSave ? SWT.SAVE : SWT.OPEN;
if (mode == nsIFilePicker.modeOpenMultiple) style |= SWT.MULTI;
- Display display = Display.getCurrent ();
- Shell parent = null; // TODO compute parent
- if (parent == null) {
- parent = new Shell (display);
+ Browser browser = getBrowser (parentHandle);
+ Shell parent = null;
+ if (browser != null) {
+ parent = browser.getShell ();
+ } else {
+ parent = new Shell ();
}
FileDialog dialog = new FileDialog (parent, style);
if (title != null) dialog.setText (title);
@@ -162,10 +170,12 @@ int Show (int /*long*/ _retval) {
}
int showDirectoryPicker () {
- Display display = Display.getCurrent ();
- Shell parent = null; // TODO compute parent
- if (parent == null) {
- parent = new Shell (display);
+ Browser browser = getBrowser (parentHandle);
+ Shell parent = null;
+ if (browser != null) {
+ parent = browser.getShell ();
+ } else {
+ parent = new Shell ();
}
DirectoryDialog dialog = new DirectoryDialog (parent, SWT.NONE);
if (title != null) dialog.setText (title);
diff --git a/org/eclipse/swt/browser/HelperAppLauncherDialog.java b/org/eclipse/swt/browser/HelperAppLauncherDialog.java
index 7674704..706ec08 100644
--- a/org/eclipse/swt/browser/HelperAppLauncherDialog.java
+++ b/org/eclipse/swt/browser/HelperAppLauncherDialog.java
@@ -16,7 +16,7 @@ import org.eclipse.swt.internal.mozilla.*;
import org.eclipse.swt.widgets.*;
/**
- * This class implements the HelperAppLauncherDialog interface for mozilla
+ * This class implements the nsIHelperAppLauncherDialog interface for mozilla
* versions 1.4 - 1.8.x. For mozilla versions >= 1.9 this interface is
* implemented by class HelperAppLauncherDialog_1_9. HelperAppLauncherDialogFactory
* determines at runtime which of these classes to instantiate.
diff --git a/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java b/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
index 574bc03..21008f0 100644
--- a/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
+++ b/org/eclipse/swt/browser/HelperAppLauncherDialogFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,7 +17,6 @@ class HelperAppLauncherDialogFactory {
XPCOMObject supports;
XPCOMObject factory;
int refCount = 0;
- boolean isPre_1_9 = true;
HelperAppLauncherDialogFactory () {
createCOMInterfaces ();
@@ -89,7 +88,7 @@ int Release () {
/* nsIFactory */
int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) {
- if (isPre_1_9) {
+ if (Mozilla.IsPre_1_9) {
HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog ();
helperAppLauncherDialog.AddRef ();
XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF);
diff --git a/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java b/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
index 25aec52..dd2e0cb 100644
--- a/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
+++ b/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.java
@@ -15,6 +15,12 @@ import org.eclipse.swt.internal.C;
import org.eclipse.swt.internal.mozilla.*;
import org.eclipse.swt.widgets.*;
+/**
+ * This class implements the nsIHelperAppLauncherDialog interface for mozilla
+ * versions >= 1.9. For mozilla versions 1.4 - 1.8.x this interface is
+ * implemented by class HelperAppLauncherDialog. HelperAppLauncherDialogFactory
+ * determines at runtime which of these classes to instantiate.
+ */
class HelperAppLauncherDialog_1_9 {
XPCOMObject supports;
XPCOMObject helperAppLauncherDialog;
diff --git a/org/eclipse/swt/browser/LocationEvent.java b/org/eclipse/swt/browser/LocationEvent.java
index a5b3a1c..0fed868 100644
--- a/org/eclipse/swt/browser/LocationEvent.java
+++ b/org/eclipse/swt/browser/LocationEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,8 +43,15 @@ public class LocationEvent extends TypedEvent {
static final long serialVersionUID = 3906644198244299574L;
-LocationEvent(Widget w) {
- super(w);
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param widget the widget that fired the event
+ *
+ * @since 3.5
+ */
+public LocationEvent(Widget widget) {
+ super(widget);
}
/**
diff --git a/org/eclipse/swt/browser/LocationListener.java b/org/eclipse/swt/browser/LocationListener.java
index 222163a..b34359b 100644
--- a/org/eclipse/swt/browser/LocationListener.java
+++ b/org/eclipse/swt/browser/LocationListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/browser/Mozilla.java b/org/eclipse/swt/browser/Mozilla.java
index 0f9f7b8..9cbf020 100644
--- a/org/eclipse/swt/browser/Mozilla.java
+++ b/org/eclipse/swt/browser/Mozilla.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,11 +13,13 @@ package org.eclipse.swt.browser;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
+
import org.eclipse.swt.*;
import org.eclipse.swt.widgets.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.*;
import org.eclipse.swt.internal.mozilla.*;
+import org.eclipse.swt.internal.mozilla.init.*;
import org.eclipse.swt.layout.*;
class Mozilla extends WebBrowser {
@@ -39,20 +41,24 @@ class Mozilla extends WebBrowser {
XPCOMObject uriContentListener;
XPCOMObject tooltipListener;
XPCOMObject domEventListener;
+ XPCOMObject badCertListener;
int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT;
- int refCount, lastKeyCode, lastCharCode;
+ int refCount, lastKeyCode, lastCharCode, authCount;
int /*long*/ request;
Point location, size;
- boolean visible, isChild, ignoreDispose, awaitingNavigate;
+ boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage;
Shell tip = null;
Listener listener;
Vector unhookedDOMWindows = new Vector ();
+ String lastNavigateURL;
+ byte[] htmlBytes;
static nsIAppShell AppShell;
static AppFileLocProvider LocationProvider;
static WindowCreator2 WindowCreator;
- static int BrowserCount;
- static boolean Initialized, IsPre_1_8, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued;
+ static int BrowserCount, NextJSFunctionIndex = 1;
+ static Hashtable AllFunctions = new Hashtable ();
+ static boolean Initialized, IsPre_1_8, IsPre_1_9, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued;
/* XULRunner detect constants */
static final String GRERANGE_LOWER = "1.8.1.2"; //$NON-NLS-1$
@@ -113,7 +119,6 @@ class Mozilla extends WebBrowser {
result[0] = 0;
rc = manager.GetEnumerator (result);
if (rc != XPCOM.NS_OK) error (rc);
- manager.Release ();
nsISimpleEnumerator enumerator = new nsISimpleEnumerator (result[0]);
int[] moreElements = new int[1]; /* PRBool */
@@ -145,6 +150,146 @@ class Mozilla extends WebBrowser {
if (rc != XPCOM.NS_OK) error (rc);
}
enumerator.Release ();
+ manager.Release ();
+ }
+ };
+
+ MozillaGetCookie = new Runnable() {
+ public void run() {
+ if (!Initialized) return;
+
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIIOService ioService = new nsIIOService (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
+ int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ ioService.Release ();
+ if (rc != XPCOM.NS_OK) {
+ serviceManager.Release ();
+ return;
+ }
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+
+ nsIURI aURI = new nsIURI (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);
+ int /*long*/ cookieString;
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ nsICookieService cookieService = new nsICookieService (result[0]);
+ result[0] = 0;
+ rc = cookieService.GetCookieString (aURI.getAddress(), 0, result);
+ cookieService.Release ();
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) {
+ aURI.Release ();
+ serviceManager.Release ();
+ return;
+ }
+ cookieString = result[0];
+ } else {
+ result[0] = 0;
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService_1_9.NS_ICOOKIESERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ nsICookieService_1_9 cookieService = new nsICookieService_1_9 (result[0]);
+ result[0] = 0;
+ rc = cookieService.GetCookieString(aURI.getAddress(), 0, result);
+ cookieService.Release ();
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) {
+ aURI.Release ();
+ serviceManager.Release ();
+ return;
+ }
+ cookieString = result[0];
+ }
+ aURI.Release ();
+ serviceManager.Release ();
+ result[0] = 0;
+
+ int length = C.strlen (cookieString);
+ bytes = new byte[length];
+ XPCOM.memmove (bytes, cookieString, length);
+ C.free (cookieString);
+ String allCookies = new String (MozillaDelegate.mbcsToWcs (null, bytes));
+ StringTokenizer tokenizer = new StringTokenizer (allCookies, ";"); //$NON-NLS-1$
+ while (tokenizer.hasMoreTokens ()) {
+ String cookie = tokenizer.nextToken ();
+ int index = cookie.indexOf ('=');
+ if (index != -1) {
+ String name = cookie.substring (0, index).trim ();
+ if (name.equals (CookieName)) {
+ CookieValue = cookie.substring (index + 1).trim ();
+ return;
+ }
+ }
+ }
+ }
+ };
+
+ MozillaSetCookie = new Runnable() {
+ public void run() {
+ if (!Initialized) return;
+
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIIOService ioService = new nsIIOService (result[0]);
+ result[0] = 0;
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, CookieUrl, false);
+ int /*long*/ aSpec = XPCOM.nsEmbedCString_new (bytes, bytes.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ ioService.Release ();
+ if (rc != XPCOM.NS_OK) {
+ serviceManager.Release ();
+ return;
+ }
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+
+ nsIURI aURI = new nsIURI(result[0]);
+ result[0] = 0;
+ byte[] aCookie = MozillaDelegate.wcsToMbcs (null, CookieValue, true);
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_COOKIESERVICE_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService.NS_ICOOKIESERVICE_IID, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ nsICookieService cookieService = new nsICookieService (result[0]);
+ rc = cookieService.SetCookieString (aURI.getAddress(), 0, aCookie, 0);
+ cookieService.Release ();
+ } else {
+ result[0] = 0;
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICookieService_1_9.NS_ICOOKIESERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ nsICookieService_1_9 cookieService = new nsICookieService_1_9 (result[0]);
+ rc = cookieService.SetCookieString(aURI.getAddress(), 0, aCookie, 0);
+ cookieService.Release ();
+ }
+ result[0] = 0;
+ aURI.Release ();
+ serviceManager.Release ();
+ CookieResult = rc == 0;
}
};
}
@@ -373,6 +518,35 @@ public void create (Composite parent, int style) {
}
if (!Initialized) {
+ LocationProvider = new AppFileLocProvider (mozillaPath);
+ LocationProvider.AddRef ();
+
+ /* extract external.xpt to temp */
+ String tempPath = System.getProperty ("java.io.tmpdir"); //$NON-NLS-1$
+ File componentsDir = new File (tempPath, "eclipse/mozillaComponents"); //$NON-NLS-1$
+ java.io.InputStream is = Library.class.getResourceAsStream ("/external.xpt"); //$NON-NLS-1$
+ if (is != null) {
+ if (!componentsDir.exists ()) {
+ componentsDir.mkdirs ();
+ }
+ int read;
+ byte [] buffer = new byte [4096];
+ File file = new File (componentsDir, "external.xpt"); //$NON-NLS-1$
+ try {
+ FileOutputStream os = new FileOutputStream (file);
+ while ((read = is.read (buffer)) != -1) {
+ os.write(buffer, 0, read);
+ }
+ os.close ();
+ is.close ();
+ } catch (FileNotFoundException e) {
+ } catch (IOException e) {
+ }
+ }
+ if (componentsDir.exists () && componentsDir.isDirectory ()) {
+ LocationProvider.setComponentsPath (componentsDir.getAbsolutePath ());
+ }
+
int /*long*/[] retVal = new int /*long*/[1];
nsEmbedString pathString = new nsEmbedString (mozillaPath);
int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, retVal);
@@ -386,20 +560,43 @@ public void create (Composite parent, int style) {
error (XPCOM.NS_ERROR_NULL_POINTER);
}
- LocationProvider = new AppFileLocProvider (mozillaPath);
- LocationProvider.AddRef ();
-
nsIFile localFile = new nsILocalFile (retVal[0]);
- rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
+ if (IsXULRunner) {
+ int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+ /* alloc memory for two structs, the second is empty to signify the end of the list */
+ int /*long*/ ptr = C.malloc (size * 2);
+ C.memset (ptr, 0, size * 2);
+ nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_InitEmbedding", true); //$NON-NLS-1$
+ functionLoad.functionName = C.malloc (bytes.length);
+ C.memmove (functionLoad.functionName, bytes, bytes.length);
+ functionLoad.function = C.malloc (C.PTR_SIZEOF);
+ C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+ XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+ XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+ C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+ int /*long*/ functionPtr = result[0];
+ result[0] = 0;
+ C.free (functionLoad.function);
+ C.free (functionLoad.functionName);
+ C.free (ptr);
+ if (functionPtr == 0) {
+ browser.dispose ();
+ error (XPCOM.NS_ERROR_NULL_POINTER);
+ }
+ rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0);
+ if (rc == XPCOM.NS_OK) {
+ System.setProperty (XULRUNNER_PATH, mozillaPath);
+ }
+ } else {
+ rc = XPCOM.NS_InitXPCOM2 (0, localFile.getAddress(), LocationProvider.getAddress ());
+ }
localFile.Release ();
if (rc != XPCOM.NS_OK) {
browser.dispose ();
SWT.error (SWT.ERROR_NO_HANDLES, null, " [MOZILLA_FIVE_HOME may not point at an embeddable GRE] [NS_InitEmbedding " + mozillaPath + " error " + rc + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
System.setProperty (GRE_INITIALIZED, "true"); //$NON-NLS-1$
- if (IsXULRunner) {
- System.setProperty (XULRUNNER_PATH, mozillaPath);
- }
}
/* If JavaXPCOM is detected then attempt to initialize it with the XULRunner being used */
@@ -593,6 +790,35 @@ public void create (Composite parent, int style) {
error (rc);
}
observerService.Release ();
+
+ if (IsXULRunner) {
+ int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+ /* alloc memory for two structs, the second is empty to signify the end of the list */
+ ptr = C.malloc (size * 2);
+ C.memset (ptr, 0, size * 2);
+ nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+ byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_NotifyProfile", true); //$NON-NLS-1$
+ functionLoad.functionName = C.malloc (bytes.length);
+ C.memmove (functionLoad.functionName, bytes, bytes.length);
+ functionLoad.function = C.malloc (C.PTR_SIZEOF);
+ C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+ XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+ XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+ C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+ int /*long*/ functionPtr = result[0];
+ result[0] = 0;
+ C.free (functionLoad.function);
+ C.free (functionLoad.functionName);
+ C.free (ptr);
+ /* functionPtr == 0 for xulrunner < 1.9 */
+ if (functionPtr != 0) {
+ rc = XPCOM.Call (functionPtr);
+ if (rc != XPCOM.NS_OK) {
+ browser.dispose ();
+ error (rc);
+ }
+ }
+ }
}
/*
@@ -602,7 +828,6 @@ public void create (Composite parent, int style) {
*/
aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PREFSERVICE_CONTRACTID, true);
rc = serviceManager.GetServiceByContractID (aContractID, nsIPrefService.NS_IPREFSERVICE_IID, result);
- serviceManager.Release ();
if (rc != XPCOM.NS_OK) {
browser.dispose ();
error (rc);
@@ -886,6 +1111,8 @@ public void create (Composite parent, int style) {
nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]);
result[0] = 0;
+ componentRegistrar.AutoRegister (0); /* detect the External component */
+
aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_PROMPTSERVICE_CONTRACTID, true);
byte[] aClassName = MozillaDelegate.wcsToMbcs (null, "Prompt Service", true); //$NON-NLS-1$
rc = componentRegistrar.RegisterFactory (XPCOM.NS_PROMPTSERVICE_CID, aClassName, aContractID, factory.getAddress ());
@@ -894,7 +1121,31 @@ public void create (Composite parent, int style) {
error (rc);
}
factory.Release ();
-
+
+ ExternalFactory externalFactory = new ExternalFactory ();
+ externalFactory.AddRef ();
+ aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.EXTERNAL_CONTRACTID, true);
+ aClassName = MozillaDelegate.wcsToMbcs (null, "External", true); //$NON-NLS-1$
+ rc = componentRegistrar.RegisterFactory (XPCOM.EXTERNAL_CID, aClassName, aContractID, externalFactory.getAddress ());
+ if (rc != XPCOM.NS_OK) {
+ browser.dispose ();
+ error (rc);
+ }
+ externalFactory.Release ();
+
+ rc = serviceManager.GetService (XPCOM.NS_CATEGORYMANAGER_CID, nsICategoryManager.NS_ICATEGORYMANAGER_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsICategoryManager categoryManager = new nsICategoryManager (result[0]);
+ result[0] = 0;
+ byte[] category = MozillaDelegate.wcsToMbcs (null, "JavaScript global property", true); //$NON-NLS-1$
+ byte[] entry = MozillaDelegate.wcsToMbcs (null, "external", true); //$NON-NLS-1$
+ rc = categoryManager.AddCategoryEntry(category, entry, aContractID, 1, 1, result);
+ result[0] = 0;
+ categoryManager.Release ();
+
/*
* This Download factory will be used if the GRE version is < 1.8.
* If the GRE version is 1.8.x then the Download factory that is registered later for
@@ -1001,6 +1252,30 @@ public void create (Composite parent, int style) {
XPCOM.XPCOMGlueShutdown ();
}
});
+
+ // the following is intentionally commented, because calling XRE_TermEmbedding
+ // causes subsequent browser instantiations within the process to fail
+
+// int size = XPCOM.nsDynamicFunctionLoad_sizeof ();
+// /* alloc memory for two structs, the second is empty to signify the end of the list */
+// int /*long*/ ptr = C.malloc (size * 2);
+// C.memset (ptr, 0, size * 2);
+// nsDynamicFunctionLoad functionLoad = new nsDynamicFunctionLoad ();
+// byte[] bytes = MozillaDelegate.wcsToMbcs (null, "XRE_TermEmbedding", true); //$NON-NLS-1$
+// functionLoad.functionName = C.malloc (bytes.length);
+// C.memmove (functionLoad.functionName, bytes, bytes.length);
+// functionLoad.function = C.malloc (C.PTR_SIZEOF);
+// C.memmove (functionLoad.function, new int /*long*/[] {0} , C.PTR_SIZEOF);
+// XPCOM.memmove (ptr, functionLoad, XPCOM.nsDynamicFunctionLoad_sizeof ());
+// XPCOM.XPCOMGlueLoadXULFunctions (ptr);
+// C.memmove (result, functionLoad.function, C.PTR_SIZEOF);
+// int /*long*/ functionPtr = result[0];
+// result[0] = 0;
+// C.free (functionLoad.function);
+// C.free (functionLoad.functionName);
+// C.free (ptr);
+// XPCOM.Call (functionPtr);
+
XPCOMWasGlued = false;
}
if (XPCOMInitWasGlued) {
@@ -1073,7 +1348,7 @@ public void create (Composite parent, int style) {
browser.dispose ();
error (XPCOM.NS_ERROR_FAILURE);
}
- rc = baseWindow.Create ();
+ rc = delegate.createBaseWindow (baseWindow);
if (rc != XPCOM.NS_OK) {
browser.dispose ();
error (XPCOM.NS_ERROR_FAILURE);
@@ -1133,6 +1408,7 @@ public void create (Composite parent, int style) {
new nsISupports (result[0]).Release ();
}
result[0] = 0;
+ IsPre_1_9 = true;
/*
* A Download factory for contract "Transfer" must be registered iff the GRE's version is 1.8.x.
@@ -1160,31 +1436,7 @@ public void create (Composite parent, int style) {
}
downloadFactory_1_8.Release ();
} else { /* >= 1.9 */
- /*
- * Bug in XULRunner 1.9. Mozilla no longer clears its background before initial content has
- * been set. As a result embedders appear broken if they do not immediately navigate to a url.
- * The workaround for this is to navigate to about:blank immediately so that the background is
- * cleared, but do not fire any corresponding events or allow Browser API calls to reveal this.
- * Once the client does a proper navigate with either setUrl() or setText() then resume as
- * normal. The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
- */
- awaitingNavigate = true;
- rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
- if (rc != XPCOM.NS_OK) {
- browser.dispose ();
- error (rc);
- }
- if (result[0] == 0) {
- browser.dispose ();
- error (XPCOM.NS_ERROR_NO_INTERFACE);
- }
- nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
- char[] uri = new char[ABOUT_BLANK.length () + 1];
- ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
- rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
- webNavigation.Release ();
-
- dialogFactory.isPre_1_9 = false;
+ IsPre_1_9 = false;
}
}
result[0] = 0;
@@ -1193,6 +1445,18 @@ public void create (Composite parent, int style) {
}
componentManager.Release ();
+ /*
+ * Bug in XULRunner 1.9. On win32, Mozilla does not clear its background before content has
+ * been set into it. As a result, embedders appear broken if they do not immediately display
+ * a URL or text. The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=453523.
+ *
+ * The workaround is to subclass the Mozilla window and clear it whenever WM_ERASEBKGND is received.
+ * This subclass should be removed once content has been set into the browser.
+ */
+ if (!IsPre_1_9) {
+ delegate.addWindowSubclass ();
+ }
+
rc = webBrowser.AddWebBrowserListener (weakReference.getAddress (), nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID);
if (rc != XPCOM.NS_OK) {
browser.dispose ();
@@ -1264,7 +1528,7 @@ public void create (Composite parent, int style) {
}
public boolean back () {
- if (awaitingNavigate) return false;
+ htmlBytes = null;
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -1390,6 +1654,18 @@ void createCOMInterfaces () {
public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
public int /*long*/ method3 (int /*long*/[] args) {return HandleEvent (args[0]);}
};
+
+ badCertListener = new XPCOMObject (new int[] {2, 0, 0, 4}) {
+ public int /*long*/ method0 (int /*long*/[] args) {return QueryInterface (args[0], args[1]);}
+ public int /*long*/ method1 (int /*long*/[] args) {return AddRef ();}
+ public int /*long*/ method2 (int /*long*/[] args) {return Release ();}
+ public int /*long*/ method3 (int /*long*/[] args) {return NotifyCertProblem (args[0], args[1], args[2], args[3]);}
+ };
+}
+
+void deregisterFunction (BrowserFunction function) {
+ super.deregisterFunction (function);
+ AllFunctions.remove (new Integer (function.index));
}
void disposeCOMInterfaces () {
@@ -1441,13 +1717,122 @@ void disposeCOMInterfaces () {
domEventListener.dispose ();
domEventListener = null;
}
+ if (badCertListener != null) {
+ badCertListener.dispose ();
+ badCertListener = null;
+ }
}
public boolean execute (String script) {
- if (awaitingNavigate) return false;
+ /*
+ * This could be the first content that is set into the browser, so
+ * ensure that the custom subclass that works around Mozilla bug
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
+ */
+ delegate.removeWindowSubclass ();
- String url = PREFIX_JAVASCRIPT + script + ";void(0);"; //$NON-NLS-1$
+ /*
+ * As of mozilla 1.9 executing javascript via the javascript: protocol no
+ * longer happens synchronously. As a result, the result of executing JS
+ * is not returned to the java side when expected by the client. The
+ * workaround is to invoke the javascript handler directly via C++, which is
+ * exposed as of mozilla 1.9.
+ */
int /*long*/[] result = new int /*long*/[1];
+ if (!IsPre_1_9) {
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ nsIPrincipal principal = null;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_SCRIPTSECURITYMANAGER_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager_1_9_1.NS_ISCRIPTSECURITYMANAGER_IID, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ nsIScriptSecurityManager_1_9_1 securityManager = new nsIScriptSecurityManager_1_9_1 (result[0]);
+ result[0] = 0;
+ rc = securityManager.GetSystemPrincipal (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+ principal = new nsIPrincipal (result[0]);
+ result[0] = 0;
+ securityManager.Release ();
+ } else {
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager_1_9.NS_ISCRIPTSECURITYMANAGER_IID, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ nsIScriptSecurityManager_1_9 securityManager = new nsIScriptSecurityManager_1_9 (result[0]);
+ result[0] = 0;
+ rc = securityManager.GetSystemPrincipal (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+ principal = new nsIPrincipal (result[0]);
+ result[0] = 0;
+ securityManager.Release ();
+ }
+ }
+ serviceManager.Release ();
+
+ if (principal != null) {
+ rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+
+ nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
+ result[0] = 0;
+ nsID scriptGlobalObjectNSID = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$
+ rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID, result);
+ interfaceRequestor.Release ();
+
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ int /*long*/ scriptGlobalObject = result[0];
+ result[0] = 0;
+ rc = (int/*64*/)XPCOM.nsIScriptGlobalObject_EnsureScriptEnvironment (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+ if (rc != XPCOM.NS_OK) error (rc);
+ int /*long*/ scriptContext = XPCOM.nsIScriptGlobalObject_GetScriptContext (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+ int /*long*/ globalJSObject = XPCOM.nsIScriptGlobalObject_GetScriptGlobal (scriptGlobalObject, 2); /* nsIProgrammingLanguage.JAVASCRIPT */
+ new nsISupports (scriptGlobalObject).Release ();
+
+ if (scriptContext != 0 && globalJSObject != 0) {
+ /* ensure that the received nsIScriptContext implements the expected interface */
+ nsID scriptContextNSID = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$
+ rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ new nsISupports (result[0]).Release ();
+ result[0] = 0;
+
+ int /*long*/ nativeContext = XPCOM.nsIScriptContext_GetNativeContext (scriptContext);
+ if (nativeContext != 0) {
+ int length = script.length ();
+ char[] scriptChars = new char[length];
+ script.getChars(0, length, scriptChars, 0);
+ byte[] urlbytes = MozillaDelegate.wcsToMbcs (null, getUrl (), true);
+ rc = principal.GetJSPrincipals (nativeContext, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ int /*long*/ principals = result[0];
+ result[0] = 0;
+ principal.Release ();
+ String mozillaPath = LocationProvider.mozillaPath + delegate.getJSLibraryName () + '\0';
+ byte[] pathBytes = null;
+ try {
+ pathBytes = mozillaPath.getBytes ("UTF-8"); //$NON-NLS-1$
+ } catch (UnsupportedEncodingException e) {
+ pathBytes = mozillaPath.getBytes ();
+ }
+ rc = XPCOM.JS_EvaluateUCScriptForPrincipals (pathBytes, nativeContext, globalJSObject, principals, scriptChars, length, urlbytes, 0, result);
+ return rc != 0;
+ }
+ }
+ }
+ }
+ }
+ principal.Release ();
+ }
+ }
+
+ /* fall back to the pre-1.9 approach */
+
+ String url = PREFIX_JAVASCRIPT + script + ";void(0);"; //$NON-NLS-1$
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
@@ -1465,8 +1850,53 @@ static Browser findBrowser (int /*long*/ handle) {
return MozillaDelegate.findBrowser (handle);
}
+static Browser findBrowser (nsIDOMWindow aDOMWindow) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error(rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
+ result[0] = 0;
+ /* the chrome will only be answered for the top-level nsIDOMWindow */
+ rc = aDOMWindow.GetTop (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ int /*long*/ topDOMWindow = result[0];
+ result[0] = 0;
+ rc = windowWatcher.GetChromeForWindow (topDOMWindow, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ new nsISupports (topDOMWindow).Release ();
+ windowWatcher.Release ();
+ if (result[0] == 0) return null; /* the parent chrome is disconnected */
+
+ nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]);
+ result[0] = 0;
+ rc = webBrowserChrome.QueryInterface (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ webBrowserChrome.Release ();
+
+ nsIEmbeddingSiteWindow embeddingSiteWindow = new nsIEmbeddingSiteWindow (result[0]);
+ result[0] = 0;
+ rc = embeddingSiteWindow.GetSiteWindow (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ embeddingSiteWindow.Release ();
+
+ return findBrowser (result[0]);
+}
+
public boolean forward () {
- if (awaitingNavigate) return false;
+ htmlBytes = null;
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -1480,9 +1910,15 @@ public boolean forward () {
return rc == XPCOM.NS_OK;
}
-public String getText () {
- if (awaitingNavigate) return ""; //$NON-NLS-1$
+public String getBrowserType () {
+ return "mozilla"; //$NON-NLS-1$
+}
+
+int getNextFunctionIndex () {
+ return NextJSFunctionIndex++;
+}
+public String getText () {
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.GetContentDOMWindow (result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -1542,8 +1978,6 @@ public String getText () {
}
public String getUrl () {
- if (awaitingNavigate) return ""; //$NON-NLS-1$
-
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -1605,8 +2039,6 @@ public Object getWebBrowser () {
}
public boolean isBackEnabled () {
- if (awaitingNavigate) return false;
-
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -1620,8 +2052,6 @@ public boolean isBackEnabled () {
}
public boolean isForwardEnabled () {
- if (awaitingNavigate) return false;
-
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
@@ -1645,6 +2075,9 @@ void onDispose (Display display) {
rc = webBrowser.SetParentURIContentListener (0);
if (rc != XPCOM.NS_OK) error (rc);
+ rc = webBrowser.SetContainerWindow (0);
+ if (rc != XPCOM.NS_OK) error (rc);
+
unhookDOMListeners ();
if (listener != null) {
int[] folderEvents = new int[] {
@@ -1676,6 +2109,8 @@ void onDispose (Display display) {
webBrowser.Release ();
webBrowser = null;
webBrowserObject = null;
+ lastNavigateURL = null;
+ htmlBytes = null;
if (tip != null && !tip.isDisposed ()) tip.dispose ();
tip = null;
@@ -1688,6 +2123,14 @@ void onDispose (Display display) {
}
unhookedDOMWindows = null;
+ elements = functions.elements ();
+ while (elements.hasMoreElements ()) {
+ BrowserFunction function = ((BrowserFunction)elements.nextElement ());
+ AllFunctions.remove (new Integer (function.index));
+ function.dispose (false);
+ }
+ functions = null;
+
delegate.onDispose (embedHandle);
delegate = null;
@@ -1706,7 +2149,7 @@ void Activate () {
if (rc != XPCOM.NS_OK) error (rc);
webBrowserFocus.Release ();
}
-
+
void Deactivate () {
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebBrowserFocus.NS_IWEBBROWSERFOCUS_IID, result);
@@ -1737,7 +2180,7 @@ void onResize () {
}
public void refresh () {
- if (awaitingNavigate) return;
+ htmlBytes = null;
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -1761,6 +2204,11 @@ public void refresh () {
if (rc != XPCOM.NS_ERROR_INVALID_POINTER && rc != XPCOM.NS_ERROR_FILE_NOT_FOUND) error (rc);
}
+void registerFunction (BrowserFunction function) {
+ super.registerFunction (function);
+ AllFunctions.put (new Integer (function.index), function);
+}
+
public boolean setText (String html) {
/*
* Feature in Mozilla. The focus memory of Mozilla must be
@@ -1789,101 +2237,126 @@ public boolean setText (String html) {
return false;
}
- awaitingNavigate = false;
-
- byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
- int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
- byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true); //$NON-NLS-1$
- int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+ /*
+ * This could be the first content that is set into the browser, so
+ * ensure that the custom subclass that works around Mozilla bug
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
+ */
+ delegate.removeWindowSubclass ();
int /*long*/[] result = new int /*long*/[1];
- int rc = XPCOM.NS_GetServiceManager (result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ int rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+ if (rc == XPCOM.NS_OK && result[0] != 0) {
+ /*
+ * Setting mozilla's content through nsIWebBrowserStream does not cause a page
+ * load to occur, so the events that usually accompany a page change are not
+ * fired. To make this behave as expected, navigate to about:blank first and
+ * then set the html content once the page has loaded.
+ */
+ new nsISupports (result[0]).Release ();
+ result[0] = 0;
- nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
- result[0] = 0;
- rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
- serviceManager.Release ();
+ /*
+ * If htmlBytes is not null then the about:blank page is already being loaded,
+ * so no Navigate is required. Just set the html that is to be shown.
+ */
+ boolean blankLoading = htmlBytes != null;
+ htmlBytes = data;
+ if (blankLoading) return true;
- nsIIOService ioService = new nsIIOService (result[0]);
- result[0] = 0;
- /*
- * Note. Mozilla ignores LINK tags used to load CSS stylesheets
- * when the URI protocol for the nsInputStreamChannel
- * is about:blank. The fix is to specify the file protocol.
- */
- byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
- rc = ioService.NewURI (aSpec, null, 0, result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
- XPCOM.nsEmbedCString_delete (aSpec);
- ioService.Release ();
+ /* navigate to about:blank */
+ rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+ nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
+ result[0] = 0;
+ char[] uri = new char[ABOUT_BLANK.length () + 1];
+ ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
+ rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
+ if (rc != XPCOM.NS_OK) error (rc);
+ webNavigation.Release ();
+ } else {
+ byte[] contentCharsetBuffer = MozillaDelegate.wcsToMbcs (null, "UTF-8", true); //$NON-NLS-1$
+ int /*long*/ aContentCharset = XPCOM.nsEmbedCString_new (contentCharsetBuffer, contentCharsetBuffer.length);
+ byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+ int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
- nsIURI uri = new nsIURI (result[0]);
- result[0] = 0;
+ rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
- rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
- nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
- result[0] = 0;
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
- /*
- * Feature in Mozilla. LoadStream invokes the nsIInputStream argument
- * through a different thread. The callback mechanism must attach
- * a non java thread to the JVM otherwise the nsIInputStream Read and
- * Close methods never get called.
- */
- InputStream inputStream = new InputStream (data);
- inputStream.AddRef ();
+ nsIIOService ioService = new nsIIOService (result[0]);
+ result[0] = 0;
+ /*
+ * Note. Mozilla ignores LINK tags used to load CSS stylesheets
+ * when the URI protocol for the nsInputStreamChannel
+ * is about:blank. The fix is to specify the file protocol.
+ */
+ byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+ int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ ioService.Release ();
+
+ nsIURI uri = new nsIURI (result[0]);
+ result[0] = 0;
- rc = interfaceRequestor.GetInterface (nsIDocShell_1_9.NS_IDOCSHELL_IID, result);
- if (rc == XPCOM.NS_OK) {
+ rc = webBrowser.QueryInterface (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
- nsIDocShell_1_9 docShell = new nsIDocShell_1_9 (result[0]);
+ nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]);
+ result[0] = 0;
+
+ /*
+ * Feature in Mozilla. LoadStream invokes the nsIInputStream argument
+ * through a different thread. The callback mechanism must attach
+ * a non java thread to the JVM otherwise the nsIInputStream Read and
+ * Close methods never get called.
+ */
+ InputStream inputStream = new InputStream (data);
+ inputStream.AddRef ();
+
+ rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+ nsIDocShell docShell = new nsIDocShell (result[0]);
+ result[0] = 0;
rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType, aContentCharset, 0);
docShell.Release ();
- } else {
- result[0] = 0;
- rc = interfaceRequestor.GetInterface (nsIDocShell_1_8.NS_IDOCSHELL_IID, result);
- if (rc == XPCOM.NS_OK) {
- if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
- nsIDocShell_1_8 docShell = new nsIDocShell_1_8 (result[0]);
- rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType, aContentCharset, 0);
- docShell.Release ();
- } else {
- result[0] = 0;
- rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
- if (rc != XPCOM.NS_OK) error (rc);
- if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
- nsIDocShell docShell = new nsIDocShell (result[0]);
- rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType, aContentCharset, 0);
- docShell.Release ();
- }
- }
- if (rc != XPCOM.NS_OK) error (rc);
- result[0] = 0;
- inputStream.Release ();
- interfaceRequestor.Release ();
- uri.Release ();
- XPCOM.nsEmbedCString_delete (aContentCharset);
- XPCOM.nsEmbedCString_delete (aContentType);
+ inputStream.Release ();
+ interfaceRequestor.Release ();
+ uri.Release ();
+ XPCOM.nsEmbedCString_delete (aContentType);
+ XPCOM.nsEmbedCString_delete (aContentCharset);
+ }
return true;
}
public boolean setUrl (String url) {
- awaitingNavigate = false;
+ htmlBytes = null;
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+ /*
+ * This could be the first content that is set into the browser, so
+ * ensure that the custom subclass that works around Mozilla bug
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=453523 is removed.
+ */
+ delegate.removeWindowSubclass ();
+
nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
char[] uri = new char[url.length () + 1];
url.getChars (0, url.length (), uri, 0);
@@ -1893,7 +2366,7 @@ public boolean setUrl (String url) {
}
public void stop () {
- if (awaitingNavigate) return;
+ htmlBytes = null;
int /*long*/[] result = new int /*long*/[1];
int rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
@@ -2106,6 +2579,11 @@ int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
AddRef ();
return XPCOM.NS_OK;
}
+ if (guid.Equals (nsIBadCertListener2.NS_IBADCERTLISTENER2_IID)) {
+ XPCOM.memmove (ppvObject, new int /*long*/[] {badCertListener.getAddress ()}, C.PTR_SIZEOF);
+ AddRef ();
+ return XPCOM.NS_OK;
+ }
XPCOM.memmove (ppvObject, new int /*long*/[] {0}, C.PTR_SIZEOF);
return XPCOM.NS_ERROR_NO_INTERFACE;
}
@@ -2155,22 +2633,39 @@ int GetWeakReference (int /*long*/ ppvObject) {
int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) {
if ((aStateFlags & nsIWebProgressListener.STATE_IS_DOCUMENT) == 0) return XPCOM.NS_OK;
if ((aStateFlags & nsIWebProgressListener.STATE_START) != 0) {
- if (request == 0) request = aRequest;
+ int /*long*/[] result = new int /*long*/[1];
- if (!awaitingNavigate) {
- /*
- * Add the page's nsIDOMWindow to the collection of windows that will
- * have DOM listeners added to them later on in the page loading
- * process. These listeners cannot be added yet because the
- * nsIDOMWindow is not ready to take them at this stage.
- */
- int /*long*/[] result = new int /*long*/[1];
- nsIWebProgress progress = new nsIWebProgress (aWebProgress);
- int rc = progress.GetDOMWindow (result);
+ /*
+ * When navigating to a site that is known to have a bad certificate, request notification
+ * callbacks on the channel so that our nsIBadCertListener2 will be invoked.
+ */
+ if (isRetrievingBadCert) {
+ isRetrievingBadCert = false;
+ nsIRequest request = new nsIRequest (aRequest);
+ int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
if (rc != XPCOM.NS_OK) error (rc);
if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
- unhookedDOMWindows.addElement (new LONG (result[0]));
+
+ nsIChannel channel = new nsIChannel (result[0]);
+ result[0] = 0;
+ rc = channel.SetNotificationCallbacks (interfaceRequestor.getAddress ());
+ if (rc != XPCOM.NS_OK) error (rc);
+ channel.Release ();
+ return XPCOM.NS_OK;
}
+
+ if (request == 0) request = aRequest;
+ /*
+ * Add the page's nsIDOMWindow to the collection of windows that will
+ * have DOM listeners added to them later on in the page loading
+ * process. These listeners cannot be added yet because the
+ * nsIDOMWindow is not ready to take them at this stage.
+ */
+ nsIWebProgress progress = new nsIWebProgress (aWebProgress);
+ int rc = progress.GetDOMWindow (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ unhookedDOMWindows.addElement (new LONG (result[0]));
} else if ((aStateFlags & nsIWebProgressListener.STATE_REDIRECTING) != 0) {
if (request == aRequest) request = 0;
} else if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) {
@@ -2215,6 +2710,117 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
unhookedDOMWindows.remove (ptrObject);
new nsISupports (ptrObject.value).Release ();
}
+
+ boolean deferCompleted = false;
+ /*
+ * If htmlBytes is not null then there is html from a previous setText() call
+ * waiting to be set into the about:blank page once it has completed loading.
+ */
+ if (htmlBytes != null) {
+ nsIRequest req = new nsIRequest (aRequest);
+ int /*long*/ name = XPCOM.nsEmbedCString_new ();
+ rc = req.GetName (name);
+ if (rc != XPCOM.NS_OK) error (rc);
+ int length = XPCOM.nsEmbedCString_Length (name);
+ int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
+ byte[] dest = new byte[length];
+ XPCOM.memmove (dest, buffer, length);
+ String url = new String (dest);
+ XPCOM.nsEmbedCString_delete (name);
+
+ if (url.startsWith (ABOUT_BLANK)) {
+ /*
+ * Setting mozilla's content with nsIWebBrowserStream invalidates the
+ * DOM listeners that were hooked on it (about:blank), so remove them and
+ * add new ones after the content has been set.
+ */
+ unhookDOMListeners ();
+
+ rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIIOService ioService = new nsIIOService (result[0]);
+ result[0] = 0;
+ /*
+ * Note. Mozilla ignores LINK tags used to load CSS stylesheets
+ * when the URI protocol for the nsInputStreamChannel
+ * is about:blank. The fix is to specify the file protocol.
+ */
+ byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
+ int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
+ rc = ioService.NewURI (aSpec, null, 0, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ XPCOM.nsEmbedCString_delete (aSpec);
+ ioService.Release ();
+
+ nsIURI uri = new nsIURI (result[0]);
+ result[0] = 0;
+
+ rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
+ result[0] = 0;
+
+ byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
+ int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
+
+ rc = stream.OpenStream (uri.getAddress (), aContentType);
+ if (rc != XPCOM.NS_OK) error (rc);
+ int /*long*/ ptr = C.malloc (htmlBytes.length);
+ XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
+ int pageSize = 8192;
+ int pageCount = htmlBytes.length / pageSize + 1;
+ int /*long*/ current = ptr;
+ for (int i = 0; i < pageCount; i++) {
+ length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
+ if (length > 0) {
+ rc = stream.AppendToStream (current, length);
+ if (rc != XPCOM.NS_OK) error (rc);
+ }
+ current += pageSize;
+ }
+ rc = stream.CloseStream ();
+ if (rc != XPCOM.NS_OK) error (rc);
+ C.free (ptr);
+ XPCOM.nsEmbedCString_delete (aContentType);
+ stream.Release ();
+ uri.Release ();
+ htmlBytes = null;
+ /*
+ * Browser content that is set via nsIWebBrowserStream is not parsed immediately.
+ * Since clients depend on the Completed event to know when the browser's content
+ * is available, delay the sending of this event so that the stream content will
+ * be parsed first.
+ */
+ deferCompleted = true;
+
+ rc = webBrowser.GetContentDOMWindow (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+ boolean isTop = result[0] == domWindow.getAddress ();
+ new nsISupports (result[0]).Release ();
+ result[0] = 0;
+
+ rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
+ nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
+ result[0] = 0;
+ hookDOMListeners (target, isTop);
+ target.Release ();
+ }
+ }
domWindow.Release ();
/*
@@ -2228,20 +2834,37 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
*/
if (request == aRequest || request == 0) {
request = 0;
- if (!awaitingNavigate) {
- StatusTextEvent event = new StatusTextEvent (browser);
- event.display = browser.getDisplay ();
- event.widget = browser;
- event.text = ""; //$NON-NLS-1$
- for (int i = 0; i < statusTextListeners.length; i++) {
- statusTextListeners[i].changed (event);
- }
- ProgressEvent event2 = new ProgressEvent (browser);
- event2.display = browser.getDisplay ();
- event2.widget = browser;
- for (int i = 0; i < progressListeners.length; i++) {
- progressListeners[i].completed (event2);
+ StatusTextEvent event = new StatusTextEvent (browser);
+ event.display = browser.getDisplay ();
+ event.widget = browser;
+ event.text = ""; //$NON-NLS-1$
+ for (int i = 0; i < statusTextListeners.length; i++) {
+ statusTextListeners[i].changed (event);
+ }
+
+ /* re-install registered functions */
+ Enumeration elements = functions.elements ();
+ while (elements.hasMoreElements ()) {
+ BrowserFunction function = (BrowserFunction)elements.nextElement ();
+ execute (function.functionString);
+ }
+
+ final Display display = browser.getDisplay ();
+ final ProgressEvent event2 = new ProgressEvent (browser);
+ event2.display = display;
+ event2.widget = browser;
+ Runnable runnable = new Runnable () {
+ public void run () {
+ if (browser.isDisposed ()) return;
+ for (int i = 0; i < progressListeners.length; i++) {
+ progressListeners[i].completed (event2);
+ }
}
+ };
+ if (deferCompleted) {
+ display.asyncExec (runnable);
+ } else {
+ display.syncExec (runnable);
}
}
} else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) {
@@ -2289,7 +2912,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
}
int OnProgressChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aCurSelfProgress, int aMaxSelfProgress, int aCurTotalProgress, int aMaxTotalProgress) {
- if (awaitingNavigate || progressListeners.length == 0) return XPCOM.NS_OK;
+ if (progressListeners.length == 0) return XPCOM.NS_OK;
ProgressEvent event = new ProgressEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
@@ -2313,7 +2936,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
*/
if (request != 0 && request != aRequest) request = aRequest;
- if (awaitingNavigate || locationListeners.length == 0) return XPCOM.NS_OK;
+ if (locationListeners.length == 0) return XPCOM.NS_OK;
nsIWebProgress webProgress = new nsIWebProgress (aWebProgress);
int /*long*/[] aDOMWindow = new int /*long*/[1];
@@ -2366,7 +2989,7 @@ int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*lo
}
int OnStatusChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStatus, int /*long*/ aMessage) {
- if (awaitingNavigate || statusTextListeners.length == 0) return XPCOM.NS_OK;
+ if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
@@ -2387,7 +3010,7 @@ int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int stat
/* nsIWebBrowserChrome */
int SetStatus (int statusType, int /*long*/ status) {
- if (awaitingNavigate || statusTextListeners.length == 0) return XPCOM.NS_OK;
+ if (statusTextListeners.length == 0) return XPCOM.NS_OK;
StatusTextEvent event = new StatusTextEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
@@ -2600,7 +3223,7 @@ int GetTitle (int /*long*/ aTitle) {
}
int SetTitle (int /*long*/ aTitle) {
- if (awaitingNavigate || titleListeners.length == 0) return XPCOM.NS_OK;
+ if (titleListeners.length == 0) return XPCOM.NS_OK;
TitleEvent event = new TitleEvent (browser);
event.display = browser.getDisplay ();
event.widget = browser;
@@ -2672,8 +3295,6 @@ int FocusPrevElement () {
/* nsIContextMenuListener */
int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
- if (awaitingNavigate) return XPCOM.NS_OK;
-
nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
int /*long*/[] result = new int /*long*/[1];
int rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
@@ -2706,10 +3327,9 @@ int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNod
/* nsIURIContentListener */
int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
- if (awaitingNavigate || locationListeners.length == 0) {
- XPCOM.memmove (retval, new int[] {0}, 4); /* PRBool */
- return XPCOM.NS_OK;
- }
+ if (isRetrievingBadCert) return XPCOM.NS_OK;
+ authCount = 0;
+
nsIURI location = new nsIURI (aURI);
int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
location.GetSpec (aSpec);
@@ -2720,27 +3340,62 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
XPCOM.memmove (dest, buffer, length);
XPCOM.nsEmbedCString_delete (aSpec);
String value = new String (dest);
+
+ /*
+ * Navigating to "...aboutCertError.xhtml", or to "javascript:showSecuritySection()" when
+ * the page "netError.xhtml" is showing, indicates that the last attempted page view had
+ * an invalid certificate. When this happens, veto the current navigate and re-navigate
+ * to the page with the bad certificate so that NotifyCertProblem will be invoked.
+ */
+ if (value.indexOf ("aboutCertError.xhtml") != -1 || (isViewingErrorPage && value.indexOf ("javascript:showSecuritySection") != -1)) { //$NON-NLS-1$ //$NON-NLS-2$
+ XPCOM.memmove (retval, new int[] {1}, 4); /* PRBool */
+ isRetrievingBadCert = true;
+ setUrl (lastNavigateURL);
+ return XPCOM.NS_OK;
+ }
+ isViewingErrorPage = value.indexOf ("netError.xhtml") != -1; //$NON-NLS-1$
+
boolean doit = true;
if (request == 0) {
/*
- * listeners should not be notified of internal transitions like "javascipt:..."
+ * listeners should not be notified of internal transitions like "javascript:..."
* because this is an implementation side-effect, not a true navigate
*/
if (!value.startsWith (PREFIX_JAVASCRIPT)) {
- LocationEvent event = new LocationEvent (browser);
- event.display = browser.getDisplay();
- event.widget = browser;
- event.location = value;
- /*
- * If the URI indicates that the page is being rendered from memory
- * (via setText()) then set it to about:blank to be consistent with IE.
- */
- if (event.location.equals (URI_FROMMEMORY)) event.location = ABOUT_BLANK;
- event.doit = doit;
- for (int i = 0; i < locationListeners.length; i++) {
- locationListeners[i].changing (event);
+ if (locationListeners.length > 0) {
+ LocationEvent event = new LocationEvent (browser);
+ event.display = browser.getDisplay();
+ event.widget = browser;
+ event.location = value;
+ /*
+ * If the URI indicates that the page is being rendered from memory
+ * (via setText()) then set it to about:blank to be consistent with IE.
+ */
+ if (event.location.equals (URI_FROMMEMORY)) event.location = ABOUT_BLANK;
+ event.doit = doit;
+ for (int i = 0; i < locationListeners.length; i++) {
+ locationListeners[i].changing (event);
+ }
+ doit = event.doit && !browser.isDisposed();
+ }
+
+ if (doit) {
+ if (jsEnabledChanged) {
+ jsEnabledChanged = false;
+
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = webBrowser.QueryInterface (nsIWebBrowserSetup.NS_IWEBBROWSERSETUP_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIWebBrowserSetup setup = new nsIWebBrowserSetup (result[0]);
+ result[0] = 0;
+ rc = setup.SetProperty (nsIWebBrowserSetup.SETUP_ALLOW_JAVASCRIPT, jsEnabled ? 1 : 0);
+ if (rc != XPCOM.NS_OK) error (rc);
+ setup.Release ();
+ }
+ if (!isViewingErrorPage) lastNavigateURL = value;
}
- doit = event.doit && !browser.isDisposed();
}
}
XPCOM.memmove (retval, new int[] {doit ? 0 : 1}, 4); /* PRBool */
@@ -2832,8 +3487,6 @@ int SetParentContentListener (int /*long*/ aParentContentListener) {
/* nsITooltipListener */
int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) {
- if (awaitingNavigate) return XPCOM.NS_OK;
-
int length = XPCOM.strlen_PRUnichar (aTipText);
char[] dest = new char[length];
XPCOM.memmove (dest, aTipText, length * 2);
@@ -3220,4 +3873,152 @@ int HandleEvent (int /*long*/ event) {
}
return XPCOM.NS_OK;
}
+
+/* nsIBadCertListener2 */
+
+int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int /*long*/ _suppressError) {
+ /* determine the host name and port */
+ int length = XPCOM.nsEmbedCString_Length (targetSite);
+ int /*long*/ buffer = XPCOM.nsEmbedCString_get (targetSite);
+ byte[] dest = new byte[length];
+ XPCOM.memmove (dest, buffer, length);
+ final String urlPort = new String (dest);
+ int index = urlPort.indexOf (':');
+ final String host = urlPort.substring (0,index);
+ final int port = Integer.valueOf (urlPort.substring (index + 1)).intValue ();
+
+ /* create text descriptions of the certificate problem(s) */
+
+ int /*long*/[] result = new int /*long*/[1];
+ nsISupports supports = new nsISupports (status);
+ int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsISSLStatus sslStatus = new nsISSLStatus (result[0]);
+ result[0] = 0;
+ rc = sslStatus.GetServerCert (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+
+ final nsIX509Cert cert = new nsIX509Cert (result[0]);
+ result[0] = 0;
+ String[] problems = new String[3];
+ int problemCount = 0, flags = 0;
+ int[] intResult = new int[1];
+
+ rc = sslStatus.GetIsDomainMismatch (intResult);
+ if (intResult[0] != 0) {
+ int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ rc = cert.GetCommonName (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+ buffer = XPCOM.nsEmbedString_get (ptr);
+ char[] chars = new char[length];
+ XPCOM.memmove (chars, buffer, length * 2);
+ String name = new String (chars);
+ problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_InvalidName", new String[] {name}); //$NON-NLS-1$
+ flags |= nsICertOverrideService.ERROR_MISMATCH;
+ XPCOM.nsEmbedString_delete (ptr);
+ }
+ intResult[0] = 0;
+
+ rc = sslStatus.GetIsNotValidAtThisTime (intResult);
+ if (intResult[0] != 0) {
+ rc = cert.GetValidity (result);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result[0] == 0) error (XPCOM.NS_ERROR_NULL_POINTER);
+
+ nsIX509CertValidity validity = new nsIX509CertValidity(result[0]);
+ result[0] = 0;
+
+ int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ rc = validity.GetNotBeforeGMT (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+ buffer = XPCOM.nsEmbedString_get (ptr);
+ char[] chars = new char[length];
+ XPCOM.memmove (chars, buffer, length * 2);
+ String notBefore = new String (chars);
+ XPCOM.nsEmbedString_delete (ptr);
+
+ ptr = XPCOM.nsEmbedString_new ();
+ rc = validity.GetNotAfterGMT (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+ buffer = XPCOM.nsEmbedString_get (ptr);
+ chars = new char[length];
+ XPCOM.memmove (chars, buffer, length * 2);
+ String notAfter = new String (chars);
+ XPCOM.nsEmbedString_delete (ptr);
+
+ String range = notBefore + " - " + notAfter; //$NON-NLS-1$
+ problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_NotValid", new String[] {range}); //$NON-NLS-1$
+ flags |= nsICertOverrideService.ERROR_TIME;
+ validity.Release ();
+ }
+ intResult[0] = 0;
+
+ rc = sslStatus.GetIsUntrusted (intResult);
+ if (intResult[0] != 0) {
+ int /*long*/ ptr = XPCOM.nsEmbedString_new ();
+ rc = cert.GetIssuerCommonName (ptr);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ length = XPCOM.nsEmbedString_Length (ptr);
+ buffer = XPCOM.nsEmbedString_get (ptr);
+ char[] chars = new char[length];
+ XPCOM.memmove (chars, buffer, length * 2);
+ String name = new String (chars);
+ problems[problemCount++] = Compatibility.getMessage ("SWT_InvalidCert_NotTrusted", new String[] {name}); //$NON-NLS-1$
+ flags |= nsICertOverrideService.ERROR_UNTRUSTED;
+ XPCOM.nsEmbedString_delete (ptr);
+ }
+ intResult[0] = 0;
+ sslStatus.Release ();
+
+ /*
+ * The invalid certificate dialog must be shown asynchronously because
+ * NotifyCertProblem implementations cannot block.
+ */
+ final int finalFlags = flags;
+ final String[] finalProblems = new String[problemCount];
+ System.arraycopy (problems, 0, finalProblems, 0, problemCount);
+ final String url = lastNavigateURL;
+ browser.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ if (browser.isDisposed ()) return;
+ if (!url.equals (lastNavigateURL)) return; /* user has navigated elsewhere */
+
+ String message = Compatibility.getMessage ("SWT_InvalidCert_Message", new String[] {urlPort}); //$NON-NLS-1$
+ if (new PromptDialog (browser.getShell ()).invalidCert (browser, message, finalProblems, cert)) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTOVERRIDE_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICertOverrideService.NS_ICERTOVERRIDESERVICE_IID, result);
+ if (rc != XPCOM.NS_OK) error (rc);
+ if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsICertOverrideService overrideService = new nsICertOverrideService (result[0]);
+ result[0] = 0;
+ byte[] hostBytes = MozillaDelegate.wcsToMbcs (null, host, false);
+ int /*long*/ hostString = XPCOM.nsEmbedCString_new (hostBytes, hostBytes.length);
+ rc = overrideService.RememberValidityOverride (hostString, port, cert.getAddress (), finalFlags, 1);
+ browser.setUrl (url);
+ XPCOM.nsEmbedCString_delete (hostString);
+ overrideService.Release ();
+ }
+ cert.Release ();
+ }
+ });
+
+ C.memmove (_suppressError, new int[] {1}, 4); /* PRInt32 */
+ return XPCOM.NS_OK;
+}
+
}
diff --git a/org/eclipse/swt/browser/MozillaDelegate.java b/org/eclipse/swt/browser/MozillaDelegate.java
index 60e0df7..76a5d83 100644
--- a/org/eclipse/swt/browser/MozillaDelegate.java
+++ b/org/eclipse/swt/browser/MozillaDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.internal.*;
import org.eclipse.swt.internal.gtk.*;
+import org.eclipse.swt.internal.mozilla.*;
import org.eclipse.swt.widgets.*;
class MozillaDelegate {
@@ -25,17 +26,23 @@ class MozillaDelegate {
static int /*long*/ eventProc;
static final int STOP_PROPOGATE = 1;
- static boolean IsLinux;
+ static boolean IsSparc;
static {
String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
- IsLinux = osName.startsWith ("linux"); //$NON-NLS-1$
+ String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
+ IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$
}
MozillaDelegate (Browser browser) {
super ();
- if (!IsLinux) {
- browser.dispose ();
- SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
+ /*
+ * The mozilla libraries on SPARC need the C++ runtime library to be loaded, but they do not declare
+ * this dependency because they usually get it for free as a result of the mozilla executable pulling it
+ * in. Load this library here and scope it globally so that the mozilla libraries can resolve.
+ */
+ if (IsSparc) {
+ byte[] buffer = Converter.wcsToMbcs (null, "libCrun.so.1", true); //$NON-NLS-1$
+ OS.dlopen (buffer, OS.RTLD_NOW | OS.RTLD_GLOBAL);
}
this.browser = browser;
}
@@ -69,6 +76,13 @@ static byte[] wcsToMbcs (String codePage, String string, boolean terminate) {
return Converter.wcsToMbcs (codePage, string, terminate);
}
+void addWindowSubclass () {
+}
+
+int createBaseWindow (nsIBaseWindow baseWindow) {
+ return baseWindow.Create ();
+}
+
int /*long*/ getHandle () {
/*
* Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed
@@ -86,6 +100,10 @@ int /*long*/ getHandle () {
return embedHandle;
}
+String getJSLibraryName () {
+ return "libmozjs.so"; //$NON-NLS-1$
+}
+
String getLibraryName () {
return "libxpcom.so"; //$NON-NLS-1$
}
@@ -195,6 +213,9 @@ void onDispose (int /*long*/ embedHandle) {
browser = null;
}
+void removeWindowSubclass () {
+}
+
void setSize (int /*long*/ embedHandle, int width, int height) {
OS.gtk_widget_set_size_request (embedHandle, width, height);
}
diff --git a/org/eclipse/swt/browser/ProgressEvent.java b/org/eclipse/swt/browser/ProgressEvent.java
index c2e530f..204e2ed 100644
--- a/org/eclipse/swt/browser/ProgressEvent.java
+++ b/org/eclipse/swt/browser/ProgressEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,8 +31,15 @@ public class ProgressEvent extends TypedEvent {
static final long serialVersionUID = 3977018427045393972L;
-ProgressEvent(Widget w) {
- super(w);
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param widget the widget that fired the event
+ *
+ * @since 3.5
+ */
+public ProgressEvent(Widget widget) {
+ super(widget);
}
/**
diff --git a/org/eclipse/swt/browser/ProgressListener.java b/org/eclipse/swt/browser/ProgressListener.java
index 756774e..06fbc40 100644
--- a/org/eclipse/swt/browser/ProgressListener.java
+++ b/org/eclipse/swt/browser/ProgressListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/browser/PromptDialog.java b/org/eclipse/swt/browser/PromptDialog.java
index f4558d0..df42674 100644
--- a/org/eclipse/swt/browser/PromptDialog.java
+++ b/org/eclipse/swt/browser/PromptDialog.java
@@ -11,6 +11,10 @@
package org.eclipse.swt.browser;
import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.internal.Compatibility;
+import org.eclipse.swt.internal.mozilla.*;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;
@@ -69,6 +73,140 @@ class PromptDialog extends Dialog {
}
}
+ boolean invalidCert(final Browser browser, String message, String[] problems, final nsIX509Cert cert) {
+ Shell parent = getParent();
+ Display display = parent.getDisplay();
+ Monitor monitor = parent.getMonitor();
+ int maxWidth = monitor.getBounds().width * 2 / 3;
+ final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+ shell.setText(Compatibility.getMessage("SWT_InvalidCert_Title")); //$NON-NLS-1$
+ shell.setLayout(new GridLayout());
+
+ Composite messageComposite = new Composite(shell, SWT.NONE);
+ messageComposite.setLayout(new GridLayout(2, false));
+ Image image = display.getSystemImage(SWT.ICON_WARNING);
+ new Label(messageComposite, SWT.NONE).setImage(image);
+ Text text = new Text(messageComposite, SWT.WRAP);
+ text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+ text.setEditable(false);
+ text.setBackground(shell.getBackground());
+ text.setText(message);
+ int width = messageComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
+ GridData data = new GridData();
+ data.widthHint = Math.min(width, maxWidth);
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ messageComposite.setLayoutData(data);
+
+ StyledText problemsText = new StyledText(shell, SWT.WRAP);
+ problemsText.setMargins(30, 0, 30, 0);
+ problemsText.setEditable(false);
+ problemsText.setBackground(shell.getBackground());
+ for (int i = 0; i < problems.length; i++) {
+ problemsText.append(problems[i] + '\n');
+ }
+ StyleRange style = new StyleRange();
+ style.metrics = new GlyphMetrics(0, 0, 30);
+ Bullet bullet0 = new Bullet (style);
+ problemsText.setLineBullet(0, problems.length, bullet0);
+ width = problemsText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
+ data = new GridData();
+ data.widthHint = Math.min(width, maxWidth);
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ problemsText.setLayoutData(data);
+
+ text = new Text(shell, SWT.SINGLE);
+ text.setEditable(false);
+ text.setBackground(shell.getBackground());
+ text.setText(Compatibility.getMessage("SWT_InvalidCert_Connect")); //$NON-NLS-1$
+
+ new Label(shell, SWT.NONE); /* vertical spacer */
+
+ /*
+ * Create a local invisible Browser to be passed to the ViewCert call,
+ * so that this prompter can be the certificate view dialog's parent.
+ */
+ final Browser localBrowser = new Browser(shell, browser.getStyle());
+ data = new GridData();
+ data.exclude = true;
+ localBrowser.setLayoutData(data);
+
+ Composite buttonsComposite = new Composite(shell, SWT.NONE);
+ buttonsComposite.setLayout(new GridLayout(3, true));
+ buttonsComposite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+
+ Button viewCertButton = new Button(buttonsComposite, SWT.PUSH);
+ viewCertButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+ viewCertButton.setText(Compatibility.getMessage("View Certificate")); //$NON-NLS-1$
+ viewCertButton.addListener(SWT.Selection, new Listener() {
+ public void handleEvent(Event event) {
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager(result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_CERTIFICATEDIALOGS_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsICertificateDialogs.NS_ICERTIFICATEDIALOGS_IID, result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release();
+
+ nsICertificateDialogs dialogs = new nsICertificateDialogs(result[0]);
+ result[0] = 0;
+
+ /*
+ * Bug in Mozilla. The certificate viewer dialog does not show its content when
+ * opened. The workaround is to periodically wake up the UI thread.
+ */
+ Runnable runnable = new Runnable() {
+ public void run() {
+ browser.getDisplay().timerExec(1000, this);
+ }
+ };
+ runnable.run();
+
+ rc = ((Mozilla)localBrowser.webBrowser).webBrowser.GetContentDOMWindow(result);
+ if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+ if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
+ nsIDOMWindow window = new nsIDOMWindow(result[0]);
+ result[0] = 0;
+
+ rc = dialogs.ViewCert(window.getAddress(), cert.getAddress());
+ browser.getDisplay().timerExec(-1, runnable);
+ window.Release();
+ dialogs.Release();
+ }
+ });
+
+ final Button okButton = new Button(buttonsComposite, SWT.PUSH);
+ okButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+ okButton.setText(Compatibility.getMessage("SWT_OK")); //$NON-NLS-1$
+ Button cancelButton = new Button(buttonsComposite, SWT.PUSH);
+ cancelButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+ cancelButton.setText(Compatibility.getMessage("SWT_Cancel")); //$NON-NLS-1$
+ final boolean[] result = new boolean[1];
+ Listener listener = new Listener() {
+ public void handleEvent(Event event) {
+ shell.dispose();
+ result[0] = event.widget == okButton;
+ }
+ };
+ okButton.addListener(SWT.Selection, listener);
+ cancelButton.addListener(SWT.Selection, listener);
+
+ cancelButton.setFocus();
+ shell.setDefaultButton(cancelButton);
+ shell.pack();
+ shell.open();
+ while (!shell.isDisposed()) {
+ if (!display.readAndDispatch()) display.sleep();
+ }
+ return result[0];
+ }
+
void confirmEx(String title, String text, String check, String button0, String button1, String button2, int defaultIndex, final int[] checkValue, final int[] result) {
Shell parent = getParent();
final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
diff --git a/org/eclipse/swt/browser/PromptService2.java b/org/eclipse/swt/browser/PromptService2.java
index 8fba3b7..e41b97a 100644
--- a/org/eclipse/swt/browser/PromptService2.java
+++ b/org/eclipse/swt/browser/PromptService2.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -123,49 +123,8 @@ int Release () {
Browser getBrowser (int /*long*/ aDOMWindow) {
if (aDOMWindow == 0) return null;
-
- int /*long*/[] result = new int /*long*/[1];
- int rc = XPCOM.NS_GetServiceManager (result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
-
- nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
- result[0] = 0;
- byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_WINDOWWATCHER_CONTRACTID, true);
- rc = serviceManager.GetServiceByContractID (aContractID, nsIWindowWatcher.NS_IWINDOWWATCHER_IID, result);
- if (rc != XPCOM.NS_OK) Mozilla.error(rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
- serviceManager.Release ();
-
- nsIWindowWatcher windowWatcher = new nsIWindowWatcher (result[0]);
- result[0] = 0;
- /* the chrome will only be answered for the top-level nsIDOMWindow */
nsIDOMWindow window = new nsIDOMWindow (aDOMWindow);
- rc = window.GetTop (result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
- aDOMWindow = result[0];
- result[0] = 0;
- rc = windowWatcher.GetChromeForWindow (aDOMWindow, result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
- windowWatcher.Release ();
-
- nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]);
- result[0] = 0;
- rc = webBrowserChrome.QueryInterface (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
- webBrowserChrome.Release ();
-
- nsIEmbeddingSiteWindow embeddingSiteWindow = new nsIEmbeddingSiteWindow (result[0]);
- result[0] = 0;
- rc = embeddingSiteWindow.GetSiteWindow (result);
- if (rc != XPCOM.NS_OK) Mozilla.error (rc);
- if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
- embeddingSiteWindow.Release ();
-
- return Mozilla.findBrowser (result[0]);
+ return Mozilla.findBrowser (window);
}
String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
@@ -190,7 +149,7 @@ String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) {
/* nsIPromptService */
int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText) {
- Browser browser = getBrowser (aParent);
+ final Browser browser = getBrowser (aParent);
int length = XPCOM.strlen_PRUnichar (aDialogTitle);
char[] dest = new char[length];
@@ -202,6 +161,25 @@ int Alert (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText)
XPCOM.memmove (dest, aText, length * 2);
String textLabel = new String (dest);
+ /*
+ * If mozilla is showing its errors with dialogs (as opposed to pages) then the only
+ * opportunity to detect that a page has an invalid certificate, without receiving
+ * all notification callbacks on the channel, is to detect the displaying of an alert
+ * whose message contains an internal cert error code. If a such a message is
+ * detected then instead of showing it, re-navigate to the page with the invalid
+ * certificate so that the browser's nsIBadCertListener2 will be invoked.
+ */
+ if (textLabel.indexOf ("ssl_error_bad_cert_domain") != -1 ||
+ textLabel.indexOf ("sec_error_unknown_issuer") != -1 ||
+ textLabel.indexOf ("sec_error_expired_certificate") != -1) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (browser != null) {
+ Mozilla mozilla = (Mozilla)browser.webBrowser;
+ mozilla.isRetrievingBadCert = true;
+ browser.setUrl (mozilla.lastNavigateURL);
+ return XPCOM.NS_OK;
+ }
+ }
+
Shell shell = browser == null ? new Shell () : browser.getShell ();
MessageBox messageBox = new MessageBox (shell, SWT.OK | SWT.ICON_WARNING);
messageBox.setText (titleLabel);
@@ -358,37 +336,35 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
* User selected OK. User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
- int cnt, size;
- int /*long*/ ptr;
- char[] buffer;
- int /*long*/[] result2 = new int /*long*/[1];
if (valueLabel[0] != null) {
- cnt = valueLabel[0].length ();
- buffer = new char[cnt + 1];
+ int /*long*/[] result2 = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result2);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
+ result2[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result2[0]);
+ result2[0] = 0;
+
+ int cnt = valueLabel[0].length ();
+ char[] buffer = new char[cnt + 1];
valueLabel[0].getChars (0, cnt, buffer, 0);
- size = buffer.length * 2;
- ptr = C.malloc (size);
+ int size = buffer.length * 2;
+ int /*long*/ ptr = memory.Alloc (size);
XPCOM.memmove (ptr, buffer, size);
XPCOM.memmove (aValue, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
if (valueAddr[0] != 0) {
- int rc = XPCOM.NS_GetServiceManager (result2);
- if (rc != XPCOM.NS_OK) SWT.error (rc);
- if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-
- nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
- result2[0] = 0;
- byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
- rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
- if (rc != XPCOM.NS_OK) SWT.error (rc);
- if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
- serviceManager.Release ();
-
- nsIMemory memory = new nsIMemory (result2[0]);
- result2[0] = 0;
memory.Free (valueAddr[0]);
- memory.Release ();
}
+ memory.Release ();
}
}
if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4);
@@ -396,7 +372,43 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
}
int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkboxValue, int /*long*/ _retval) {
+ nsIAuthInformation auth = new nsIAuthInformation (authInfo);
+
Browser browser = getBrowser (aParent);
+ if (browser != null) {
+ Mozilla mozilla = (Mozilla)browser.webBrowser;
+ /*
+ * Do not invoke the listeners if this challenge has been failed too many
+ * times because a listener is likely giving incorrect credentials repeatedly
+ * and will do so indefinitely.
+ */
+ if (mozilla.authCount++ < 3) {
+ for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
+ AuthenticationEvent event = new AuthenticationEvent (browser);
+ event.location = mozilla.lastNavigateURL;
+ mozilla.authenticationListeners[i].authenticate (event);
+ if (!event.doit) {
+ XPCOM.memmove (_retval, new int[] {0}, 4); /* PRBool */
+ return XPCOM.NS_OK;
+ }
+ if (event.user != null && event.password != null) {
+ nsEmbedString string = new nsEmbedString (event.user);
+ int rc = auth.SetUsername (string.getAddress ());
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ string.dispose ();
+ string = new nsEmbedString (event.password);
+ rc = auth.SetPassword (string.getAddress ());
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ string.dispose ();
+ XPCOM.memmove (_retval, new int[] {1}, 4); /* PRBool */
+ return XPCOM.NS_OK;
+ }
+ }
+ }
+ }
+
+ /* no listener handled the challenge, so show an authentication dialog */
+
String checkLabel = null;
int[] checkValue = new int[1];
String[] userLabel = new String[1], passLabel = new String[1];
@@ -413,8 +425,6 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
/* get initial username and password values */
- nsIAuthInformation auth = new nsIAuthInformation (authInfo);
-
int /*long*/ ptr = XPCOM.nsEmbedString_new ();
int rc = auth.GetUsername (ptr);
if (rc != XPCOM.NS_OK) SWT.error (rc);
@@ -454,20 +464,20 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE);
nsIURI nsURI = new nsIURI (uri[0]);
- int /*long*/ aSpec = XPCOM.nsEmbedCString_new ();
- rc = nsURI.GetHost (aSpec);
+ int /*long*/ host = XPCOM.nsEmbedCString_new ();
+ rc = nsURI.GetHost (host);
if (rc != XPCOM.NS_OK) SWT.error (rc);
- length = XPCOM.nsEmbedCString_Length (aSpec);
- buffer = XPCOM.nsEmbedCString_get (aSpec);
+ length = XPCOM.nsEmbedCString_Length (host);
+ buffer = XPCOM.nsEmbedCString_get (host);
byte[] bytes = new byte[length];
XPCOM.memmove (bytes, buffer, length);
- XPCOM.nsEmbedCString_delete (aSpec);
- String host = new String (bytes);
+ String hostString = new String (bytes);
+ XPCOM.nsEmbedCString_delete (host);
nsURI.Release ();
String message;
- if (realm.length () > 0 && host.length () > 0) {
- message = Compatibility.getMessage ("SWT_Enter_Username_and_Password", new String[] {realm, host}); //$NON-NLS-1$
+ if (realm.length () > 0 && hostString.length () > 0) {
+ message = Compatibility.getMessage ("SWT_Enter_Username_and_Password", new String[] {realm, hostString}); //$NON-NLS-1$
} else {
message = ""; //$NON-NLS-1$
}
@@ -497,125 +507,145 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aUsername, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) {
Browser browser = getBrowser (aParent);
- String titleLabel, textLabel, checkLabel = null;
- String[] userLabel = new String[1], passLabel = new String[1];
- char[] dest;
- int length;
- if (aDialogTitle != 0) {
- length = XPCOM.strlen_PRUnichar (aDialogTitle);
- dest = new char[length];
- XPCOM.memmove (dest, aDialogTitle, length * 2);
- titleLabel = new String (dest);
- } else {
- titleLabel = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
+ String user = null, password = null;
+
+ if (browser != null) {
+ Mozilla mozilla = (Mozilla)browser.webBrowser;
+ /*
+ * Do not invoke the listeners if this challenge has been failed too many
+ * times because a listener is likely giving incorrect credentials repeatedly
+ * and will do so indefinitely.
+ */
+ if (mozilla.authCount++ < 3) {
+ for (int i = 0; i < mozilla.authenticationListeners.length; i++) {
+ AuthenticationEvent event = new AuthenticationEvent (browser);
+ event.location = mozilla.lastNavigateURL;
+ mozilla.authenticationListeners[i].authenticate (event);
+ if (!event.doit) {
+ XPCOM.memmove (_retval, new int[] {0}, 4); /* PRBool */
+ return XPCOM.NS_OK;
+ }
+ if (event.user != null && event.password != null) {
+ user = event.user;
+ password = event.password;
+ XPCOM.memmove (_retval, new int[] {1}, 4); /* PRBool */
+ break;
+ }
+ }
+ }
}
-
- length = XPCOM.strlen_PRUnichar (aText);
- dest = new char[length];
- XPCOM.memmove (dest, aText, length * 2);
- textLabel = new String (dest);
-
- int /*long*/[] userAddr = new int /*long*/[1];
- XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
- if (userAddr[0] != 0) {
- length = XPCOM.strlen_PRUnichar (userAddr[0]);
+
+ if (user == null) {
+ /* no listener handled the challenge, so show an authentication dialog */
+
+ String titleLabel, textLabel, checkLabel = null;
+ String[] userLabel = new String[1], passLabel = new String[1];
+ char[] dest;
+ int length;
+ if (aDialogTitle != 0) {
+ length = XPCOM.strlen_PRUnichar (aDialogTitle);
+ dest = new char[length];
+ XPCOM.memmove (dest, aDialogTitle, length * 2);
+ titleLabel = new String (dest);
+ } else {
+ titleLabel = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
+ }
+
+ length = XPCOM.strlen_PRUnichar (aText);
dest = new char[length];
- XPCOM.memmove (dest, userAddr[0], length * 2);
- userLabel[0] = new String (dest);
- }
+ XPCOM.memmove (dest, aText, length * 2);
+ textLabel = new String (dest);
+
+ int /*long*/[] userAddr = new int /*long*/[1];
+ XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
+ if (userAddr[0] != 0) {
+ length = XPCOM.strlen_PRUnichar (userAddr[0]);
+ dest = new char[length];
+ XPCOM.memmove (dest, userAddr[0], length * 2);
+ userLabel[0] = new String (dest);
+ }
+
+ int /*long*/[] passAddr = new int /*long*/[1];
+ XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
+ if (passAddr[0] != 0) {
+ length = XPCOM.strlen_PRUnichar (passAddr[0]);
+ dest = new char[length];
+ XPCOM.memmove (dest, passAddr[0], length * 2);
+ passLabel[0] = new String (dest);
+ }
+
+ if (aCheckMsg != 0) {
+ length = XPCOM.strlen_PRUnichar (aCheckMsg);
+ if (length > 0) {
+ dest = new char[length];
+ XPCOM.memmove (dest, aCheckMsg, length * 2);
+ checkLabel = new String (dest);
+ }
+ }
- int /*long*/[] passAddr = new int /*long*/[1];
- XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
- if (passAddr[0] != 0) {
- length = XPCOM.strlen_PRUnichar (passAddr[0]);
- dest = new char[length];
- XPCOM.memmove (dest, passAddr[0], length * 2);
- passLabel[0] = new String (dest);
- }
+ Shell shell = browser == null ? new Shell () : browser.getShell ();
+ PromptDialog dialog = new PromptDialog (shell);
+ int[] check = new int[1], result = new int[1];
+ if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4); /* PRBool */
+ dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
- if (aCheckMsg != 0) {
- length = XPCOM.strlen_PRUnichar (aCheckMsg);
- if (length > 0) {
- dest = new char[length];
- XPCOM.memmove (dest, aCheckMsg, length * 2);
- checkLabel = new String (dest);
+ XPCOM.memmove (_retval, result, 4); /* PRBool */
+ if (result[0] == 1) {
+ /* User selected OK */
+ user = userLabel[0];
+ password = passLabel[0];
}
+ if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4); /* PRBool */
}
- Shell shell = browser == null ? new Shell () : browser.getShell ();
- PromptDialog dialog = new PromptDialog (shell);
- int[] check = new int[1], result = new int[1];
- if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4); /* PRBool */
- dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
-
- XPCOM.memmove (_retval, result, 4); /* PRBool */
- if (result[0] == 1) {
+ if (user != null) {
/*
- * User selected OK. User name and password are returned as PRUnichar values. Any default
+ * User name and password are returned as PRUnichar values. Any default
* value that we override must be freed using the nsIMemory service.
*/
- int cnt, size;
- int /*long*/ ptr;
- char[] buffer;
- int /*long*/[] result2 = new int /*long*/[1];
- if (userLabel[0] != null) {
- cnt = userLabel[0].length ();
- buffer = new char[cnt + 1];
- userLabel[0].getChars (0, cnt, buffer, 0);
- size = buffer.length * 2;
- ptr = C.malloc (size);
- XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
-
- if (userAddr[0] != 0) {
- int rc = XPCOM.NS_GetServiceManager (result2);
- if (rc != XPCOM.NS_OK) SWT.error (rc);
- if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-
- nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
- result2[0] = 0;
- byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
- rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
- if (rc != XPCOM.NS_OK) SWT.error (rc);
- if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
- serviceManager.Release ();
-
- nsIMemory memory = new nsIMemory (result2[0]);
- result2[0] = 0;
- memory.Free (userAddr[0]);
- memory.Release ();
- }
- }
- if (passLabel[0] != null) {
- cnt = passLabel[0].length ();
- buffer = new char[cnt + 1];
- passLabel[0].getChars (0, cnt, buffer, 0);
- size = buffer.length * 2;
- ptr = C.malloc (size);
- XPCOM.memmove (ptr, buffer, size);
- XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
-
- if (passAddr[0] != 0) {
- int rc = XPCOM.NS_GetServiceManager (result2);
- if (rc != XPCOM.NS_OK) SWT.error (rc);
- if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
-
- nsIServiceManager serviceManager = new nsIServiceManager (result2[0]);
- result2[0] = 0;
- byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
- rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result2);
- if (rc != XPCOM.NS_OK) SWT.error (rc);
- if (result2[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
- serviceManager.Release ();
-
- nsIMemory memory = new nsIMemory (result2[0]);
- result2[0] = 0;
- memory.Free (passAddr[0]);
- memory.Release ();
- }
- }
+ int /*long*/[] userAddr = new int /*long*/[1];
+ XPCOM.memmove (userAddr, aUsername, C.PTR_SIZEOF);
+ int /*long*/[] passAddr = new int /*long*/[1];
+ XPCOM.memmove (passAddr, aPassword, C.PTR_SIZEOF);
+
+ int /*long*/[] result = new int /*long*/[1];
+ int rc = XPCOM.NS_GetServiceManager (result);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+
+ nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
+ result[0] = 0;
+ byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_MEMORY_CONTRACTID, true);
+ rc = serviceManager.GetServiceByContractID (aContractID, nsIMemory.NS_IMEMORY_IID, result);
+ if (rc != XPCOM.NS_OK) SWT.error (rc);
+ if (result[0] == 0) SWT.error (XPCOM.NS_NOINTERFACE);
+ serviceManager.Release ();
+
+ nsIMemory memory = new nsIMemory (result[0]);
+ result[0] = 0;
+ if (userAddr[0] != 0) memory.Free (userAddr[0]);
+ if (passAddr[0] != 0) memory.Free (passAddr[0]);
+ memory.Release ();
+
+ /* write the name and password values */
+
+ int cnt = user.length ();
+ char[] buffer = new char[cnt + 1];
+ user.getChars (0, cnt, buffer, 0);
+ int size = buffer.length * 2;
+ int /*long*/ ptr = C.malloc (size);
+ XPCOM.memmove (ptr, buffer, size);
+ XPCOM.memmove (aUsername, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
+
+ cnt = password.length ();
+ buffer = new char[cnt + 1];
+ password.getChars (0, cnt, buffer, 0);
+ size = buffer.length * 2;
+ ptr = C.malloc (size);
+ XPCOM.memmove (ptr, buffer, size);
+ XPCOM.memmove (aPassword, new int /*long*/[] {ptr}, C.PTR_SIZEOF);
}
- if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4); /* PRBool */
+
return XPCOM.NS_OK;
}
diff --git a/org/eclipse/swt/browser/StatusTextEvent.java b/org/eclipse/swt/browser/StatusTextEvent.java
index d5d2dd6..995d764 100644
--- a/org/eclipse/swt/browser/StatusTextEvent.java
+++ b/org/eclipse/swt/browser/StatusTextEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,8 +29,15 @@ public class StatusTextEvent extends TypedEvent {
static final long serialVersionUID = 3258407348371600439L;
-StatusTextEvent(Widget w) {
- super(w);
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param widget the widget that fired the event
+ *
+ * @since 3.5
+ */
+public StatusTextEvent(Widget widget) {
+ super(widget);
}
/**
diff --git a/org/eclipse/swt/browser/TitleEvent.java b/org/eclipse/swt/browser/TitleEvent.java
index 7388859..d2d9eac 100644
--- a/org/eclipse/swt/browser/TitleEvent.java
+++ b/org/eclipse/swt/browser/TitleEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,8 +28,15 @@ public class TitleEvent extends TypedEvent {
static final long serialVersionUID = 4121132532906340919L;
-TitleEvent(Widget w) {
- super(w);
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param widget the widget that fired the event
+ *
+ * @since 3.5
+ */
+public TitleEvent(Widget widget) {
+ super(widget);
}
/**
diff --git a/org/eclipse/swt/browser/TitleListener.java b/org/eclipse/swt/browser/TitleListener.java
index 20f97ba..a6cbaeb 100644
--- a/org/eclipse/swt/browser/TitleListener.java
+++ b/org/eclipse/swt/browser/TitleListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/browser/WebBrowser.java b/org/eclipse/swt/browser/WebBrowser.java
index 6a621d5..ea8ef4b 100644
--- a/org/eclipse/swt/browser/WebBrowser.java
+++ b/org/eclipse/swt/browser/WebBrowser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,11 +10,15 @@
*******************************************************************************/
package org.eclipse.swt.browser;
-import org.eclipse.swt.SWT;
+import java.util.*;
+
+import org.eclipse.swt.*;
import org.eclipse.swt.widgets.*;
abstract class WebBrowser {
Browser browser;
+ Hashtable functions = new Hashtable ();
+ AuthenticationListener[] authenticationListeners = new AuthenticationListener[0];
CloseWindowListener[] closeWindowListeners = new CloseWindowListener[0];
LocationListener[] locationListeners = new LocationListener[0];
OpenWindowListener[] openWindowListeners = new OpenWindowListener[0];
@@ -22,9 +26,18 @@ abstract class WebBrowser {
StatusTextListener[] statusTextListeners = new StatusTextListener[0];
TitleListener[] titleListeners = new TitleListener[0];
VisibilityWindowListener[] visibilityWindowListeners = new VisibilityWindowListener[0];
-
- static Runnable MozillaClearSessions;
- static Runnable NativeClearSessions;
+ boolean jsEnabled = true;
+ boolean jsEnabledChanged;
+ int nextFunctionIndex = 1;
+ Object evaluateResult;
+
+ static final String ERROR_ID = "org.eclipse.swt.browser.error"; // $NON-NLS-1$
+ static final String EXECUTE_ID = "SWTExecuteTemporaryFunction"; // $NON-NLS-1$
+ static String CookieName, CookieValue, CookieUrl;
+ static boolean CookieResult;
+ static Runnable MozillaClearSessions, NativeClearSessions;
+ static Runnable MozillaGetCookie, NativeGetCookie;
+ static Runnable MozillaSetCookie, NativeSetCookie;
/* Key Mappings */
static final int [][] KeyTable = {
@@ -162,6 +175,35 @@ abstract class WebBrowser {
{189, '-'},
};
+public class EvaluateFunction extends BrowserFunction {
+ public EvaluateFunction (Browser browser, String name) {
+ super (browser, name, false);
+ }
+ public Object function (Object[] arguments) {
+ if (arguments[0] instanceof String) {
+ String string = (String)arguments[0];
+ if (string.startsWith (ERROR_ID)) {
+ String errorString = ExtractError (string);
+ if (errorString.length () > 0) {
+ evaluateResult = new SWTException (SWT.ERROR_FAILED_EVALUATE, errorString);
+ } else {
+ evaluateResult = new SWTException (SWT.ERROR_FAILED_EVALUATE);
+ }
+ return null;
+ }
+ }
+ evaluateResult = arguments[0];
+ return null;
+ }
+}
+
+public void addAuthenticationListener (AuthenticationListener listener) {
+ AuthenticationListener[] newAuthenticationListeners = new AuthenticationListener[authenticationListeners.length + 1];
+ System.arraycopy(authenticationListeners, 0, newAuthenticationListeners, 0, authenticationListeners.length);
+ authenticationListeners = newAuthenticationListeners;
+ authenticationListeners[authenticationListeners.length - 1] = listener;
+}
+
public void addCloseWindowListener (CloseWindowListener listener) {
CloseWindowListener[] newCloseWindowListeners = new CloseWindowListener[closeWindowListeners.length + 1];
System.arraycopy(closeWindowListeners, 0, newCloseWindowListeners, 0, closeWindowListeners.length);
@@ -218,12 +260,143 @@ public static void clearSessions () {
if (MozillaClearSessions != null) MozillaClearSessions.run ();
}
+public static String GetCookie (String name, String url) {
+ CookieName = name; CookieUrl = url;
+ if (NativeGetCookie != null) NativeGetCookie.run ();
+ if (MozillaGetCookie != null) MozillaGetCookie.run ();
+ String result = CookieValue;
+ CookieName = CookieValue = CookieUrl = null;
+ return result;
+}
+
+public static boolean SetCookie (String value, String url) {
+ CookieValue = value; CookieUrl = url;
+ CookieResult = false;
+ if (NativeSetCookie != null) NativeSetCookie.run ();
+ if (MozillaSetCookie != null) MozillaSetCookie.run ();
+ CookieValue = CookieUrl = null;
+ return CookieResult;
+}
+
public abstract void create (Composite parent, int style);
+static String CreateErrorString (String error) {
+ return ERROR_ID + error;
+}
+
+static String ExtractError (String error) {
+ return error.substring (ERROR_ID.length ());
+}
+
+public void createFunction (BrowserFunction function) {
+ /*
+ * If an existing function with the same name is found then
+ * remove it so that it is not recreated on subsequent pages
+ * (the new function overwrites the old one).
+ */
+ Enumeration keys = functions.keys ();
+ while (keys.hasMoreElements ()) {
+ Object key = keys.nextElement ();
+ BrowserFunction current = (BrowserFunction)functions.get (key);
+ if (current.name.equals (function.name)) {
+ functions.remove (key);
+ break;
+ }
+ }
+
+ function.index = getNextFunctionIndex ();
+ registerFunction (function);
+
+ StringBuffer buffer = new StringBuffer ("window."); //$NON-NLS-1$
+ buffer.append (function.name);
+ buffer.append (" = function "); //$NON-NLS-1$
+ buffer.append (function.name);
+ buffer.append ("() {var result = window.external.callJava("); //$NON-NLS-1$
+ buffer.append (function.index);
+ buffer.append (",Array.prototype.slice.call(arguments)); if (typeof result == 'string' && result.indexOf('"); //$NON-NLS-1$
+ buffer.append (ERROR_ID);
+ buffer.append ("') == 0) {var error = new Error(result.substring("); //$NON-NLS-1$
+ buffer.append (ERROR_ID.length ());
+ buffer.append (")); throw error;} return result;};"); //$NON-NLS-1$
+ buffer.append ("for (var i = 0; i < frames.length; i++) {try { frames[i]."); //$NON-NLS-1$
+ buffer.append (function.name);
+ buffer.append (" = window."); //$NON-NLS-1$
+ buffer.append (function.name);
+ buffer.append (";} catch (e) {} };"); //$NON-NLS-1$
+ function.functionString = buffer.toString ();
+ execute (function.functionString);
+}
+
+void deregisterFunction (BrowserFunction function) {
+ functions.remove (new Integer (function.index));
+}
+
+public void destroyFunction (BrowserFunction function) {
+ String deleteString = getDeleteFunctionString (function.name);
+ StringBuffer buffer = new StringBuffer ("for (var i = 0; i < frames.length; i++) {try {frames[i].eval(\""); //$NON-NLS-1$
+ buffer.append (deleteString);
+ buffer.append ("\");} catch (e) {}}"); //$NON-NLS-1$
+ execute (buffer.toString ());
+ execute (deleteString);
+ deregisterFunction (function);
+}
+
public abstract boolean execute (String script);
+public Object evaluate (String script) throws SWTException {
+ BrowserFunction function = new EvaluateFunction (browser, ""); // $NON-NLS-1$
+ int index = getNextFunctionIndex ();
+ function.index = index;
+ function.isEvaluate = true;
+ registerFunction (function);
+ String functionName = EXECUTE_ID + index;
+
+ StringBuffer buffer = new StringBuffer ("window."); // $NON-NLS-1$
+ buffer.append (functionName);
+ buffer.append (" = function "); // $NON-NLS-1$
+ buffer.append (functionName);
+ buffer.append ("() {\n"); // $NON-NLS-1$
+ buffer.append (script);
+ buffer.append ("\n};"); // $NON-NLS-1$
+ execute (buffer.toString ());
+
+ buffer = new StringBuffer ("if (window."); // $NON-NLS-1$
+ buffer.append (functionName);
+ buffer.append (" == undefined) {window.external.callJava("); // $NON-NLS-1$
+ buffer.append (index);
+ buffer.append (", ['"); // $NON-NLS-1$
+ buffer.append (ERROR_ID);
+ buffer.append ("']);} else {try {var result = "); // $NON-NLS-1$
+ buffer.append (functionName);
+ buffer.append ("(); window.external.callJava("); // $NON-NLS-1$
+ buffer.append (index);
+ buffer.append (", [result]);} catch (e) {window.external.callJava("); // $NON-NLS-1$
+ buffer.append (index);
+ buffer.append (", ['"); // $NON-NLS-1$
+ buffer.append (ERROR_ID);
+ buffer.append ("' + e.message]);}}"); // $NON-NLS-1$
+ execute (buffer.toString ());
+ execute (getDeleteFunctionString (functionName));
+ deregisterFunction (function);
+
+ Object result = evaluateResult;
+ evaluateResult = null;
+ if (result instanceof SWTException) throw (SWTException)result;
+ return result;
+}
+
public abstract boolean forward ();
+public abstract String getBrowserType ();
+
+String getDeleteFunctionString (String functionName) {
+ return "delete window." + functionName; //$NON-NLS-1$
+}
+
+int getNextFunctionIndex () {
+ return nextFunctionIndex++;
+}
+
public abstract String getText ();
public abstract String getUrl ();
@@ -242,6 +415,30 @@ public abstract boolean isForwardEnabled ();
public abstract void refresh ();
+void registerFunction (BrowserFunction function) {
+ functions.put (new Integer (function.index), function);
+}
+
+public void removeAuthenticationListener (AuthenticationListener listener) {
+ if (authenticationListeners.length == 0) return;
+ int index = -1;
+ for (int i = 0; i < authenticationListeners.length; i++) {
+ if (listener == authenticationListeners[i]) {
+ index = i;
+ break;
+ }
+ }
+ if (index == -1) return;
+ if (authenticationListeners.length == 1) {
+ authenticationListeners = new AuthenticationListener[0];
+ return;
+ }
+ AuthenticationListener[] newAuthenticationListeners = new AuthenticationListener[authenticationListeners.length - 1];
+ System.arraycopy (authenticationListeners, 0, newAuthenticationListeners, 0, index);
+ System.arraycopy (authenticationListeners, index + 1, newAuthenticationListeners, index, authenticationListeners.length - index - 1);
+ authenticationListeners = newAuthenticationListeners;
+}
+
public void removeCloseWindowListener (CloseWindowListener listener) {
if (closeWindowListeners.length == 0) return;
int index = -1;
diff --git a/org/eclipse/swt/browser/WindowEvent.java b/org/eclipse/swt/browser/WindowEvent.java
index d53e8ef..a0c67ba 100644
--- a/org/eclipse/swt/browser/WindowEvent.java
+++ b/org/eclipse/swt/browser/WindowEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -185,8 +185,15 @@ public class WindowEvent extends TypedEvent {
static final long serialVersionUID = 3617851997387174969L;
-WindowEvent(Widget w) {
- super(w);
+/**
+ * Constructs a new instance of this class.
+ *
+ * @param widget the widget that fired the event
+ *
+ * @since 3.5
+ */
+public WindowEvent(Widget widget) {
+ super(widget);
}
/**
diff --git a/org/eclipse/swt/custom/CBanner.java b/org/eclipse/swt/custom/CBanner.java
index 90ae803..0a20c6b 100644
--- a/org/eclipse/swt/custom/CBanner.java
+++ b/org/eclipse/swt/custom/CBanner.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,6 +39,7 @@ import org.eclipse.swt.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class CBanner extends Composite {
@@ -61,6 +62,7 @@ public class CBanner extends Composite {
Cursor resizeCursor;
boolean dragging = false;
int rightDragDisplacement = 0;
+ Listener listener;
static final int OFFSCREEN = -200;
static final int BORDER_BOTTOM = 2;
@@ -102,11 +104,11 @@ public CBanner(Composite parent, int style) {
super.setLayout(new CBannerLayout());
resizeCursor = new Cursor(getDisplay(), SWT.CURSOR_SIZEWE);
- Listener listener = new Listener() {
+ listener = new Listener() {
public void handleEvent(Event e) {
switch (e.type) {
case SWT.Dispose:
- onDispose(); break;
+ onDispose(e); break;
case SWT.MouseDown:
onMouseDown (e.x, e.y); break;
case SWT.MouseExit:
@@ -151,6 +153,17 @@ static int[] bezier(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int
static int checkStyle (int style) {
return SWT.NONE;
}
+/*
+* This class was not intended to be subclassed but this restriction
+* cannot be enforced without breaking backward compatibility.
+*/
+//protected void checkSubclass () {
+// String name = getClass ().getName ();
+// int index = name.lastIndexOf ('.');
+// if (!name.substring (0, index + 1).equals ("org.eclipse.swt.custom.")) {
+// SWT.error (SWT.ERROR_INVALID_SUBCLASS);
+// }
+//}
/**
* Returns the Control that appears on the bottom side of the banner.
*
@@ -243,7 +256,11 @@ public boolean getSimple() {
checkWidget();
return simple;
}
-void onDispose() {
+void onDispose(Event event) {
+ removeListener(SWT.Dispose, listener);
+ notifyListeners(SWT.Dispose, event);
+ event.type = SWT.None;
+
if (resizeCursor != null) resizeCursor.dispose();
resizeCursor = null;
left = null;
diff --git a/org/eclipse/swt/custom/CCombo.java b/org/eclipse/swt/custom/CCombo.java
index beb2e06..f07a52a 100644
--- a/org/eclipse/swt/custom/CCombo.java
+++ b/org/eclipse/swt/custom/CCombo.java
@@ -45,7 +45,7 @@ import org.eclipse.swt.accessibility.*;
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: CustomControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*/
-public final class CCombo extends Composite {
+public class CCombo extends Composite {
Text text;
List list;
@@ -56,7 +56,10 @@ public final class CCombo extends Composite {
Listener listener, filter;
Color foreground, background;
Font font;
+ Shell _shell;
+ static final String PACKAGE_PREFIX = "org.eclipse.swt.custom."; //$NON-NLS-1$
+
/**
* Constructs a new instance of this class given its parent
* and a style value describing its behavior and appearance.
@@ -87,6 +90,7 @@ public final class CCombo extends Composite {
*/
public CCombo (Composite parent, int style) {
super (parent, style = checkStyle (style));
+ _shell = super.getShell ();
int textStyle = SWT.SINGLE;
if ((style & SWT.READ_ONLY) != 0) textStyle |= SWT.READ_ONLY;
@@ -98,6 +102,7 @@ public CCombo (Composite parent, int style) {
listener = new Listener () {
public void handleEvent (Event event) {
+ if (isDisposed ()) return;
if (popup == event.widget) {
popupEvent (event);
return;
@@ -121,7 +126,7 @@ public CCombo (Composite parent, int style) {
if (getShell () == event.widget) {
getDisplay().asyncExec(new Runnable() {
public void run() {
- if (isDisposed()) return;
+ if (isDisposed ()) return;
handleFocus (SWT.FocusOut);
}
});
@@ -130,6 +135,7 @@ public CCombo (Composite parent, int style) {
};
filter = new Listener() {
public void handleEvent(Event event) {
+ if (isDisposed ()) return;
Shell shell = ((Control)event.widget).getShell ();
if (shell == CCombo.this.getShell ()) {
handleFocus (SWT.FocusOut);
@@ -319,6 +325,13 @@ void arrowEvent (Event event) {
}
}
}
+protected void checkSubclass () {
+ String name = getClass ().getName ();
+ int index = name.lastIndexOf ('.');
+ if (!name.substring (0, index + 1).equals (PACKAGE_PREFIX)) {
+ SWT.error (SWT.ERROR_INVALID_SUBCLASS);
+ }
+}
/**
* Sets the selection in the receiver's text field to an empty
* selection starting just before the first character. If the
@@ -344,6 +357,10 @@ public void clearSelection () {
void comboEvent (Event event) {
switch (event.type) {
case SWT.Dispose:
+ removeListener(SWT.Dispose, listener);
+ notifyListeners(SWT.Dispose, event);
+ event.type = SWT.None;
+
if (popup != null && !popup.isDisposed ()) {
list.removeListener (SWT.Dispose, listener);
popup.dispose ();
@@ -356,6 +373,7 @@ void comboEvent (Event event) {
text = null;
list = null;
arrow = null;
+ _shell = null;
break;
case SWT.FocusIn:
Control focusControl = getDisplay ().getFocusControl ();
@@ -717,6 +735,17 @@ public int getSelectionIndex () {
checkWidget ();
return list.getSelectionIndex ();
}
+public Shell getShell () {
+ checkWidget ();
+ Shell shell = super.getShell ();
+ if (shell != _shell) {
+ if (_shell != null && !_shell.isDisposed ()) {
+ _shell.removeListener (SWT.Deactivate, listener);
+ }
+ _shell = shell;
+ }
+ return _shell;
+}
public int getStyle () {
int style = super.getStyle ();
style &= ~SWT.READ_ONLY;
@@ -787,7 +816,6 @@ public int getVisibleItemCount () {
return visibleItemCount;
}
void handleFocus (int type) {
- if (isDisposed ()) return;
switch (type) {
case SWT.FocusIn: {
if (hasFocus) return;
diff --git a/org/eclipse/swt/custom/CLabel.java b/org/eclipse/swt/custom/CLabel.java
index 4740224..ddd3c6a 100644
--- a/org/eclipse/swt/custom/CLabel.java
+++ b/org/eclipse/swt/custom/CLabel.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@ import org.eclipse.swt.accessibility.*;
*
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: CustomControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class CLabel extends Canvas {
@@ -70,6 +71,7 @@ public class CLabel extends Canvas {
private int[] gradientPercents;
private boolean gradientVertical;
private Color background;
+ private Listener disposeListener;
private static int DRAW_FLAGS = SWT.DRAW_MNEMONIC | SWT.DRAW_TAB | SWT.DRAW_TRANSPARENT | SWT.DRAW_DELIMITER;
@@ -117,12 +119,6 @@ public CLabel(Composite parent, int style) {
}
});
- addDisposeListener(new DisposeListener(){
- public void widgetDisposed(DisposeEvent event) {
- onDispose(event);
- }
- });
-
addTraverseListener(new TraverseListener() {
public void keyTraversed(TraverseEvent event) {
if (event.detail == SWT.TRAVERSE_MNEMONIC) {
@@ -131,6 +127,12 @@ public CLabel(Composite parent, int style) {
}
});
+ disposeListener = new Listener() {
+ public void handleEvent(Event event) {
+ onDispose(event);
+ }
+ };
+
initAccessible();
}
@@ -308,7 +310,11 @@ private void initAccessible() {
}
});
}
-void onDispose(DisposeEvent event) {
+void onDispose(Event event) {
+ removeListener(SWT.Dispose, disposeListener);
+ notifyListeners(SWT.Dispose, event);
+ event.type = SWT.None;
+
gradientColors = null;
gradientPercents = null;
backgroundImage = null;
@@ -722,6 +728,16 @@ public void setImage(Image image) {
/**
* Set the label's text.
* The value <code>null</code> clears it.
+ * <p>
+ * Mnemonics are indicated by an '&' that causes the next
+ * character to be the mnemonic. When the user presses a
+ * key sequence that matches the mnemonic, focus is assigned
+ * to the control that follows the label. On most platforms,
+ * the mnemonic appears underlined but may be emphasised in a
+ * platform specific manner. The mnemonic indicator character
+ * '&' can be escaped by doubling it in the string, causing
+ * a single '&' to be displayed.
+ * </p>
*
* @param text the text to be displayed in the label or null
*
diff --git a/org/eclipse/swt/custom/CTabFolder.java b/org/eclipse/swt/custom/CTabFolder.java
index f2ba5c7..9d26184 100644
--- a/org/eclipse/swt/custom/CTabFolder.java
+++ b/org/eclipse/swt/custom/CTabFolder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@ import org.eclipse.swt.widgets.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#ctabfolder">CTabFolder, CTabItem snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: CustomControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class CTabFolder extends Composite {
@@ -121,6 +122,7 @@ public class CTabFolder extends Composite {
int[] priority = new int[0];
boolean mru = false;
Listener listener;
+ boolean ignoreTraverse;
/* External Listener management */
CTabFolder2Listener[] folderListeners = new CTabFolder2Listener[0];
@@ -146,15 +148,13 @@ public class CTabFolder extends Composite {
Color[] selectionHighlightGradientColorsCache = null; //null is a legal value, check on access
/* Unselected item appearance */
- Image bgImage;
Color[] gradientColors;
int[] gradientPercents;
boolean gradientVertical;
boolean showUnselectedImage = true;
- static Color borderColor;
-
// close, min/max and chevron buttons
+ Color fillColor;
boolean showClose = false;
boolean showUnselectedClose = true;
@@ -285,6 +285,10 @@ public class CTabFolder extends Composite {
*/
public CTabFolder(Composite parent, int style) {
super(parent, checkStyle (parent, style));
+ init(style);
+}
+
+void init(int style) {
super.setLayout(new CTabFolderLayout());
int style2 = super.getStyle();
oldFont = getFont();
@@ -302,7 +306,6 @@ public CTabFolder(Composite parent, int style) {
Display display = getDisplay();
selectionForeground = display.getSystemColor(SELECTION_FOREGROUND);
selectionBackground = display.getSystemColor(SELECTION_BACKGROUND);
- borderColor = display.getSystemColor(BORDER1_COLOR);
updateTabHeight(false);
initAccessible();
@@ -369,7 +372,7 @@ static int checkStyle (Composite parent, int style) {
* that use double buffering which is true in both of these cases.
*/
String platform = SWT.getPlatform();
- if ("carbon".equals(platform) || "gtk".equals(platform)) return style; //$NON-NLS-1$ //$NON-NLS-2$
+ if ("cocoa".equals(platform) || "carbon".equals(platform) || "gtk".equals(platform)) return style; //$NON-NLS-1$ //$NON-NLS-2$
//TEMPORARY CODE
/*
@@ -495,7 +498,11 @@ public void addSelectionListener(SelectionListener listener) {
void antialias (int[] shape, RGB lineRGB, RGB innerRGB, RGB outerRGB, GC gc){
// Don't perform anti-aliasing on Mac and WPF because the platform
// already does it. The simple style also does not require anti-aliasing.
- if (simple || "carbon".equals(SWT.getPlatform()) || "wpf".equals(SWT.getPlatform())) return; //$NON-NLS-1$
+ if (simple) return;
+ String platform = SWT.getPlatform();
+ if ("cocoa".equals(platform)) return; //$NON-NLS-1$
+ if ("carbon".equals(platform)) return; //$NON-NLS-1$
+ if ("wpf".equals(platform)) return; //$NON-NLS-1$
// Don't perform anti-aliasing on low resolution displays
if (getDisplay().getDepth() < 15) return;
if (outerRGB != null) {
@@ -545,6 +552,17 @@ void antialias (int[] shape, RGB lineRGB, RGB innerRGB, RGB outerRGB, GC gc){
color.dispose();
}
}
+/*
+* This class was not intended to be subclassed but this restriction
+* cannot be enforced without breaking backward compatibility.
+*/
+//protected void checkSubclass () {
+// String name = getClass ().getName ();
+// int index = name.lastIndexOf ('.');
+// if (!name.substring (0, index + 1).equals ("org.eclipse.swt.custom.")) {
+// SWT.error (SWT.ERROR_INVALID_SUBCLASS);
+// }
+//}
public Rectangle computeTrim (int x, int y, int width, int height) {
checkWidget();
int trimX = x - marginWidth - highlight_margin - borderLeft;
@@ -639,7 +657,7 @@ void destroyItem (CTabItem item) {
}
void drawBackground(GC gc, int[] shape, boolean selected) {
Color defaultBackground = selected ? selectionBackground : getBackground();
- Image image = selected ? selectionBgImage : bgImage;
+ Image image = selected ? selectionBgImage : null;
Color[] colors = selected ? selectionGradientColors : gradientColors;
int[] percents = selected ? selectionGradientPercents : gradientPercents;
boolean vertical = selected ? selectionGradientVertical : gradientVertical;
@@ -678,7 +696,7 @@ void drawBackground(GC gc, int[] shape, int x, int y, int width, int height, Col
if (onBottom) {
int pos = 0;
if (percents[percents.length - 1] < 100) {
- pos = percents[percents.length - 1] * height / 100;
+ pos = (100 - percents[percents.length - 1]) * height / 100;
gc.setBackground(defaultBackground);
gc.fillRectangle(x, y, width, pos);
}
@@ -689,7 +707,8 @@ void drawBackground(GC gc, int[] shape, int x, int y, int width, int height, Col
lastColor = colors[i];
if (lastColor == null) lastColor = defaultBackground;
gc.setBackground(lastColor);
- int gradientHeight = percents[i] * height / 100;
+ int percentage = i > 0 ? percents[i] - percents[i-1] : percents[i];
+ int gradientHeight = percentage * height / 100;
gc.fillGradientRectangle(x, y+pos, width, gradientHeight, true);
pos += gradientHeight;
}
@@ -702,7 +721,8 @@ void drawBackground(GC gc, int[] shape, int x, int y, int width, int height, Col
lastColor = colors[i + 1];
if (lastColor == null) lastColor = defaultBackground;
gc.setBackground(lastColor);
- int gradientHeight = percents[i] * height / 100;
+ int percentage = i > 0 ? percents[i] - percents[i-1] : percents[i];
+ int gradientHeight = percentage * height / 100;
gc.fillGradientRectangle(x, y+pos, width, gradientHeight, true);
pos += gradientHeight;
}
@@ -798,7 +818,7 @@ void drawBody(Event event) {
//draw 1 pixel border around outside
if (borderLeft > 0) {
- gc.setForeground(borderColor);
+ gc.setForeground(getDisplay().getSystemColor(BORDER1_COLOR));
int x1 = borderLeft - 1;
int x2 = size.x - borderRight;
int y1 = onBottom ? borderTop - 1 : borderTop + tabHeight;
@@ -1015,6 +1035,7 @@ void drawTabArea(Event event) {
GC gc = event.gc;
Point size = getSize();
int[] shape = null;
+ Color borderColor = getDisplay().getSystemColor(BORDER1_COLOR);
if (tabHeight == 0) {
int style = getStyle();
@@ -1171,6 +1192,12 @@ public Rectangle getClientArea() {
height -= tabHeight;
return new Rectangle(xClient, yClient, width, height);
}
+Color getFillColor() {
+ if (fillColor == null) {
+ fillColor = new Color(getDisplay(), CTabFolder.CLOSE_FILL);
+ }
+ return fillColor;
+}
/**
* Return the tab that is located at the specified index.
*
@@ -1869,6 +1896,10 @@ void onDispose(Event event) {
items[i].dispose();
}
}
+ if (fillColor != null) {
+ fillColor.dispose();
+ fillColor = null;
+ }
selectionGradientColors = null;
selectionGradientPercents = null;
@@ -1904,14 +1935,14 @@ void onFocus(Event event) {
setSelection(0, true);
}
}
-boolean onMnemonic (Event event) {
+boolean onMnemonic (Event event, boolean doit) {
char key = event.character;
for (int i = 0; i < items.length; i++) {
if (items[i] != null) {
char mnemonic = _findMnemonic (items[i].getText ());
if (mnemonic != '\0') {
if (Character.toLowerCase (key) == mnemonic) {
- setSelection(i, true);
+ if (doit) setSelection(i, true);
return true;
}
}
@@ -1963,22 +1994,20 @@ void onMouse(Event event) {
break;
}
case SWT.MouseDown: {
+ if (event.button != 1) return;
if (minRect.contains(x, y)) {
- if (event.button != 1) return;
minImageState = SELECTED;
redraw(minRect.x, minRect.y, minRect.width, minRect.height, false);
update();
return;
}
if (maxRect.contains(x, y)) {
- if (event.button != 1) return;
maxImageState = SELECTED;
redraw(maxRect.x, maxRect.y, maxRect.width, maxRect.height, false);
update();
return;
}
if (chevronRect.contains(x, y)) {
- if (event.button != 1) return;
if (chevronImageState != HOT) {
chevronImageState = HOT;
} else {
@@ -2006,7 +2035,6 @@ void onMouse(Event event) {
}
if (item != null) {
if (item.closeRect.contains(x,y)){
- if (event.button != 1) return;
item.closeImageState = SELECTED;
redraw(item.closeRect.x, item.closeRect.y, item.closeRect.width, item.closeRect.height, false);
update();
@@ -2200,9 +2228,9 @@ void onMouse(Event event) {
}
}
}
-boolean onPageTraversal(Event event) {
+void onPageTraversal(Event event) {
int count = items.length;
- if (count == 0) return false;
+ if (count == 0) return;
int index = selectedIndex;
if (index == -1) {
index = 0;
@@ -2239,12 +2267,10 @@ boolean onPageTraversal(Event event) {
showList(chevronRect);
}
}
- return true;
}
}
}
setSelection (index, true);
- return true;
}
void onPaint(Event event) {
if (inDispose) return;
@@ -2308,6 +2334,7 @@ void onResize() {
oldSize = size;
}
void onTraverse (Event event) {
+ if (ignoreTraverse) return;
switch (event.detail) {
case SWT.TRAVERSE_ESCAPE:
case SWT.TRAVERSE_RETURN:
@@ -2317,12 +2344,27 @@ void onTraverse (Event event) {
if (focusControl == this) event.doit = true;
break;
case SWT.TRAVERSE_MNEMONIC:
- event.doit = onMnemonic(event);
- if (event.doit) event.detail = SWT.TRAVERSE_NONE;
+ event.doit = onMnemonic(event, false);
+ break;
+ case SWT.TRAVERSE_PAGE_NEXT:
+ case SWT.TRAVERSE_PAGE_PREVIOUS:
+ event.doit = items.length > 0;
+ break;
+ }
+ ignoreTraverse = true;
+ notifyListeners(SWT.Traverse, event);
+ ignoreTraverse = false;
+ event.type = SWT.None;
+ if (isDisposed()) return;
+ if (!event.doit) return;
+ switch (event.detail) {
+ case SWT.TRAVERSE_MNEMONIC:
+ onMnemonic(event, true);
+ event.detail = SWT.TRAVERSE_NONE;
break;
case SWT.TRAVERSE_PAGE_NEXT:
case SWT.TRAVERSE_PAGE_PREVIOUS:
- event.doit = onPageTraversal(event);
+ onPageTraversal(event);
event.detail = SWT.TRAVERSE_NONE;
break;
}
@@ -2521,28 +2563,24 @@ void setBackground(Color[] colors, int[] percents, boolean vertical) {
}
// Are these settings the same as before?
- if (bgImage == null) {
- if ((gradientColors != null) && (colors != null) &&
- (gradientColors.length == colors.length)) {
- boolean same = false;
- for (int i = 0; i < gradientColors.length; i++) {
- if (gradientColors[i] == null) {
- same = colors[i] == null;
- } else {
- same = gradientColors[i].equals(colors[i]);
- }
- if (!same) break;
- }
- if (same) {
- for (int i = 0; i < gradientPercents.length; i++) {
- same = gradientPercents[i] == percents[i];
- if (!same) break;
- }
- }
- if (same && this.gradientVertical == vertical) return;
- }
- } else {
- bgImage = null;
+ if ((gradientColors != null) && (colors != null) &&
+ (gradientColors.length == colors.length)) {
+ boolean same = false;
+ for (int i = 0; i < gradientColors.length; i++) {
+ if (gradientColors[i] == null) {
+ same = colors[i] == null;
+ } else {
+ same = gradientColors[i].equals(colors[i]);
+ }
+ if (!same) break;
+ }
+ if (same) {
+ for (int i = 0; i < gradientPercents.length; i++) {
+ same = gradientPercents[i] == percents[i];
+ if (!same) break;
+ }
+ }
+ if (same && this.gradientVertical == vertical) return;
}
// Store the new settings
if (colors == null) {
@@ -2566,30 +2604,6 @@ void setBackground(Color[] colors, int[] percents, boolean vertical) {
// Refresh with the new settings
redraw();
}
-
-/**
- * Set the image to be drawn in the background of the unselected tab. Image
- * is stretched or compressed to cover entire unselected tab area.
- *
- * @param image the image to be drawn in the background
- *
- * @exception SWTException <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
-void setBackground(Image image) {
- checkWidget();
- if (image == bgImage) return;
- if (image != null) {
- gradientColors = null;
- gradientPercents = null;
- }
- bgImage = image;
- redraw();
-}
/**
* Toggle the visibility of the border
*
diff --git a/org/eclipse/swt/custom/CTabFolder2Listener.java b/org/eclipse/swt/custom/CTabFolder2Listener.java
index 4affcd4..7e2e178 100644
--- a/org/eclipse/swt/custom/CTabFolder2Listener.java
+++ b/org/eclipse/swt/custom/CTabFolder2Listener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/custom/CTabItem.java b/org/eclipse/swt/custom/CTabItem.java
index afdd830..ffe19d2 100644
--- a/org/eclipse/swt/custom/CTabItem.java
+++ b/org/eclipse/swt/custom/CTabItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#ctabfolder">CTabFolder, CTabItem snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class CTabItem extends Item {
CTabFolder parent;
@@ -197,10 +198,8 @@ void drawClose(GC gc) {
x+9,y+2, x+7,y+4, x+7,y+5, x+9,y+7, x+9,y+9,
x+7,y+9, x+5,y+7, x+4,y+7, x+2,y+9, x,y+9,
x,y+7, x+2,y+5, x+2,y+4, x,y+2};
- Color fill = new Color(display, CTabFolder.CLOSE_FILL);
- gc.setBackground(fill);
+ gc.setBackground(parent.getFillColor());
gc.fillPolygon(shape);
- fill.dispose();
gc.setForeground(closeBorder);
gc.drawPolygon(shape);
break;
@@ -210,10 +209,8 @@ void drawClose(GC gc) {
x+10,y+3, x+8,y+5, x+8,y+6, x+10,y+8, x+10,y+10,
x+8,y+10, x+6,y+8, x+5,y+8, x+3,y+10, x+1,y+10,
x+1,y+8, x+3,y+6, x+3,y+5, x+1,y+3};
- Color fill = new Color(display, CTabFolder.CLOSE_FILL);
- gc.setBackground(fill);
+ gc.setBackground(parent.getFillColor());
gc.fillPolygon(shape);
- fill.dispose();
gc.setForeground(closeBorder);
gc.drawPolygon(shape);
break;
@@ -224,11 +221,10 @@ void drawClose(GC gc) {
parent.drawBackground(gc, shape, false);
} else {
Color defaultBackground = parent.getBackground();
- Image image = parent.bgImage;
Color[] colors = parent.gradientColors;
int[] percents = parent.gradientPercents;
boolean vertical = parent.gradientVertical;
- parent.drawBackground(gc, shape, x, y, 10, 10, defaultBackground, image, colors, percents, vertical);
+ parent.drawBackground(gc, shape, x, y, 10, 10, defaultBackground, null, colors, percents, vertical);
}
break;
}
@@ -260,7 +256,7 @@ void drawSelected(GC gc ) {
int x1 = Math.max(0, parent.borderLeft - 1);
int y1 = (parent.onBottom) ? y - 1 : y + height;
int x2 = size.x - parent.borderRight;
- gc.setForeground(CTabFolder.borderColor);
+ gc.setForeground(getDisplay().getSystemColor(CTabFolder.BORDER1_COLOR));
gc.drawLine(x1, y1, x2, y1);
return;
}
@@ -362,12 +358,12 @@ void drawSelected(GC gc ) {
inside = null;
}
RGB outside = parent.getBackground().getRGB();
- if (parent.bgImage != null ||
- (parent.gradientColors != null && parent.gradientColors.length > 1)) {
+ if (parent.gradientColors != null && parent.gradientColors.length > 1) {
outside = null;
}
- parent.antialias(shape, CTabFolder.borderColor.getRGB(), inside, outside, gc);
- gc.setForeground(CTabFolder.borderColor);
+ Color borderColor = getDisplay().getSystemColor(CTabFolder.BORDER1_COLOR);
+ parent.antialias(shape, borderColor.getRGB(), inside, outside, gc);
+ gc.setForeground(borderColor);
gc.drawPolyline(shape);
if (!tabInPaint) return;
@@ -569,7 +565,7 @@ void drawRightUnselectedBorder(GC gc) {
*/
void drawBorder(GC gc, int[] shape) {
- gc.setForeground(CTabFolder.borderColor);
+ gc.setForeground(getDisplay().getSystemColor(CTabFolder.BORDER1_COLOR));
gc.drawPolyline(shape);
}
@@ -1036,7 +1032,11 @@ public void setText (String string) {
}
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
*
* @param string the new tool tip text (or null)
*
diff --git a/org/eclipse/swt/custom/CTabFolderAdapter.java b/org/eclipse/swt/custom/CaretEvent.java
similarity index 61%
copy from org/eclipse/swt/custom/CTabFolderAdapter.java
copy to org/eclipse/swt/custom/CaretEvent.java
index 85f210a..4c1b1d6 100644
--- a/org/eclipse/swt/custom/CTabFolderAdapter.java
+++ b/org/eclipse/swt/custom/CaretEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,14 +11,26 @@
package org.eclipse.swt.custom;
+import org.eclipse.swt.events.*;
+
/**
- * This adapter class provides a default implementation for the
- * method described by the <code>CTabFolderListener</code> interface.
- *
- * @see CTabFolderListener
- * @see CTabFolderEvent
+ * This event is sent when the caret offset changes.
+ *
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ *
+ * @since 3.5
*/
-public class CTabFolderAdapter implements CTabFolderListener {
- public void itemClosed(CTabFolderEvent event){}
+public class CaretEvent extends TypedEvent {
+
+ /**
+ * caret offset
+ */
+ public int caretOffset;
+
+ static final long serialVersionUID = 3257846571587545489L;
+
+CaretEvent(StyledTextEvent e) {
+ super(e);
+ caretOffset = e.end;
+}
}
diff --git a/org/eclipse/swt/custom/BidiSegmentListener.java b/org/eclipse/swt/custom/CaretListener.java
similarity index 56%
copy from org/eclipse/swt/custom/BidiSegmentListener.java
copy to org/eclipse/swt/custom/CaretListener.java
index e1d9770..7423d26 100644
--- a/org/eclipse/swt/custom/BidiSegmentListener.java
+++ b/org/eclipse/swt/custom/CaretListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,27 +14,26 @@ import org.eclipse.swt.internal.SWTEventListener;
/**
* This listener interface may be implemented in order to receive
- * BidiSegmentEvents.
- * @see BidiSegmentEvent
+ * CaretEvents.
+ *
+ * @see CaretEvent
+ *
+ * @since 3.5
*/
-public interface BidiSegmentListener extends SWTEventListener {
+public interface CaretListener extends SWTEventListener {
/**
- * This method is called when a line needs to be reordered for
- * measuring or rendering in a bidi locale.
- * <p>
+ * This method is called after the caret offset is changed.
+ *
* The following event fields are used:<ul>
- * <li>event.lineOffset line start offset (input)</li>
- * <li>event.lineText line text (input)</li>
- * <li>event.segments text segments that should be reordered
- * separately. (output)</li>
+ * <li>event.caretOffset the new caret offset (input)</li>
* </ul>
*
* @param event the given event
- * separately. (output)
- * @see BidiSegmentEvent
+ *
+ * @see CaretEvent
*/
-public void lineGetSegments(BidiSegmentEvent event);
+public void caretMoved(CaretEvent event);
}
diff --git a/org/eclipse/swt/custom/ST.java b/org/eclipse/swt/custom/ST.java
index 1beccde..7727697 100644
--- a/org/eclipse/swt/custom/ST.java
+++ b/org/eclipse/swt/custom/ST.java
@@ -73,6 +73,15 @@ public class ST {
public static final int TOGGLE_OVERWRITE = 16777225; // binding = SWT.INSERT;
/**
+ * TEMPORARY CODE - API SUBJECT TO CHANGE
+ *
+ * Toggle block selection mode
+ *
+ * @since 3.5
+ */
+ public static final int TOGGLE_BLOCKSELECTION = 16777226;
+
+ /**
* Bullet style dot.
*
* @see Bullet
diff --git a/org/eclipse/swt/custom/SashForm.java b/org/eclipse/swt/custom/SashForm.java
index 7393bfa..232652d 100644
--- a/org/eclipse/swt/custom/SashForm.java
+++ b/org/eclipse/swt/custom/SashForm.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -95,6 +95,14 @@ static int checkStyle (int style) {
int mask = SWT.BORDER | SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
return style & mask;
}
+Sash createSash() {
+ Sash sash = new Sash(this, sashStyle);
+ sash.setBackground(background);
+ sash.setForeground(foreground);
+ sash.setToolTipText(getToolTipText());
+ sash.addListener(SWT.Selection, sashListener);
+ return sash;
+}
/**
* Returns SWT.HORIZONTAL if the controls in the SashForm are laid out side by side
* or SWT.VERTICAL if the controls in the SashForm are laid out top to bottom.
@@ -296,10 +304,7 @@ public void setOrientation(int orientation) {
sashStyle |= orientation == SWT.VERTICAL ? SWT.HORIZONTAL : SWT.VERTICAL;
for (int i = 0; i < sashes.length; i++) {
sashes[i].dispose();
- sashes[i] = new Sash(this, sashStyle);
- sashes[i].setBackground(background);
- sashes[i].setForeground(foreground);
- sashes[i].addListener(SWT.Selection, sashListener);
+ sashes[i] = createSash();
}
layout(false);
}
@@ -389,6 +394,12 @@ public void setSashWidth(int width) {
SASH_WIDTH = width;
layout(false);
}
+public void setToolTipText(String string) {
+ super.setToolTipText(string);
+ for (int i = 0; i < sashes.length; i++) {
+ sashes[i].setToolTipText(string);
+ }
+}
/**
* Specify the relative weight of each child in the SashForm. This will determine
* what percent of the total width (if SashForm has Horizontal orientation) or
diff --git a/org/eclipse/swt/custom/SashFormLayout.java b/org/eclipse/swt/custom/SashFormLayout.java
index 3f1842f..f01d0a2 100644
--- a/org/eclipse/swt/custom/SashFormLayout.java
+++ b/org/eclipse/swt/custom/SashFormLayout.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -112,10 +112,7 @@ protected void layout(Composite composite, boolean flushCache) {
Sash[] newSashes = new Sash[controls.length - 1];
System.arraycopy(sashForm.sashes, 0, newSashes, 0, sashForm.sashes.length);
for (int i = sashForm.sashes.length; i < newSashes.length; i++) {
- newSashes[i] = new Sash(sashForm, sashForm.sashStyle);
- newSashes[i].setBackground(sashForm.background);
- newSashes[i].setForeground(sashForm.foreground);
- newSashes[i].addListener(SWT.Selection, sashForm.sashListener);
+ newSashes[i] = sashForm.createSash();
}
sashForm.sashes = newSashes;
}
diff --git a/org/eclipse/swt/custom/ScrolledComposite.java b/org/eclipse/swt/custom/ScrolledComposite.java
index 6ae2e72..f115784 100644
--- a/org/eclipse/swt/custom/ScrolledComposite.java
+++ b/org/eclipse/swt/custom/ScrolledComposite.java
@@ -677,10 +677,16 @@ public void showControl(Control control) {
Rectangle itemRect = getDisplay().map(control.getParent(), this, control.getBounds());
Rectangle area = getClientArea();
Point origin = getOrigin();
- if (itemRect.x < 0) origin.x = Math.max(0, origin.x + itemRect.x);
- if (itemRect.y < 0) origin.y = Math.max(0, origin.y + itemRect.y);
- if (area.width < itemRect.x + itemRect.width) origin.x = Math.max(0, origin.x + itemRect.x + itemRect.width - area.width);
- if (area.height < itemRect.y + itemRect.height) origin.y = Math.max(0, origin.y + itemRect.y + itemRect.height - area.height);
+ if (itemRect.x < 0) {
+ origin.x = Math.max(0, origin.x + itemRect.x);
+ } else {
+ if (area.width < itemRect.x + itemRect.width) origin.x = Math.max(0, origin.x + itemRect.x + Math.min(itemRect.width, area.width) - area.width);
+ }
+ if (itemRect.y < 0) {
+ origin.y = Math.max(0, origin.y + itemRect.y);
+ } else {
+ if (area.height < itemRect.y + itemRect.height) origin.y = Math.max(0, origin.y + itemRect.y + Math.min(itemRect.height, area.height) - area.height);
+ }
setOrigin(origin);
}
diff --git a/org/eclipse/swt/custom/ScrolledCompositeLayout.java b/org/eclipse/swt/custom/ScrolledCompositeLayout.java
index 81873e3..0af0148 100644
--- a/org/eclipse/swt/custom/ScrolledCompositeLayout.java
+++ b/org/eclipse/swt/custom/ScrolledCompositeLayout.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/custom/StyledText.java b/org/eclipse/swt/custom/StyledText.java
index 66ba6b0..50e1587 100644
--- a/org/eclipse/swt/custom/StyledText.java
+++ b/org/eclipse/swt/custom/StyledText.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -77,6 +77,7 @@ import org.eclipse.swt.widgets.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#styledtext">StyledText snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Examples: CustomControlExample, TextEditor</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class StyledText extends Canvas {
static final char TAB = '\t';
@@ -98,6 +99,7 @@ public class StyledText extends Canvas {
static final int PaintObject = 3008;
static final int WordNext = 3009;
static final int WordPrevious = 3010;
+ static final int CaretMoved = 3011;
static final int PREVIOUS_OFFSET_TRAILING = 0;
static final int OFFSET_LEADING = 1;
@@ -119,8 +121,9 @@ public class StyledText extends Canvas {
int topMargin;
int rightMargin;
int bottomMargin;
+ Color marginColor;
int columnX; // keep track of the horizontal caret position when changing lines/pages. Fixes bug 5935
- int caretOffset = 0;
+ int caretOffset;
int caretAlignment;
Point selection = new Point(0, 0); // x and y are start and end caret offsets of selection
Point clipboardSelection; // x and y are start and end caret offsets of previous selection
@@ -143,6 +146,7 @@ public class StyledText extends Canvas {
int lastTextChangeNewCharCount; // event for use in the
int lastTextChangeReplaceLineCount; // text changed handler
int lastTextChangeReplaceCharCount;
+ int lastCharCount = 0;
int lastLineBottom; // the bottom pixel of the last line been replaced
boolean isMirrored;
boolean bidiColoring = false; // apply the BIDI algorithm on text segments of the same color
@@ -155,16 +159,23 @@ public class StyledText extends Canvas {
boolean fixedLineHeight;
boolean dragDetect = true;
IME ime;
-
+ Cursor cursor;
int alignment;
boolean justify;
int indent;
int lineSpacing;
+ int alignmentMargin;
+
+ //block selection
+ boolean blockSelection;
+ int blockXAnchor = -1, blockYAnchor = -1;
+ int blockXLocation = -1, blockYLocation = -1;
+
- final static boolean IS_CARBON, IS_GTK, IS_MOTIF;
+ final static boolean IS_MAC, IS_GTK, IS_MOTIF;
static {
String platform = SWT.getPlatform();
- IS_CARBON = "carbon".equals(platform);
+ IS_MAC = "carbon".equals(platform) || "cocoa".equals(platform);
IS_GTK = "gtk".equals(platform);
IS_MOTIF = "motif".equals(platform);
}
@@ -784,7 +795,7 @@ public class StyledText extends Canvas {
}
write("\\u");
write(Integer.toString((short) ch));
- write(' '); // control word delimiter
+ write('?'); // ANSI representation (1 byte long, \\uc1)
start = index + 1;
} else if (ch == '}' || ch == '{' || ch == '\\') {
// write the sub string from the last escaped character
@@ -818,7 +829,7 @@ public class StyledText extends Canvas {
header.append("\\ansicpg");
header.append(cpg);
}
- header.append("\\uc0\\deff0{\\fonttbl{\\f0\\fnil ");
+ header.append("\\uc1\\deff0{\\fonttbl{\\f0\\fnil ");
header.append(fontData.getName());
header.append(";");
for (int i = 1; i < fontTable.size(); i++) {
@@ -1258,7 +1269,7 @@ public StyledText(Composite parent, int style) {
setCaret(defaultCaret);
calculateScrollBars();
createKeyBindings();
- setCursor(display.getSystemCursor(SWT.CURSOR_IBEAM));
+ super.setCursor(display.getSystemCursor(SWT.CURSOR_IBEAM));
installListeners();
initializeAccessible();
setData("DEFAULT_DROP_TARGET_EFFECT", new StyledTextDropTargetEffect(this));
@@ -1313,6 +1324,25 @@ public void addBidiSegmentListener(BidiSegmentListener listener) {
addListener(LineGetSegments, new StyledTextListener(listener));
}
/**
+ * Adds a caret listener. CaretEvent is sent when the caret offset changes.
+ *
+ * @param listener the listener
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void addCaretListener(CaretListener listener) {
+ checkWidget();
+ if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+ addListener(CaretMoved, new StyledTextListener(listener));
+}
+/**
* Adds a line background listener. A LineGetBackground event is sent by the
* widget to determine the background color for a line.
*
@@ -1354,6 +1384,7 @@ public void addLineStyleListener(LineStyleListener listener) {
renderer.clearLineStyle(0, content.getLineCount());
}
addListener(LineGetStyle, new StyledTextListener(listener));
+ setCaretLocation();
}
/**
* Adds a modify listener. A Modify event is sent by the widget when the widget text
@@ -1609,17 +1640,16 @@ static int checkStyle(int style) {
}
}
style |= SWT.NO_REDRAW_RESIZE | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND;
- return style;
+ /* Clear SWT.CENTER to avoid the conflict with SWT.EMBEDDED */
+ return style & ~SWT.CENTER;
}
/**
* Scrolls down the text to use new space made available by a resize or by
* deleted lines.
*/
void claimBottomFreeSpace() {
- int clientAreaHeight = this.clientAreaHeight - topMargin - bottomMargin;
if (isFixedLineHeight()) {
- int lineHeight = renderer.getLineHeight();
- int newVerticalOffset = Math.max(0, content.getLineCount() * lineHeight - clientAreaHeight);
+ int newVerticalOffset = Math.max(0, renderer.getHeight() - clientAreaHeight);
if (newVerticalOffset < getVerticalScrollOffset()) {
scrollVertical(newVerticalOffset - getVerticalScrollOffset(), true);
}
@@ -1635,14 +1665,23 @@ void claimBottomFreeSpace() {
* Scrolls text to the right to use new space made available by a resize.
*/
void claimRightFreeSpace() {
- int newHorizontalOffset = Math.max(0, renderer.getWidth() - (clientAreaWidth - leftMargin - rightMargin));
- if (newHorizontalOffset < horizontalScrollOffset) {
+ int newHorizontalOffset = Math.max(0, renderer.getWidth() - clientAreaWidth);
+ if (newHorizontalOffset < horizontalScrollOffset) {
// item is no longer drawn past the right border of the client area
// align the right end of the item with the right border of the
// client area (window is scrolled right).
scrollHorizontal(newHorizontalOffset - horizontalScrollOffset, true);
}
}
+void clearBlockSelection(boolean reset, boolean sendEvent) {
+ if (reset) resetSelection();
+ blockXAnchor = blockYAnchor = -1;
+ blockXLocation = blockYLocation = -1;
+ caretDirection = SWT.NULL;
+ updateCaretVisibility();
+ super.redraw();
+ if (sendEvent) sendSelectionEvent();
+}
/**
* Removes the widget selection.
*
@@ -1716,7 +1755,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
*/
public void copy() {
checkWidget();
- copy(DND.CLIPBOARD);
+ copySelection(DND.CLIPBOARD);
}
/**
* Copies the selected text to the specified clipboard. The text will be put in the
@@ -1741,21 +1780,37 @@ public void copy() {
*/
public void copy(int clipboardType) {
checkWidget();
- if (clipboardType != DND.CLIPBOARD && clipboardType != DND.SELECTION_CLIPBOARD) return;
- int length = selection.y - selection.x;
- if (length > 0) {
- try {
- setClipboardContent(selection.x, length, clipboardType);
- } catch (SWTError error) {
- // Copy to clipboard failed. This happens when another application
- // is accessing the clipboard while we copy. Ignore the error.
- // Fixes 1GDQAVN
- // Rethrow all other errors. Fixes bug 17578.
- if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
- throw error;
+ copySelection(clipboardType);
+}
+boolean copySelection(int type) {
+ if (type != DND.CLIPBOARD && type != DND.SELECTION_CLIPBOARD) return false;
+ try {
+ if (blockSelection && blockXLocation != -1) {
+ String text = getBlockSelectionText(PlatformLineDelimiter);
+ if (text.length() > 0) {
+ //TODO RTF support
+ TextTransfer plainTextTransfer = TextTransfer.getInstance();
+ Object[] data = new Object[]{text};
+ Transfer[] types = new Transfer[]{plainTextTransfer};
+ clipboard.setContents(data, types, type);
+ return true;
}
+ } else {
+ int length = selection.y - selection.x;
+ if (length > 0) {
+ setClipboardContent(selection.x, length, type);
+ return true;
+ }
+ }
+ } catch (SWTError error) {
+ // Copy to clipboard failed. This happens when another application
+ // is accessing the clipboard while we copy. Ignore the error.
+ // Rethrow all other errors. Fixes bug 17578.
+ if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
+ throw error;
}
}
+ return false;
}
/**
* Returns the alignment of the widget.
@@ -1805,6 +1860,21 @@ int getAvailableHeightBellow(int height) {
}
return Math.min(height, availableHeight);
}
+/**
+ * Returns the color of the margins.
+ *
+ * @return the color of the margins.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public Color getMarginColor() {
+ checkWidget();
+ return marginColor != null ? marginColor : getBackground();
+}
/**
* Returns a string that uses only the line delimiter specified by the
* StyledTextContent implementation.
@@ -1868,10 +1938,17 @@ boolean checkDragDetect(Event event) {
} else {
if (event.button != 1) return false;
}
- if (selection.x == selection.y) return false;
- int offset = getOffsetAtPoint(event.x, event.y, null, true);
- if (selection.x <= offset && offset < selection.y) {
- return dragDetect(event);
+ if (blockSelection && blockXLocation != -1) {
+ Rectangle rect = getBlockSelectionRectangle();
+ if (rect.contains(event.x, event.y)) {
+ return dragDetect(event);
+ }
+ } else {
+ if (selection.x == selection.y) return false;
+ int offset = getOffsetAtPoint(event.x, event.y, null, true);
+ if (selection.x <= offset && offset < selection.y) {
+ return dragDetect(event);
+ }
}
return false;
}
@@ -1885,7 +1962,7 @@ void createKeyBindings() {
// Navigation
setKeyBinding(SWT.ARROW_UP, ST.LINE_UP);
setKeyBinding(SWT.ARROW_DOWN, ST.LINE_DOWN);
- if (IS_CARBON) {
+ if (IS_MAC) {
setKeyBinding(previousKey | SWT.MOD1, ST.LINE_START);
setKeyBinding(nextKey | SWT.MOD1, ST.LINE_END);
setKeyBinding(SWT.HOME, ST.TEXT_START);
@@ -1912,7 +1989,7 @@ void createKeyBindings() {
// Selection
setKeyBinding(SWT.ARROW_UP | SWT.MOD2, ST.SELECT_LINE_UP);
setKeyBinding(SWT.ARROW_DOWN | SWT.MOD2, ST.SELECT_LINE_DOWN);
- if (IS_CARBON) {
+ if (IS_MAC) {
setKeyBinding(previousKey | SWT.MOD1 | SWT.MOD2, ST.SELECT_LINE_START);
setKeyBinding(nextKey | SWT.MOD1 | SWT.MOD2, ST.SELECT_LINE_END);
setKeyBinding(SWT.HOME | SWT.MOD2, ST.SELECT_TEXT_START);
@@ -1941,7 +2018,7 @@ void createKeyBindings() {
setKeyBinding('X' | SWT.MOD1, ST.CUT);
setKeyBinding('C' | SWT.MOD1, ST.COPY);
setKeyBinding('V' | SWT.MOD1, ST.PASTE);
- if (IS_CARBON) {
+ if (IS_MAC) {
setKeyBinding(SWT.DEL | SWT.MOD2, ST.DELETE_NEXT);
setKeyBinding(SWT.BS | SWT.MOD3, ST.DELETE_WORD_PREVIOUS);
setKeyBinding(SWT.DEL | SWT.MOD3, ST.DELETE_WORD_NEXT);
@@ -2010,25 +2087,16 @@ void createCaretBitmaps() {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
*/
-public void cut(){
+public void cut() {
checkWidget();
- int length = selection.y - selection.x;
- if (length > 0) {
- try {
- setClipboardContent(selection.x, length, DND.CLIPBOARD);
- } catch (SWTError error) {
- // Copy to clipboard failed. This happens when another application
- // is accessing the clipboard while we copy. Ignore the error.
- // Fixes 1GDQAVN
- // Rethrow all other errors. Fixes bug 17578.
- if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
- throw error;
- }
- // Abort cut operation if copy to clipboard fails.
- // Fixes bug 21030.
- return;
+ // Abort cut operation if copy to clipboard fails.
+ // Fixes bug 21030.
+ if (copySelection(DND.CLIPBOARD)) {
+ if (blockSelection && blockXLocation != -1) {
+ insertBlockSelectionText((char)0, SWT.NULL);
+ } else {
+ doDelete();
}
- doDelete();
}
}
/**
@@ -2037,14 +2105,15 @@ public void cut(){
* Otherwise, we've moved back into the widget so end autoscrolling.
*/
void doAutoScroll(Event event) {
- if (event.y > clientAreaHeight) {
- doAutoScroll(SWT.DOWN, event.y - clientAreaHeight);
- } else if (event.y < 0) {
- doAutoScroll(SWT.UP, -event.y);
+ int caretLine = getCaretLine();
+ if (event.y > clientAreaHeight - bottomMargin && caretLine != content.getLineCount() - 1) {
+ doAutoScroll(SWT.DOWN, event.y - (clientAreaHeight - bottomMargin));
+ } else if (event.y < topMargin && caretLine != 0) {
+ doAutoScroll(SWT.UP, topMargin - event.y);
} else if (event.x < leftMargin && !wordWrap) {
doAutoScroll(ST.COLUMN_PREVIOUS, leftMargin - event.x);
- } else if (event.x > clientAreaWidth - leftMargin - rightMargin && !wordWrap) {
- doAutoScroll(ST.COLUMN_NEXT, event.x - (clientAreaWidth - leftMargin - rightMargin));
+ } else if (event.x > clientAreaWidth - rightMargin && !wordWrap) {
+ doAutoScroll(ST.COLUMN_NEXT, event.x - (clientAreaWidth - rightMargin));
} else {
endAutoScroll();
}
@@ -2069,7 +2138,17 @@ void doAutoScroll(int direction, int distance) {
timer = new Runnable() {
public void run() {
if (autoScrollDirection == SWT.UP) {
- doSelectionPageUp(autoScrollDistance);
+ if (blockSelection) {
+ int verticalScrollOffset = getVerticalScrollOffset();
+ int y = blockYLocation - verticalScrollOffset;
+ int pixels = Math.max(-autoScrollDistance, -verticalScrollOffset);
+ if (pixels != 0) {
+ setBlockSelectionLocation(blockXLocation - horizontalScrollOffset, y + pixels, true);
+ scrollVertical(pixels, true);
+ }
+ } else {
+ doSelectionPageUp(autoScrollDistance);
+ }
display.timerExec(V_SCROLL_RATE, this);
}
}
@@ -2080,7 +2159,18 @@ void doAutoScroll(int direction, int distance) {
timer = new Runnable() {
public void run() {
if (autoScrollDirection == SWT.DOWN) {
- doSelectionPageDown(autoScrollDistance);
+ if (blockSelection) {
+ int verticalScrollOffset = getVerticalScrollOffset();
+ int y = blockYLocation - verticalScrollOffset;
+ int max = renderer.getHeight() - verticalScrollOffset - clientAreaHeight;
+ int pixels = Math.min(autoScrollDistance, Math.max(0,max));
+ if (pixels != 0) {
+ setBlockSelectionLocation(blockXLocation - horizontalScrollOffset, y + pixels, true);
+ scrollVertical(pixels, true);
+ }
+ } else {
+ doSelectionPageDown(autoScrollDistance);
+ }
display.timerExec(V_SCROLL_RATE, this);
}
}
@@ -2091,9 +2181,19 @@ void doAutoScroll(int direction, int distance) {
timer = new Runnable() {
public void run() {
if (autoScrollDirection == ST.COLUMN_NEXT) {
- doVisualNext();
- setMouseWordSelectionAnchor();
- doMouseSelection();
+ if (blockSelection) {
+ int x = blockXLocation - horizontalScrollOffset;
+ int max = renderer.getWidth() - horizontalScrollOffset - clientAreaWidth;
+ int pixels = Math.min(autoScrollDistance, Math.max(0,max));
+ if (pixels != 0) {
+ setBlockSelectionLocation(x + pixels, blockYLocation - getVerticalScrollOffset(), true);
+ scrollHorizontal(pixels, true);
+ }
+ } else {
+ doVisualNext();
+ setMouseWordSelectionAnchor();
+ doMouseSelection();
+ }
display.timerExec(H_SCROLL_RATE, this);
}
}
@@ -2104,9 +2204,18 @@ void doAutoScroll(int direction, int distance) {
timer = new Runnable() {
public void run() {
if (autoScrollDirection == ST.COLUMN_PREVIOUS) {
- doVisualPrevious();
- setMouseWordSelectionAnchor();
- doMouseSelection();
+ if (blockSelection) {
+ int x = blockXLocation - horizontalScrollOffset;
+ int pixels = Math.max(-autoScrollDistance, -horizontalScrollOffset);
+ if (pixels != 0) {
+ setBlockSelectionLocation(x + pixels, blockYLocation - getVerticalScrollOffset(), true);
+ scrollHorizontal(pixels, true);
+ }
+ } else {
+ doVisualPrevious();
+ setMouseWordSelectionAnchor();
+ doMouseSelection();
+ }
display.timerExec(H_SCROLL_RATE, this);
}
}
@@ -2143,6 +2252,147 @@ void doBackspace() {
sendKeyEvent(event);
}
}
+void doBlockColumn(boolean next) {
+ if (blockXLocation == -1) setBlockSelectionOffset(caretOffset, false);
+ int x = blockXLocation - horizontalScrollOffset;
+ int y = blockYLocation - getVerticalScrollOffset();
+ int[] trailing = new int[1];
+ int offset = getOffsetAtPoint(x, y, trailing, true);
+ if (offset != -1) {
+ offset += trailing[0];
+ int lineIndex = content.getLineAtOffset(offset);
+ int newOffset;
+ if (next) {
+ newOffset = getClusterNext(offset, lineIndex);
+ } else {
+ newOffset = getClusterPrevious(offset, lineIndex);
+ }
+ offset = newOffset != offset ? newOffset : -1;
+ }
+ if (offset != -1) {
+ setBlockSelectionOffset(offset, true);
+ showCaret();
+ } else {
+ int width = next ? renderer.averageCharWidth : -renderer.averageCharWidth;
+ int maxWidth = Math.max(clientAreaWidth - rightMargin - leftMargin, renderer.getWidth());
+ x = Math.max(0, Math.min(blockXLocation + width, maxWidth)) - horizontalScrollOffset;
+ setBlockSelectionLocation(x, y, true);
+ Rectangle rect = new Rectangle(x, y, 0, 0);
+ showLocation(rect, true);
+ }
+}
+void doBlockWord(boolean next) {
+ if (blockXLocation == -1) setBlockSelectionOffset(caretOffset, false);
+ int x = blockXLocation - horizontalScrollOffset;
+ int y = blockYLocation - getVerticalScrollOffset();
+ int[] trailing = new int[1];
+ int offset = getOffsetAtPoint(x, y, trailing, true);
+ if (offset != -1) {
+ offset += trailing[0];
+ int lineIndex = content.getLineAtOffset(offset);
+ int lineOffset = content.getOffsetAtLine(lineIndex);
+ String lineText = content.getLine(lineIndex);
+ int lineLength = lineText.length();
+ int newOffset = offset;
+ if (next) {
+ if (offset < lineOffset + lineLength) {
+ newOffset = getWordNext(offset, SWT.MOVEMENT_WORD);
+ }
+ } else {
+ if (offset > lineOffset) {
+ newOffset = getWordPrevious(offset, SWT.MOVEMENT_WORD);
+ }
+ }
+ offset = newOffset != offset ? newOffset : -1;
+ }
+ if (offset != -1) {
+ setBlockSelectionOffset(offset, true);
+ showCaret();
+ } else {
+ int width = (next ? renderer.averageCharWidth : -renderer.averageCharWidth) * 6;
+ int maxWidth = Math.max(clientAreaWidth - rightMargin - leftMargin, renderer.getWidth());
+ x = Math.max(0, Math.min(blockXLocation + width, maxWidth)) - horizontalScrollOffset;
+ setBlockSelectionLocation(x, y, true);
+ Rectangle rect = new Rectangle(x, y, 0, 0);
+ showLocation(rect, true);
+ }
+}
+void doBlockLineVertical(boolean up) {
+ if (blockXLocation == -1) setBlockSelectionOffset(caretOffset, false);
+ int y = blockYLocation - getVerticalScrollOffset();
+ int lineIndex = getLineIndex(y);
+ if (up) {
+ if (lineIndex > 0) {
+ y = getLinePixel(lineIndex - 1);
+ setBlockSelectionLocation(blockXLocation - horizontalScrollOffset, y, true);
+ if (y < topMargin) {
+ scrollVertical(y - topMargin, true);
+ }
+ }
+ } else {
+ int lineCount = content.getLineCount();
+ if (lineIndex + 1 < lineCount) {
+ y = getLinePixel(lineIndex + 2) - 1;
+ setBlockSelectionLocation(blockXLocation - horizontalScrollOffset, y, true);
+ int bottom = clientAreaHeight - bottomMargin;
+ if (y > bottom) {
+ scrollVertical(y - bottom, true);
+ }
+ }
+ }
+}
+void doBlockLineHorizontal(boolean end) {
+ if (blockXLocation == -1) setBlockSelectionOffset(caretOffset, false);
+ int x = blockXLocation - horizontalScrollOffset;
+ int y = blockYLocation - getVerticalScrollOffset();
+ int lineIndex = getLineIndex(y);
+ int lineOffset = content.getOffsetAtLine(lineIndex);
+ String lineText = content.getLine(lineIndex);
+ int lineLength = lineText.length();
+ int[] trailing = new int[1];
+ int offset = getOffsetAtPoint(x, y, trailing, true);
+ if (offset != -1) {
+ offset += trailing[0];
+ int newOffset = offset;
+ if (end) {
+ if (offset < lineOffset + lineLength) {
+ newOffset = lineOffset + lineLength;
+ }
+ } else {
+ if (offset > lineOffset) {
+ newOffset = lineOffset;
+ }
+ }
+ offset = newOffset != offset ? newOffset : -1;
+ } else {
+ if (!end) offset = lineOffset + lineLength;
+ }
+ if (offset != -1) {
+ setBlockSelectionOffset(offset, true);
+ showCaret();
+ } else {
+ int maxWidth = Math.max(clientAreaWidth - rightMargin - leftMargin, renderer.getWidth());
+ x = (end ? maxWidth : 0) - horizontalScrollOffset;
+ setBlockSelectionLocation(x, y, true);
+ Rectangle rect = new Rectangle(x, y, 0, 0);
+ showLocation(rect, true);
+ }
+}
+void doBlockSelection(boolean sendEvent) {
+ if (caretOffset > selectionAnchor) {
+ selection.x = selectionAnchor;
+ selection.y = caretOffset;
+ } else {
+ selection.x = caretOffset;
+ selection.y = selectionAnchor;
+ }
+ updateCaretVisibility();
+ setCaretLocation();
+ super.redraw();
+ if (sendEvent) {
+ sendSelectionEvent();
+ }
+}
/**
* Replaces the selection with the character or insert the character at the
* current caret position if no selection exists.
@@ -2154,6 +2404,11 @@ void doBackspace() {
* @param key the character typed by the user
*/
void doContent(char key) {
+ if (blockSelection && blockXLocation != -1) {
+ insertBlockSelectionText(key, SWT.NULL);
+ return;
+ }
+
Event event = new Event();
event.start = selection.x;
event.end = selection.y;
@@ -2197,7 +2452,7 @@ void doContentEnd() {
} else {
int length = content.getCharCount();
if (caretOffset < length) {
- caretOffset = length;
+ setCaretOffset(length, SWT.DEFAULT);
showCaret();
}
}
@@ -2207,7 +2462,7 @@ void doContentEnd() {
*/
void doContentStart() {
if (caretOffset > 0) {
- caretOffset = 0;
+ setCaretOffset(0, SWT.DEFAULT);
showCaret();
}
}
@@ -2220,8 +2475,7 @@ void doContentStart() {
*/
void doCursorPrevious() {
if (selection.y - selection.x > 0) {
- caretOffset = selection.x;
- caretAlignment = OFFSET_LEADING;
+ setCaretOffset(selection.x, OFFSET_LEADING);
showCaret();
} else {
doSelectionCursorPrevious();
@@ -2236,8 +2490,7 @@ void doCursorPrevious() {
*/
void doCursorNext() {
if (selection.y - selection.x > 0) {
- caretOffset = selection.y;
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
+ setCaretOffset(selection.y, PREVIOUS_OFFSET_TRAILING);
showCaret();
} else {
doSelectionCursorNext();
@@ -2327,9 +2580,13 @@ void doLineDown(boolean select) {
caretLine++;
}
if (lastLine) {
- if (select) caretOffset = content.getCharCount();
+ if (select) {
+ setCaretOffset(content.getCharCount(), SWT.DEFAULT);
+ }
} else {
- caretOffset = getOffsetAtPoint(columnX, y, caretLine);
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(columnX, y, caretLine, alignment);
+ setCaretOffset(offset, alignment[0]);
}
int oldColumnX = columnX;
int oldHScrollOffset = horizontalScrollOffset;
@@ -2362,8 +2619,7 @@ void doLineEnd() {
lineEndOffset = lineOffset + lineLength;
}
if (caretOffset < lineEndOffset) {
- caretOffset = lineEndOffset;
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
+ setCaretOffset(lineEndOffset, PREVIOUS_OFFSET_TRAILING);
showCaret();
}
}
@@ -2382,8 +2638,7 @@ void doLineStart() {
renderer.disposeTextLayout(layout);
}
if (caretOffset > lineOffset) {
- caretOffset = lineOffset;
- caretAlignment = OFFSET_LEADING;
+ setCaretOffset(lineOffset, OFFSET_LEADING);
showCaret();
}
}
@@ -2415,9 +2670,13 @@ void doLineUp(boolean select) {
caretLine--;
}
if (firstLine) {
- if (select) caretOffset = 0;
+ if (select) {
+ setCaretOffset(0, SWT.DEFAULT);
+ }
} else {
- caretOffset = getOffsetAtPoint(columnX, y, caretLine);
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(columnX, y, caretLine, alignment);
+ setCaretOffset(offset, alignment[0]);
}
int oldColumnX = columnX;
int oldHScrollOffset = horizontalScrollOffset;
@@ -2427,6 +2686,26 @@ void doLineUp(boolean select) {
int hScrollChange = oldHScrollOffset - horizontalScrollOffset;
columnX = oldColumnX + hScrollChange;
}
+void doMouseLinkCursor() {
+ Display display = getDisplay();
+ Point point = display.getCursorLocation();
+ point = display.map(null, this, point);
+ doMouseLinkCursor(point.x, point.y);
+}
+void doMouseLinkCursor(int x, int y) {
+ int offset = getOffsetAtPoint(x, y, null, true);
+ Display display = getDisplay();
+ Cursor newCursor = cursor;
+ if (renderer.hasLink(offset)) {
+ newCursor = display.getSystemCursor(SWT.CURSOR_HAND);
+ } else {
+ if (cursor == null) {
+ int type = blockSelection ? SWT.CURSOR_CROSS : SWT.CURSOR_IBEAM;
+ newCursor = display.getSystemCursor(type);
+ }
+ }
+ if (newCursor != getCursor()) super.setCursor(newCursor);
+}
/**
* Moves the caret to the specified location.
*
@@ -2439,13 +2718,70 @@ void doMouseLocationChange(int x, int y, boolean select) {
int line = getLineIndex(y);
updateCaretDirection = true;
+
+ if (blockSelection) {
+ x = Math.max(leftMargin, Math.min(x, clientAreaWidth - rightMargin));
+ y = Math.max(topMargin, Math.min(y, clientAreaHeight - bottomMargin));
+ if (doubleClickEnabled && clickCount > 1) {
+ boolean wordSelect = (clickCount & 1) == 0;
+ if (wordSelect) {
+ Point left = getPointAtOffset(doubleClickSelection.x);
+ int[] trailing = new int[1];
+ int offset = getOffsetAtPoint(x, y, trailing, true);
+ if (offset != -1) {
+ if (x > left.x) {
+ offset = getWordNext(offset + trailing[0], SWT.MOVEMENT_WORD_END);
+ setBlockSelectionOffset(doubleClickSelection.x, offset, true);
+ } else {
+ offset = getWordPrevious(offset + trailing[0], SWT.MOVEMENT_WORD_START);
+ setBlockSelectionOffset(doubleClickSelection.y, offset, true);
+ }
+ } else {
+ if (x > left.x) {
+ setBlockSelectionLocation(left.x, left.y, x, y, true);
+ } else {
+ Point right = getPointAtOffset(doubleClickSelection.y);
+ setBlockSelectionLocation(right.x, right.y, x, y, true);
+ }
+ }
+ } else {
+ setBlockSelectionLocation(blockXLocation, y, true);
+ }
+ return;
+ } else {
+ if (select) {
+ if (blockXLocation == -1) {
+ setBlockSelectionOffset(caretOffset, false);
+ }
+ } else {
+ clearBlockSelection(true, false);
+ }
+ int[] trailing = new int[1];
+ int offset = getOffsetAtPoint(x, y, trailing, true);
+ if (offset != -1) {
+ if (select) {
+ setBlockSelectionOffset(offset + trailing[0], true);
+ return;
+ }
+ } else {
+ if (isFixedLineHeight() && renderer.fixedPitch) {
+ int avg = renderer.averageCharWidth;
+ x = ((x + avg / 2 - leftMargin + horizontalScrollOffset) / avg * avg) + leftMargin - horizontalScrollOffset;
+ }
+ setBlockSelectionLocation(x, y, true);
+ return;
+ }
+ }
+ }
+
// allow caret to be placed below first line only if receiver is
// not in single line mode. fixes 4820.
if (line < 0 || (isSingleLine() && line > 0)) {
return;
}
- int oldCaretAlignment = caretAlignment;
- int newCaretOffset = getOffsetAtPoint(x, y);
+ int[] alignment = new int[1];
+ int newCaretOffset = getOffsetAtPoint(x, y, alignment);
+ int newCaretAlignemnt = alignment[0];
if (doubleClickEnabled && clickCount > 1) {
newCaretOffset = doMouseWordSelect(x, newCaretOffset, line);
@@ -2456,17 +2792,15 @@ void doMouseLocationChange(int x, int y, boolean select) {
// Is the mouse within the left client area border or on
// a different line? If not the autoscroll selection
// could be incorrectly reset. Fixes 1GKM3XS
- if (0 <= y && y < clientAreaHeight &&
- (0 <= x && x < clientAreaWidth || wordWrap ||
- newCaretLine != content.getLineAtOffset(caretOffset))) {
- if (newCaretOffset != caretOffset || caretAlignment != oldCaretAlignment) {
- caretOffset = newCaretOffset;
- if (select) doMouseSelection();
- showCaret();
- }
+ boolean vchange = 0 <= y && y < clientAreaHeight || newCaretLine == 0 || newCaretLine == content.getLineCount() - 1;
+ boolean hchange = 0 <= x && x < clientAreaWidth || wordWrap || newCaretLine != content.getLineAtOffset(caretOffset);
+ if (vchange && hchange && (newCaretOffset != caretOffset || newCaretAlignemnt != caretAlignment)) {
+ setCaretOffset(newCaretOffset, newCaretAlignemnt);
+ if (select) doMouseSelection();
+ showCaret();
}
if (!select) {
- caretOffset = newCaretOffset;
+ setCaretOffset(newCaretOffset, newCaretAlignemnt);
clearSelection(true);
}
}
@@ -2553,7 +2887,9 @@ void doPageDown(boolean select, int height) {
// ensure that scrollLines never gets negative and at least one
// line is scrolled. fixes bug 5602.
scrollLines = Math.max(1, scrollLines);
- caretOffset = getOffsetAtPoint(columnX, getLinePixel(caretLine + scrollLines));
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(columnX, getLinePixel(caretLine + scrollLines), alignment);
+ setCaretOffset(offset, alignment[0]);
if (select) {
doSelection(ST.COLUMN_NEXT);
}
@@ -2626,7 +2962,9 @@ void doPageDown(boolean select, int height) {
caretHeight -= lineHeight;
lineHeight = renderer.getLineHeight(++lineIndex);
}
- caretOffset = getOffsetAtPoint(columnX, caretHeight, lineIndex);
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(columnX, caretHeight, lineIndex, alignment);
+ setCaretOffset(offset, alignment[0]);
if (select) doSelection(ST.COLUMN_NEXT);
height = getAvailableHeightBellow(height);
scrollVertical(height, true);
@@ -2666,8 +3004,7 @@ void doPageEnd() {
bottomOffset = content.getOffsetAtLine(lineIndex) + content.getLine(lineIndex).length();
}
if (caretOffset < bottomOffset) {
- caretOffset = bottomOffset;
- caretAlignment = OFFSET_LEADING;
+ setCaretOffset(bottomOffset, OFFSET_LEADING);
showCaret();
}
}
@@ -2704,8 +3041,7 @@ void doPageStart() {
topOffset = content.getOffsetAtLine(topIndex);
}
if (caretOffset > topOffset) {
- caretOffset = topOffset;
- caretAlignment = OFFSET_LEADING;
+ setCaretOffset(topOffset, OFFSET_LEADING);
showCaret();
}
}
@@ -2728,7 +3064,9 @@ void doPageUp(boolean select, int height) {
int lines = (height == -1 ? clientAreaHeight : height) / lineHeight;
int scrollLines = Math.max(1, Math.min(caretLine, lines));
caretLine -= scrollLines;
- caretOffset = getOffsetAtPoint(columnX, getLinePixel(caretLine));
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(columnX, getLinePixel(caretLine), alignment);
+ setCaretOffset(offset, alignment[0]);
if (select) {
doSelection(ST.COLUMN_PREVIOUS);
}
@@ -2802,7 +3140,9 @@ void doPageUp(boolean select, int height) {
lineHeight = renderer.getLineHeight(--lineIndex);
}
lineHeight = renderer.getLineHeight(lineIndex);
- caretOffset = getOffsetAtPoint(columnX, lineHeight - caretHeight, lineIndex);
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(columnX, lineHeight - caretHeight, lineIndex, alignment);
+ setCaretOffset(offset, alignment[0]);
if (select) doSelection(ST.COLUMN_PREVIOUS);
height = getAvailableHeightAbove(height);
scrollVertical(-height, true);
@@ -2869,18 +3209,21 @@ void doSelectionCursorNext() {
int caretLine = getCaretLine();
int lineOffset = content.getOffsetAtLine(caretLine);
int offsetInLine = caretOffset - lineOffset;
+ int offset, alignment;
if (offsetInLine < content.getLine(caretLine).length()) {
TextLayout layout = renderer.getTextLayout(caretLine);
offsetInLine = layout.getNextOffset(offsetInLine, SWT.MOVEMENT_CLUSTER);
int lineStart = layout.getLineOffsets()[layout.getLineIndex(offsetInLine)];
renderer.disposeTextLayout(layout);
- caretOffset = offsetInLine + lineOffset;
- caretAlignment = offsetInLine == lineStart ? OFFSET_LEADING : PREVIOUS_OFFSET_TRAILING;
+ offset = offsetInLine + lineOffset;
+ alignment = offsetInLine == lineStart ? OFFSET_LEADING : PREVIOUS_OFFSET_TRAILING;
+ setCaretOffset(offset, alignment);
showCaret();
} else if (caretLine < content.getLineCount() - 1 && !isSingleLine()) {
caretLine++;
- caretOffset = content.getOffsetAtLine(caretLine);
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
+ offset = content.getOffsetAtLine(caretLine);
+ alignment = PREVIOUS_OFFSET_TRAILING;
+ setCaretOffset(offset, alignment);
showCaret();
}
}
@@ -2892,14 +3235,15 @@ void doSelectionCursorPrevious() {
int caretLine = getCaretLine();
int lineOffset = content.getOffsetAtLine(caretLine);
int offsetInLine = caretOffset - lineOffset;
- caretAlignment = OFFSET_LEADING;
if (offsetInLine > 0) {
- caretOffset = getClusterPrevious(caretOffset, caretLine);
+ int offset = getClusterPrevious(caretOffset, caretLine);
+ setCaretOffset(offset, OFFSET_LEADING);
showCaret();
} else if (caretLine > 0) {
caretLine--;
lineOffset = content.getOffsetAtLine(caretLine);
- caretOffset = lineOffset + content.getLine(caretLine).length();
+ int offset = lineOffset + content.getLine(caretLine).length();
+ setCaretOffset(offset, OFFSET_LEADING);
showCaret();
}
}
@@ -2975,14 +3319,13 @@ void doSelectionPageUp(int pixels) {
* Moves the caret to the end of the next word .
*/
void doSelectionWordNext() {
- int newCaretOffset = getWordNext(caretOffset, SWT.MOVEMENT_WORD);
- // Force symmetrical movement for word next and previous. Fixes 14536
- caretAlignment = OFFSET_LEADING;
+ int offset = getWordNext(caretOffset, SWT.MOVEMENT_WORD);
// don't change caret position if in single line mode and the cursor
// would be on a different line. fixes 5673
if (!isSingleLine() ||
- content.getLineAtOffset(caretOffset) == content.getLineAtOffset(newCaretOffset)) {
- caretOffset = newCaretOffset;
+ content.getLineAtOffset(caretOffset) == content.getLineAtOffset(offset)) {
+ // Force symmetrical movement for word next and previous. Fixes 14536
+ setCaretOffset(offset, OFFSET_LEADING);
showCaret();
}
}
@@ -2990,15 +3333,8 @@ void doSelectionWordNext() {
* Moves the caret to the start of the previous word.
*/
void doSelectionWordPrevious() {
- caretAlignment = OFFSET_LEADING;
- caretOffset = getWordPrevious(caretOffset, SWT.MOVEMENT_WORD);
- int caretLine = content.getLineAtOffset(caretOffset);
- // word previous always comes from bottom line. when
- // wrapping lines, stay on bottom line when on line boundary
- if (wordWrap && caretLine < content.getLineCount() - 1 &&
- caretOffset == content.getOffsetAtLine(caretLine + 1)) {
- caretLine++;
- }
+ int offset = getWordPrevious(caretOffset, SWT.MOVEMENT_WORD);
+ setCaretOffset(offset, OFFSET_LEADING);
showCaret();
}
/**
@@ -3008,7 +3344,8 @@ void doSelectionWordPrevious() {
* left (visually left because it's now in a L2R segment).
*/
void doVisualPrevious() {
- caretOffset = getClusterPrevious(caretOffset, getCaretLine());
+ int offset = getClusterPrevious(caretOffset, getCaretLine());
+ setCaretOffset(offset, SWT.DEFAULT);
showCaret();
}
/**
@@ -3018,7 +3355,8 @@ void doVisualPrevious() {
* right (visually right because it's now in a L2R segment).
*/
void doVisualNext() {
- caretOffset = getClusterNext(caretOffset, getCaretLine());
+ int offset = getClusterNext(caretOffset, getCaretLine());
+ setCaretOffset(offset, SWT.DEFAULT);
showCaret();
}
/**
@@ -3028,7 +3366,7 @@ void doVisualNext() {
*/
void doWordNext() {
if (selection.y - selection.x > 0) {
- caretOffset = selection.y;
+ setCaretOffset(selection.y, SWT.DEFAULT);
showCaret();
} else {
doSelectionWordNext();
@@ -3041,7 +3379,7 @@ void doWordNext() {
*/
void doWordPrevious() {
if (selection.y - selection.x > 0) {
- caretOffset = selection.x;
+ setCaretOffset(selection.x, SWT.DEFAULT);
showCaret();
} else {
doSelectionWordPrevious();
@@ -3129,6 +3467,96 @@ public boolean getBidiColoring() {
checkWidget();
return bidiColoring;
}
+/**
+ * Returns whether the widget is in block selection mode.
+ *
+ * @return true if widget is in block selection mode, false otherwise
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public boolean getBlockSelection() {
+ checkWidget();
+ return blockSelection;
+}
+Rectangle getBlockSelectonPosition() {
+ int firstLine = getLineIndex(blockYAnchor - getVerticalScrollOffset());
+ int lastLine = getLineIndex(blockYLocation - getVerticalScrollOffset());
+ if (firstLine > lastLine) {
+ int temp = firstLine;
+ firstLine = lastLine;
+ lastLine = temp;
+ }
+ int left = blockXAnchor;
+ int right = blockXLocation;
+ if (left > right) {
+ left = blockXLocation;
+ right = blockXAnchor;
+ }
+ return new Rectangle (left - horizontalScrollOffset, firstLine, right - horizontalScrollOffset, lastLine);
+}
+/**
+ * Returns the block selection bounds. The bounds is
+ * relative to the upper left corner of the document.
+ *
+ * @return the block selection bounds
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public Rectangle getBlockSelectionBounds() {
+ Rectangle rect;
+ if (blockSelection && blockXLocation != -1) {
+ rect = getBlockSelectionRectangle();
+ } else {
+ Point startPoint = getPointAtOffset(selection.x);
+ Point endPoint = getPointAtOffset(selection.y);
+ int height = getLineHeight(selection.y);
+ rect = new Rectangle(startPoint.x, startPoint.y, endPoint.x - startPoint.x, endPoint.y + height - startPoint.y);
+ if (selection.x == selection.y) {
+ rect.width = getCaretWidth();
+ }
+ }
+ rect.x += horizontalScrollOffset;
+ rect.y += getVerticalScrollOffset();
+ return rect;
+}
+Rectangle getBlockSelectionRectangle() {
+ Rectangle rect = getBlockSelectonPosition();
+ rect.y = getLinePixel(rect.y);
+ rect.width = rect.width - rect.x;
+ rect.height = getLinePixel(rect.height + 1) - rect.y;
+ return rect;
+}
+String getBlockSelectionText(String delimiter) {
+ Rectangle rect = getBlockSelectonPosition();
+ int firstLine = rect.y;
+ int lastLine = rect.height;
+ int left = rect.x;
+ int right = rect.width;
+ StringBuffer buffer = new StringBuffer();
+ for (int lineIndex = firstLine; lineIndex <= lastLine; lineIndex++) {
+ int start = getOffsetAtPoint(left, 0, lineIndex, null);
+ int end = getOffsetAtPoint(right, 0, lineIndex, null);
+ if (start > end) {
+ int temp = start;
+ start = end;
+ end = temp;
+ }
+ String text = content.getTextRange(start, end - start);
+ buffer.append(text);
+ if (lineIndex < lastLine) buffer.append(delimiter);
+ }
+ return buffer.toString();
+}
/**
* Returns the index of the last fully visible line.
*
@@ -3160,6 +3588,21 @@ int getBottomIndex() {
}
return bottomIndex;
}
+/**
+ * Returns the bottom margin.
+ *
+ * @return the bottom margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public int getBottomMargin() {
+ checkWidget();
+ return bottomMargin;
+}
Rectangle getBoundsAtOffset(int offset) {
int lineIndex = content.getLineAtOffset(offset);
int lineOffset = content.getOffsetAtLine(lineIndex);
@@ -3175,7 +3618,7 @@ Rectangle getBoundsAtOffset(int offset) {
}
if (offset == caretOffset) {
int lineEnd = lineOffset + line.length();
- if (offset == lineEnd && caretAlignment == PREVIOUS_OFFSET_TRAILING) {
+ if (offset == lineEnd) {
bounds.width += getCaretWidth();
}
}
@@ -3771,6 +4214,21 @@ public int getLineIndex(int y) {
}
return line;
}
+/**
+ * Returns the left margin.
+ *
+ * @return the left margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public int getLeftMargin() {
+ checkWidget();
+ return leftMargin - alignmentMargin;
+}
/**
* Returns the x, y location of the upper left corner of the character
* bounding box at the specified offset in the text. The point is
@@ -3858,47 +4316,43 @@ public int getOffsetAtLocation(Point point) {
}
return offset + trailing[0];
}
-int getOffsetAtPoint(int x, int y) {
+int getOffsetAtPoint(int x, int y, int[] alignment) {
int lineIndex = getLineIndex(y);
y -= getLinePixel(lineIndex);
- return getOffsetAtPoint(x, y, lineIndex);
+ return getOffsetAtPoint(x, y, lineIndex, alignment);
}
-/**
- * Returns the offset at the specified x location in the specified line.
- *
- * @param x x location of the mouse location
- * @param line line the mouse location is in
- * @return the offset at the specified x location in the specified line,
- * relative to the beginning of the document
- */
-int getOffsetAtPoint(int x, int y, int lineIndex) {
+int getOffsetAtPoint(int x, int y, int lineIndex, int[] alignment) {
TextLayout layout = renderer.getTextLayout(lineIndex);
x += horizontalScrollOffset - leftMargin;
int[] trailing = new int[1];
int offsetInLine = layout.getOffset(x, y, trailing);
- caretAlignment = OFFSET_LEADING;
+ if (alignment != null) alignment[0] = OFFSET_LEADING;
if (trailing[0] != 0) {
int lineInParagraph = layout.getLineIndex(offsetInLine + trailing[0]);
int lineStart = layout.getLineOffsets()[lineInParagraph];
if (offsetInLine + trailing[0] == lineStart) {
offsetInLine += trailing[0];
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
+ if (alignment != null) alignment[0] = PREVIOUS_OFFSET_TRAILING;
} else {
- String line = content.getLine(lineIndex);
- int level;
- int offset = offsetInLine;
- while (offset > 0 && Character.isDigit(line.charAt(offset))) offset--;
- if (offset == 0 && Character.isDigit(line.charAt(offset))) {
- level = isMirrored() ? 1 : 0;
- } else {
- level = layout.getLevel(offset) & 0x1;
+ String line = content.getLine(lineIndex);
+ int level = 0;
+ if (alignment != null) {
+ int offset = offsetInLine;
+ while (offset > 0 && Character.isDigit(line.charAt(offset))) offset--;
+ if (offset == 0 && Character.isDigit(line.charAt(offset))) {
+ level = isMirrored() ? 1 : 0;
+ } else {
+ level = layout.getLevel(offset) & 0x1;
+ }
}
offsetInLine += trailing[0];
- int trailingLevel = layout.getLevel(offsetInLine) & 0x1;
- if ((level ^ trailingLevel) != 0) {
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
- } else {
- caretAlignment = OFFSET_LEADING;
+ if (alignment != null) {
+ int trailingLevel = layout.getLevel(offsetInLine) & 0x1;
+ if ((level ^ trailingLevel) != 0) {
+ alignment[0] = PREVIOUS_OFFSET_TRAILING;
+ } else {
+ alignment[0] = OFFSET_LEADING;
+ }
}
}
}
@@ -3917,7 +4371,7 @@ int getOffsetAtPoint(int x, int y, int[] trailing, boolean inTextOnly) {
int lineIndex = getLineIndex(y);
int lineOffset = content.getOffsetAtLine(lineIndex);
TextLayout layout = renderer.getTextLayout(lineIndex);
- x += horizontalScrollOffset - leftMargin ;
+ x += horizontalScrollOffset - leftMargin;
y -= getLinePixel(lineIndex);
int offset = layout.getOffset(x, y, trailing);
Rectangle rect = layout.getLineBounds(layout.getLineIndex(offset));
@@ -4068,6 +4522,21 @@ public int[] getRanges(int start, int length) {
}
return new int[0];
}
+/**
+ * Returns the right margin.
+ *
+ * @return the right margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public int getRightMargin() {
+ checkWidget();
+ return rightMargin;
+}
/**
* Returns the selection.
* <p>
@@ -4112,6 +4581,47 @@ public Point getSelectionRange() {
return new Point(selection.x, selection.y - selection.x);
}
/**
+ * Returns the ranges of text that are inside the block selection rectangle.
+ * <p>
+ * The ranges array contains start and length pairs. When the receiver is not
+ * in block selection mode the return arrays contains the start and length of
+ * the regular selection.
+ *
+ * @return the ranges array
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public int[] getSelectionRanges() {
+ checkWidget();
+ if (blockSelection && blockXLocation != -1) {
+ Rectangle rect = getBlockSelectonPosition();
+ int firstLine = rect.y;
+ int lastLine = rect.height;
+ int left = rect.x;
+ int right = rect.width;
+ int[] ranges = new int[(lastLine - firstLine + 1) * 2];
+ int index = 0;
+ for (int lineIndex = firstLine; lineIndex <= lastLine; lineIndex++) {
+ int start = getOffsetAtPoint(left, 0, lineIndex, null);
+ int end = getOffsetAtPoint(right, 0, lineIndex, null);
+ if (start > end) {
+ int temp = start;
+ start = end;
+ end = temp;
+ }
+ ranges[index++] = start;
+ ranges[index++] = end - start;
+ }
+ return ranges;
+ }
+ return new int[] {selection.x, selection.y - selection.x};
+}
+/**
* Returns the receiver's selection background color.
*
* @return the selection background color
@@ -4140,6 +4650,9 @@ public Color getSelectionBackground() {
*/
public int getSelectionCount() {
checkWidget();
+ if (blockSelection && blockXLocation != -1) {
+ return getBlockSelectionText(content.getLineDelimiter()).length();
+ }
return getSelectionRange().y;
}
/**
@@ -4171,6 +4684,9 @@ public Color getSelectionForeground() {
*/
public String getSelectionText() {
checkWidget();
+ if (blockSelection && blockXLocation != -1) {
+ return getBlockSelectionText(content.getLineDelimiter());
+ }
return content.getTextRange(selection.x, selection.y - selection.x);
}
public int getStyle() {
@@ -4630,6 +5146,21 @@ public int getTopIndex() {
checkWidget();
return topIndex;
}
+/**
+ * Returns the top margin.
+ *
+ * @return the top margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public int getTopMargin() {
+ checkWidget();
+ return topMargin;
+}
/**
* Gets the top pixel.
* <p>
@@ -4838,8 +5369,145 @@ public void insert(String string) {
if (string == null) {
SWT.error(SWT.ERROR_NULL_ARGUMENT);
}
- Point sel = getSelectionRange();
- replaceTextRange(sel.x, sel.y, string);
+ if (blockSelection) {
+ insertBlockSelectionText(string, false);
+ } else {
+ Point sel = getSelectionRange();
+ replaceTextRange(sel.x, sel.y, string);
+ }
+}
+int insertBlockSelectionText(String text, boolean fillWithSpaces) {
+ int lineCount = 1;
+ for (int i = 0; i < text.length(); i++) {
+ char ch = text.charAt(i);
+ if (ch == '\n' || ch == '\r') {
+ lineCount++;
+ if (ch == '\r' && i + 1 < text.length() && text.charAt(i + 1) == '\n') {
+ i++;
+ }
+ }
+ }
+ String[] lines = new String[lineCount];
+ int start = 0;
+ lineCount = 0;
+ for (int i = 0; i < text.length(); i++) {
+ char ch = text.charAt(i);
+ if (ch == '\n' || ch == '\r') {
+ lines[lineCount++] = text.substring(start, i);
+ if (ch == '\r' && i + 1 < text.length() && text.charAt(i + 1) == '\n') {
+ i++;
+ }
+ start = i + 1;
+ }
+ }
+ lines[lineCount++] = text.substring(start);
+ if (fillWithSpaces) {
+ int maxLength = 0;
+ for (int i = 0; i < lines.length; i++) {
+ int length = lines[i].length();
+ maxLength = Math.max(maxLength, length);
+ }
+ for (int i = 0; i < lines.length; i++) {
+ String line = lines[i];
+ int length = line.length();
+ if (length < maxLength) {
+ int numSpaces = maxLength - length;;
+ StringBuffer buffer = new StringBuffer(length + numSpaces);
+ buffer.append(line);
+ for (int j = 0; j < numSpaces; j++) buffer.append(' ');
+ lines[i] = buffer.toString();
+ }
+ }
+ }
+ int firstLine, lastLine, left, right;
+ if (blockXLocation != -1) {
+ Rectangle rect = getBlockSelectonPosition();
+ firstLine = rect.y;
+ lastLine = rect.height;
+ left = rect.x;
+ right = rect.width;
+ } else {
+ firstLine = lastLine = getCaretLine();
+ left = right = getPointAtOffset(caretOffset).x;
+ }
+ start = caretOffset;
+ int caretLine = getCaretLine();
+ int index = 0, lineIndex = firstLine;
+ while (lineIndex <= lastLine) {
+ String string = index < lineCount ? lines[index++] : "";
+ int lineStart = sendTextEvent(left, right, lineIndex, string, fillWithSpaces);
+ if (lineIndex == caretLine) start = lineStart;
+ lineIndex++;
+ }
+ while (index < lineCount) {
+ int lineStart = sendTextEvent(left, left, lineIndex, lines[index++], fillWithSpaces);
+ if (lineIndex == caretLine) start = lineStart;
+ lineIndex++;
+ }
+ return start;
+}
+void insertBlockSelectionText(char key, int action) {
+ if (key == SWT.CR || key == SWT.LF) return;
+ Rectangle rect = getBlockSelectonPosition();
+ int firstLine = rect.y;
+ int lastLine = rect.height;
+ int left = rect.x;
+ int right = rect.width;
+ int[] trailing = new int[1];
+ int offset = 0, delta = 0;
+ String text = key != 0 ? new String(new char[] {key}) : "";
+ int length = text.length();
+ for (int lineIndex = firstLine; lineIndex <= lastLine; lineIndex++) {
+ String line = content.getLine(lineIndex);
+ int lineOffset = content.getOffsetAtLine(lineIndex);
+ int lineEndOffset = lineOffset + line.length();
+ int linePixel = getLinePixel(lineIndex);
+ int start = getOffsetAtPoint(left, linePixel, trailing, true);
+ boolean outOfLine = start == -1;
+ if (outOfLine) {
+ start = left < leftMargin ? lineOffset : lineEndOffset;
+ } else {
+ start += trailing[0];
+ }
+ int end = getOffsetAtPoint(right, linePixel, trailing, true);
+ if (end == -1) {
+ end = right < leftMargin ? lineOffset : lineEndOffset;
+ } else {
+ end += trailing[0];
+ }
+ if (start > end) {
+ int temp = start;
+ start = end;
+ end = temp;
+ }
+ if (start == end && !outOfLine) {
+ switch (action) {
+ case ST.DELETE_PREVIOUS:
+ if (start > lineOffset) start = getClusterPrevious(start, lineIndex);
+ break;
+ case ST.DELETE_NEXT:
+ if (end < lineEndOffset) end = getClusterNext(end, lineIndex);
+ break;
+ }
+ }
+ if (outOfLine) {
+ if (line.length() >= delta) {
+ delta = line.length();
+ offset = lineEndOffset + length;
+ }
+ } else {
+ offset = start + length;
+ delta = content.getCharCount();
+ }
+ Event event = new Event();
+ event.text = text;
+ event.start = start;
+ event.end = end;
+ sendKeyEvent(event);
+ }
+ int x = getPointAtOffset(offset).x;
+ int verticalScrollOffset = getVerticalScrollOffset();
+ setBlockSelectionLocation(x, blockYAnchor - verticalScrollOffset, x, blockYLocation - verticalScrollOffset, false);
}
/**
* Creates content change listeners and set the default content model.
@@ -5019,12 +5687,12 @@ void handleCompositionChanged(Event event) {
int length = text.length();
if (length == ime.getCommitCount()) {
content.replaceTextRange(start, end - start, "");
- caretOffset = ime.getCompositionOffset();
+ setCaretOffset(ime.getCompositionOffset(), SWT.DEFAULT);
caretWidth = 0;
caretDirection = SWT.NULL;
} else {
content.replaceTextRange(start, end - start, text);
- caretOffset = ime.getCaretOffset();
+ setCaretOffset(ime.getCaretOffset(), SWT.DEFAULT);
if (ime.getWideCaret()) {
start = ime.getCompositionOffset();
int lineIndex = getCaretLine();
@@ -5070,6 +5738,7 @@ void handleDispose(Event event) {
}
selectionBackground = null;
selectionForeground = null;
+ marginColor = null;
textChangeListener = null;
selection = null;
doubleClickSelection = null;
@@ -5102,7 +5771,7 @@ void handleKey(Event event) {
action = getKeyBinding(event.character | event.stateMask);
if (action == SWT.NULL) {
// see if we have a control character
- if ((event.stateMask & SWT.CTRL) != 0 && (event.character >= 0) && event.character <= 31) {
+ if ((event.stateMask & SWT.CTRL) != 0 && event.character <= 31) {
// get the character from the CTRL+char sequence, the control
// key subtracts 64 from the value of the key that it modifies
int c = event.character + 64;
@@ -5113,7 +5782,7 @@ void handleKey(Event event) {
if (action == SWT.NULL) {
boolean ignore = false;
- if (IS_CARBON) {
+ if (IS_MAC) {
// Ignore accelerator key combinations (we do not want to
// insert a character in the text in this instance). Do not
// ignore COMMAND+ALT combinations since that key sequence
@@ -5178,19 +5847,7 @@ void handleKeyDown(Event event) {
void handleKeyUp(Event event) {
if (clipboardSelection != null) {
if (clipboardSelection.x != selection.x || clipboardSelection.y != selection.y) {
- try {
- if (selection.y - selection.x > 0) {
- setClipboardContent(selection.x, selection.y - selection.x, DND.SELECTION_CLIPBOARD);
- }
- } catch (SWTError error) {
- // Copy to clipboard failed. This happens when another application
- // is accessing the clipboard while we copy. Ignore the error.
- // Fixes 1GDQAVN
- // Rethrow all other errors. Fixes bug 17578.
- if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
- throw error;
- }
- }
+ copySelection(DND.SELECTION_CLIPBOARD);
}
}
clipboardSelection = null;
@@ -5222,7 +5879,7 @@ void handleMouseDown(Event event) {
}
//set selection
- if ((event.button != 1) || (IS_CARBON && (event.stateMask & SWT.MOD4) != 0)) {
+ if ((event.button != 1) || (IS_MAC && (event.stateMask & SWT.MOD4) != 0)) {
return;
}
clickCount = event.count;
@@ -5231,28 +5888,31 @@ void handleMouseDown(Event event) {
doMouseLocationChange(event.x, event.y, select);
} else {
if (doubleClickEnabled) {
- clearSelection(false);
- int offset = getOffsetAtPoint(event.x, event.y);
+ boolean wordSelect = (clickCount & 1) == 0;
+ int offset = getOffsetAtPoint(event.x, event.y, null);
int lineIndex = content.getLineAtOffset(offset);
int lineOffset = content.getOffsetAtLine(lineIndex);
- int lineEnd = content.getCharCount();
- if (lineIndex + 1 < content.getLineCount()) {
- lineEnd = content.getOffsetAtLine(lineIndex + 1);
- }
- int start, end;
- if ((clickCount & 1) == 0) {
- start = Math.max(0, getWordPrevious(offset, SWT.MOVEMENT_WORD_START));
- end = Math.min(content.getCharCount(), getWordNext(start, SWT.MOVEMENT_WORD_END));
+ if (wordSelect) {
+ int min = blockSelection ? lineOffset : 0;
+ int max = blockSelection ? lineOffset + content.getLine(lineIndex).length() : content.getCharCount();
+ int start = Math.max(min, getWordPrevious(offset, SWT.MOVEMENT_WORD_START));
+ int end = Math.min(max, getWordNext(start, SWT.MOVEMENT_WORD_END));
+ setSelection(start, end - start, false, true);
+ sendSelectionEvent();
} else {
- start = lineOffset;
- end = lineEnd;
+ if (blockSelection) {
+ setBlockSelectionLocation(leftMargin, event.y, clientAreaWidth - rightMargin, event.y, true);
+ } else {
+ int lineEnd = content.getCharCount();
+ if (lineIndex + 1 < content.getLineCount()) {
+ lineEnd = content.getOffsetAtLine(lineIndex + 1);
+ }
+ setSelection(lineOffset, lineEnd - lineOffset, false, false);
+ sendSelectionEvent();
+ }
}
- caretOffset = start;
- resetSelection();
- caretOffset = end;
- showCaret();
- doMouseSelection();
doubleClickSelection = new Point(selection.x, selection.y);
+ showCaret();
}
}
}
@@ -5261,10 +5921,14 @@ void handleMouseDown(Event event) {
* during the mouse move.
*/
void handleMouseMove(Event event) {
- if (clickCount == 0) return;
- doMouseLocationChange(event.x, event.y, true);
- update();
- doAutoScroll(event);
+ if (clickCount > 0) {
+ update();
+ doAutoScroll(event);
+ doMouseLocationChange(event.x, event.y, true);
+ }
+ if (renderer.hasLinks) {
+ doMouseLinkCursor(event.x, event.y);
+ }
}
/**
* Autoscrolling ends when the mouse button is released.
@@ -5273,19 +5937,7 @@ void handleMouseUp(Event event) {
clickCount = 0;
endAutoScroll();
if (event.button == 1) {
- try {
- if (selection.y - selection.x > 0) {
- setClipboardContent(selection.x, selection.y - selection.x, DND.SELECTION_CLIPBOARD);
- }
- } catch (SWTError error) {
- // Copy to clipboard failed. This happens when another application
- // is accessing the clipboard while we copy. Ignore the error.
- // Fixes 1GDQAVN
- // Rethrow all other errors. Fixes bug 17578.
- if (error.code != DND.ERROR_CANNOT_SET_CLIPBOARD) {
- throw error;
- }
- }
+ copySelection(DND.SELECTION_CLIPBOARD);
}
}
/**
@@ -5314,16 +5966,28 @@ void handlePaint(Event event) {
drawBackground(gc, 0, y, clientAreaWidth, endY - y);
}
}
+ if (blockSelection && blockXLocation != -1) {
+ gc.setBackground(getSelectionBackground());
+ Rectangle rect = getBlockSelectionRectangle();
+ gc.drawRectangle(rect.x, rect.y, Math.max(1, rect.width - 1), Math.max(1, rect.height - 1));
+ gc.setAdvanced(true);
+ if (gc.getAdvanced()) {
+ gc.setAlpha(100);
+ gc.fillRectangle(rect);
+ gc.setAdvanced(false);
+ }
+ }
+
// fill the margin background
- gc.setBackground(background);
+ gc.setBackground(marginColor != null ? marginColor : background);
if (topMargin > 0) {
drawBackground(gc, 0, 0, clientAreaWidth, topMargin);
}
if (bottomMargin > 0) {
drawBackground(gc, 0, clientAreaHeight - bottomMargin, clientAreaWidth, bottomMargin);
}
- if (leftMargin > 0) {
- drawBackground(gc, 0, 0, leftMargin, clientAreaHeight);
+ if (leftMargin - alignmentMargin > 0) {
+ drawBackground(gc, 0, 0, leftMargin - alignmentMargin, clientAreaHeight);
}
if (rightMargin > 0) {
drawBackground(gc, clientAreaWidth - rightMargin, 0, rightMargin, clientAreaHeight);
@@ -5382,7 +6046,9 @@ void handleResize(Event event) {
}
}
}
+ updateCaretVisibility();
claimBottomFreeSpace();
+ setAlignment();
//TODO FIX TOP INDEX DURING RESIZE
// if (oldHeight != clientAreaHeight || wordWrap) {
// calculateTopIndex(0);
@@ -5422,13 +6088,20 @@ void handleTextChanged(TextChangedEvent event) {
// selection redraw would be flushed during scroll which is wrong.
// in some cases new text would be drawn in scroll source area even
// though the intent is to scroll it.
- updateSelection(lastTextChangeStart, lastTextChangeReplaceCharCount, lastTextChangeNewCharCount);
+ if (!(blockSelection && blockXLocation != -1)) {
+ updateSelection(lastTextChangeStart, lastTextChangeReplaceCharCount, lastTextChangeNewCharCount);
+ }
if (lastTextChangeReplaceLineCount > 0 || wordWrap) {
claimBottomFreeSpace();
}
if (lastTextChangeReplaceCharCount > 0) {
claimRightFreeSpace();
}
+
+ sendAccessibleTextChanged(lastTextChangeStart, lastTextChangeNewCharCount, lastTextChangeReplaceCharCount);
+ lastCharCount += lastTextChangeNewCharCount;
+ lastCharCount -= lastTextChangeReplaceCharCount;
+ setAlignment();
}
/**
* Updates the screen to reflect a pending content change.
@@ -5471,7 +6144,7 @@ void handleTextChanging(TextChangingEvent event) {
// handleTextChanging and handleTextChanged events and this API sets the
// caretOffset.
int newEndOfText = content.getCharCount() - event.replaceCharCount + event.newCharCount;
- if (caretOffset > newEndOfText) caretOffset = newEndOfText;
+ if (caretOffset > newEndOfText) setCaretOffset(newEndOfText, SWT.DEFAULT);
}
/**
* Called when the widget content is set programmatically, overwriting
@@ -5482,6 +6155,10 @@ void handleTextChanging(TextChangingEvent event) {
*/
void handleTextSet(TextChangedEvent event) {
reset();
+ int newCharCount = getCharCount();
+ sendAccessibleTextChanged(0, newCharCount, lastCharCount);
+ lastCharCount = newCharCount;
+ setAlignment();
}
/**
* Called when a traversal key is pressed.
@@ -5635,6 +6312,7 @@ char _findMnemonic (String string) {
*/
public void invokeAction(int action) {
checkWidget();
+ if (blockSelection && invokeBlockAction(action)) return;
updateCaretDirection = true;
switch (action) {
// Navigation
@@ -5776,13 +6454,93 @@ public void invokeAction(int action) {
case ST.TOGGLE_OVERWRITE:
overwrite = !overwrite; // toggle insert/overwrite mode
break;
+ case ST.TOGGLE_BLOCKSELECTION:
+ setBlockSelection(!blockSelection);
+ break;
+ }
+}
+/**
+* Returns true if an action should not be performed when block
+* selection in active
+*/
+boolean invokeBlockAction(int action) {
+ switch (action) {
+ // Navigation
+ case ST.LINE_UP:
+ case ST.LINE_DOWN:
+ case ST.LINE_START:
+ case ST.LINE_END:
+ case ST.COLUMN_PREVIOUS:
+ case ST.COLUMN_NEXT:
+ case ST.PAGE_UP:
+ case ST.PAGE_DOWN:
+ case ST.WORD_PREVIOUS:
+ case ST.WORD_NEXT:
+ case ST.TEXT_START:
+ case ST.TEXT_END:
+ case ST.WINDOW_START:
+ case ST.WINDOW_END:
+ clearBlockSelection(false, false);
+ return false;
+ // Selection
+ case ST.SELECT_LINE_UP:
+ doBlockLineVertical(true);
+ return true;
+ case ST.SELECT_LINE_DOWN:
+ doBlockLineVertical(false);
+ return true;
+ case ST.SELECT_LINE_START:
+ doBlockLineHorizontal(false);
+ return true;
+ case ST.SELECT_LINE_END:
+ doBlockLineHorizontal(true);
+ return false;
+ case ST.SELECT_COLUMN_PREVIOUS:
+ doBlockColumn(false);
+ return true;
+ case ST.SELECT_COLUMN_NEXT:
+ doBlockColumn(true);
+ return true;
+ case ST.SELECT_WORD_PREVIOUS:
+ doBlockWord(false);
+ return true;
+ case ST.SELECT_WORD_NEXT:
+ doBlockWord(true);
+ return true;
+ case ST.SELECT_ALL:
+ return false;
+ case ST.SELECT_PAGE_UP:
+ case ST.SELECT_PAGE_DOWN:
+ case ST.SELECT_TEXT_START:
+ case ST.SELECT_TEXT_END:
+ case ST.SELECT_WINDOW_START:
+ case ST.SELECT_WINDOW_END:
+ //blocked actions
+ return true;
+ // Modification
+ case ST.CUT:
+ case ST.COPY:
+ case ST.PASTE:
+ return false;
+ case ST.DELETE_PREVIOUS:
+ case ST.DELETE_NEXT:
+ if (blockXLocation != -1) {
+ insertBlockSelectionText((char)0, action);
+ return true;
+ }
+ return false;
+ case ST.DELETE_WORD_PREVIOUS:
+ case ST.DELETE_WORD_NEXT:
+ //blocked actions
+ return blockXLocation != -1;
}
+ return false;
}
/**
* Temporary until SWT provides this
*/
boolean isBidi() {
- return IS_GTK || IS_CARBON || BidiUtil.isBidiPlatform() || isMirrored;
+ return IS_GTK || IS_MAC || BidiUtil.isBidiPlatform() || isMirrored;
}
boolean isBidiCaret() {
return BidiUtil.isBidiPlatform();
@@ -5876,12 +6634,12 @@ void modifyContent(Event event, boolean updateCaret) {
content.replaceTextRange(event.start, replacedLength, event.text);
// set the caret position prior to sending the modify event.
// fixes 1GBB8NJ
- if (updateCaret) {
+ if (updateCaret && !(blockSelection && blockXLocation != -1)) {
// always update the caret location. fixes 1G8FODP
- setSelection(event.start + event.text.length(), 0, true);
+ setSelection(event.start + event.text.length(), 0, true, false);
showCaret();
}
- sendModifyEvent(event);
+ notifyListeners(SWT.Modify, event);
if (isListening(ExtendedModify)) {
notifyListeners(ExtendedModify, styledTextEvent);
}
@@ -5917,6 +6675,14 @@ public void paste(){
checkWidget();
String text = (String) getClipboardContent(DND.CLIPBOARD);
if (text != null && text.length() > 0) {
+ if (blockSelection) {
+ boolean fillWithSpaces = isFixedLineHeight() && renderer.fixedPitch;
+ int offset = insertBlockSelectionText(text, fillWithSpaces);
+ setCaretOffset(offset, SWT.DEFAULT);
+ clearBlockSelection(true, true);
+ setCaretLocation();
+ return;
+ }
Event event = new Event();
event.start = selection.x;
event.end = selection.y;
@@ -6026,6 +6792,7 @@ public void redraw() {
renderer.reset(topIndex, itemCount);
renderer.calculate(topIndex, itemCount);
setScrollBars(false);
+ doMouseLinkCursor();
}
/**
* Causes the rectangular area of the receiver specified by
@@ -6063,25 +6830,27 @@ public void redraw(int x, int y, int width, int height, boolean all) {
int firstLine = getLineIndex(y);
int lastLine = getLineIndex(y + height);
resetCache(firstLine, lastLine - firstLine + 1);
+ doMouseLinkCursor();
}
}
-void redrawLines(int startLine, int lineCount) {
- // do nothing if redraw range is completely invisible
+void redrawLines(int startLine, int lineCount, boolean bottomChanged) {
+ // do nothing if redraw range is completely invisible
+ int endLine = startLine + lineCount - 1;
int partialBottomIndex = getPartialBottomIndex();
- if (startLine > partialBottomIndex || startLine + lineCount - 1 < topIndex) {
+ int partialTopIndex = getPartialTopIndex();
+ if (startLine > partialBottomIndex || endLine < partialTopIndex) {
return;
}
// only redraw visible lines
- if (startLine < topIndex) {
- lineCount -= topIndex - startLine;
- startLine = topIndex;
+ if (startLine < partialTopIndex) {
+ startLine = partialTopIndex;
}
- if (startLine + lineCount - 1 > partialBottomIndex) {
- lineCount = partialBottomIndex - startLine + 1;
+ if (endLine > partialBottomIndex) {
+ endLine = partialBottomIndex;;
}
- startLine -= topIndex;
int redrawTop = getLinePixel(startLine);
- int redrawBottom = getLinePixel(startLine + lineCount);
+ int redrawBottom = getLinePixel(endLine + 1);
+ if (bottomChanged) redrawBottom = clientAreaHeight - bottomMargin;
int redrawWidth = clientAreaWidth - leftMargin - rightMargin;
super.redraw(leftMargin, redrawTop, redrawWidth, redrawBottom - redrawTop, true);
}
@@ -6140,6 +6909,7 @@ public void redrawRange(int start, int length, boolean clearBackground) {
int lastLine = content.getLineAtOffset(end);
resetCache(firstLine, lastLine - firstLine + 1);
internalRedrawRange(start, length);
+ doMouseLinkCursor();
}
/**
* Removes the specified bidirectional segment listener.
@@ -6162,6 +6932,26 @@ public void removeBidiSegmentListener(BidiSegmentListener listener) {
removeListener(LineGetSegments, listener);
}
/**
+ * Removes the specified caret listener.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT when listener is null</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void removeCaretListener(CaretListener listener) {
+ checkWidget();
+ if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+ removeListener(CaretMoved, listener);
+}
+/**
* Removes the specified extended modify listener.
*
* @param extendedModifyListener the listener which should no longer be notified
@@ -6214,6 +7004,7 @@ public void removeLineStyleListener(LineStyleListener listener) {
checkWidget();
if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
removeListener(LineGetStyle, listener);
+ setCaretLocation();
}
/**
* Removes the specified modify listener.
@@ -6431,11 +7222,11 @@ public void replaceTextRange(int start, int length, String text) {
void reset() {
ScrollBar verticalBar = getVerticalBar();
ScrollBar horizontalBar = getHorizontalBar();
- caretOffset = 0;
+ setCaretOffset(0, SWT.DEFAULT);
topIndex = 0;
topIndexY = 0;
verticalScrollOffset = 0;
- horizontalScrollOffset = 0;
+ horizontalScrollOffset = 0;
resetSelection();
renderer.setContent(content);
if (verticalBar != null) {
@@ -6604,6 +7395,15 @@ void scrollText(int srcY, int destY) {
super.redraw(leftMargin, clientAreaHeight - bottomMargin, scrollWidth, bottomMargin, false);
}
}
+void sendAccessibleTextChanged(int start, int newCharCount, int replaceCharCount) {
+ Accessible accessible = getAccessible();
+ if (replaceCharCount != 0) {
+ accessible.textChanged(ACC.TEXT_DELETE, start, replaceCharCount);
+ }
+ if (newCharCount != 0) {
+ accessible.textChanged(ACC.TEXT_INSERT, start, newCharCount);
+ }
+}
/**
* Selects all the text.
*
@@ -6614,6 +7414,17 @@ void scrollText(int srcY, int destY) {
*/
public void selectAll() {
checkWidget();
+ if (blockSelection) {
+ renderer.calculate(0, content.getLineCount());
+ setScrollBars(false);
+ int verticalScrollOffset = getVerticalScrollOffset();
+ int left = leftMargin - horizontalScrollOffset;
+ int top = topMargin - verticalScrollOffset;
+ int right = renderer.getWidth() - rightMargin - horizontalScrollOffset;
+ int bottom = renderer.getHeight() - bottomMargin - verticalScrollOffset;
+ setBlockSelectionLocation(left, top, right, bottom, false);
+ return;
+ }
setSelection(0, Math.max(getCharCount(),0));
}
/**
@@ -6660,20 +7471,6 @@ StyledTextEvent sendLineEvent(int eventType, int lineOffset, String line) {
}
return event;
}
-void sendModifyEvent(Event event) {
- Accessible accessible = getAccessible();
- if (event.text.length() == 0) {
- accessible.textChanged(ACC.TEXT_DELETE, event.start, event.end - event.start);
- } else {
- if (event.start == event.end) {
- accessible.textChanged(ACC.TEXT_INSERT, event.start, event.text.length());
- } else {
- accessible.textChanged(ACC.TEXT_DELETE, event.start, event.end - event.start);
- accessible.textChanged(ACC.TEXT_INSERT, event.start, event.text.length());
- }
- }
- notifyListeners(SWT.Modify, event);
-}
/**
* Sends the specified selection event.
*/
@@ -6684,6 +7481,50 @@ void sendSelectionEvent() {
event.y = selection.y;
notifyListeners(SWT.Selection, event);
}
+int sendTextEvent(int left, int right, int lineIndex, String text, boolean fillWithSpaces) {
+ int lineWidth = 0, start, end;
+ StringBuffer buffer = new StringBuffer();
+ if (lineIndex < content.getLineCount()) {
+ int[] trailing = new int[1];
+ start = getOffsetAtPoint(left, getLinePixel(lineIndex), trailing, true);
+ if (start == -1) {
+ int lineOffset = content.getOffsetAtLine(lineIndex);
+ int lineLegth = content.getLine(lineIndex).length();
+ start = end = lineOffset + lineLegth;
+ if (fillWithSpaces) {
+ TextLayout layout = renderer.getTextLayout(lineIndex);
+ lineWidth = layout.getBounds().width;
+ renderer.disposeTextLayout(layout);
+ }
+ } else {
+ start += trailing[0];
+ end = left == right ? start : getOffsetAtPoint(right, 0, lineIndex, null);
+ fillWithSpaces = false;
+ }
+ } else {
+ start = end = content.getCharCount();
+ buffer.append(content.getLineDelimiter());
+ }
+ if (start > end) {
+ int temp = start;
+ start = end;
+ end = temp;
+ }
+ if (fillWithSpaces) {
+ int spacesWidth = left - lineWidth + horizontalScrollOffset - leftMargin;
+ int spacesCount = spacesWidth / renderer.averageCharWidth;
+ for (int i = 0; i < spacesCount; i++) {
+ buffer.append(' ');
+ }
+ }
+ buffer.append(text);
+ Event event = new Event();
+ event.start = start;
+ event.end = end;
+ event.text = buffer.toString();
+ sendKeyEvent(event);
+ return event.start + event.text.length();
+}
int sendWordBoundaryEvent(int eventType, int movement, int offset, int newOffset, String lineText, int lineOffset) {
if (isListening(eventType)) {
StyledTextEvent event = new StyledTextEvent(content);
@@ -6710,6 +7551,26 @@ int sendWordBoundaryEvent(int eventType, int movement, int offset, int newOffset
}
return newOffset;
}
+void setAlignment() {
+ if ((getStyle() & SWT.SINGLE) == 0) return;
+ int alignment = renderer.getLineAlignment(0, this.alignment);
+ int newAlignmentMargin = 0;
+ if (alignment != SWT.LEFT) {
+ renderer.calculate(0, 1);
+ int width = renderer.getWidth() - alignmentMargin;
+ newAlignmentMargin = clientAreaWidth - width;
+ if (newAlignmentMargin < 0) newAlignmentMargin = 0;
+ if (alignment == SWT.CENTER) newAlignmentMargin /= 2;
+ }
+ if (alignmentMargin != newAlignmentMargin) {
+ leftMargin -= alignmentMargin;
+ leftMargin += newAlignmentMargin;
+ alignmentMargin = newAlignmentMargin;
+ resetCache(0, 1);
+ setCaretLocation();
+ super.redraw();
+ }
+}
/**
* Sets the alignment of the widget. The argument should be one of <code>SWT.LEFT</code>,
* <code>SWT.CENTER</code> or <code>SWT.RIGHT</code>. The alignment applies for all lines.
@@ -6736,6 +7597,7 @@ public void setAlignment(int alignment) {
this.alignment = alignment;
resetCache(0, content.getLineCount());
setCaretLocation();
+ setAlignment();
super.redraw();
}
/**
@@ -6745,9 +7607,146 @@ public void setBackground(Color color) {
checkWidget();
background = color;
super.setBackground(color);
+ resetCache(0, content.getLineCount());
+ setCaretLocation();
super.redraw();
}
/**
+ * Sets the block selection mode.
+ *
+ * @param blockSelection true=enable block selection, false=disable block selection
+ *
+ * @since 3.5
+ */
+public void setBlockSelection(boolean blockSelection) {
+ checkWidget();
+ if ((getStyle() & SWT.SINGLE) != 0) return;
+ if (blockSelection == this.blockSelection) return;
+ if (wordWrap) return;
+ this.blockSelection = blockSelection;
+ if (cursor == null) {
+ Display display = getDisplay();
+ int type = blockSelection ? SWT.CURSOR_CROSS : SWT.CURSOR_IBEAM;
+ super.setCursor(display.getSystemCursor(type));
+ }
+ if (blockSelection) {
+ int start = selection.x;
+ int end = selection.y;
+ if (start != end) {
+ setBlockSelectionOffset(start, end, false);
+ }
+ } else {
+ clearBlockSelection(false, false);
+ }
+}
+/**
+ * Sets the block selection bounds. The bounds is
+ * relative to the upper left corner of the document.
+ *
+ * @param rect the new bounds for the block selection
+ *
+ * @see #setBlockSelectionBounds(int, int, int, int)
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_NULL_ARGUMENT when point is null</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setBlockSelectionBounds(Rectangle rect) {
+ checkWidget();
+ if (rect == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+ setBlockSelectionBounds(rect.x, rect.y, rect.width, rect.height);
+}
+/**
+ * Sets the block selection bounds. The bounds is
+ * relative to the upper left corner of the document.
+ *
+ * @param x the new x coordinate for the block selection
+ * @param y the new y coordinate for the block selection
+ * @param width the new width for the block selection
+ * @param height the new height for the block selection
+ *
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setBlockSelectionBounds(int x, int y, int width, int height) {
+ checkWidget();
+ int verticalScrollOffset = getVerticalScrollOffset();
+ if (!blockSelection) {
+ x -= horizontalScrollOffset;
+ y -= verticalScrollOffset;
+ int start = getOffsetAtPoint(x, y, null);
+ int end = getOffsetAtPoint(x+width-1, y+height-1, null);
+ setSelection(start, end - start, false, false);
+ setCaretLocation();
+ return;
+ }
+ int minY = topMargin;
+ int minX = leftMargin;
+ int maxY = renderer.getHeight() - bottomMargin;
+ int maxX = Math.max(clientAreaWidth, renderer.getWidth()) - rightMargin;
+ int anchorX = Math.max(minX, Math.min(maxX, x)) - horizontalScrollOffset;
+ int anchorY = Math.max(minY, Math.min(maxY, y)) - verticalScrollOffset;
+ int locationX = Math.max(minX, Math.min(maxX, x + width)) - horizontalScrollOffset;
+ int locationY = Math.max(minY, Math.min(maxY, y + height - 1)) - verticalScrollOffset;
+ if (isFixedLineHeight() && renderer.fixedPitch) {
+ int avg = renderer.averageCharWidth;
+ anchorX = ((anchorX - leftMargin + horizontalScrollOffset) / avg * avg) + leftMargin - horizontalScrollOffset;
+ locationX = ((locationX + avg / 2 - leftMargin + horizontalScrollOffset) / avg * avg) + leftMargin - horizontalScrollOffset;
+ }
+ setBlockSelectionLocation(anchorX, anchorY, locationX, locationY, false);
+}
+void setBlockSelectionLocation (int x, int y, boolean sendEvent) {
+ int verticalScrollOffset = getVerticalScrollOffset();
+ blockXLocation = x + horizontalScrollOffset;
+ blockYLocation = y + verticalScrollOffset;
+ int[] alignment = new int[1];
+ int offset = getOffsetAtPoint(x, y, alignment);
+ setCaretOffset(offset, alignment[0]);
+ if (blockXAnchor == -1) {
+ blockXAnchor = blockXLocation;
+ blockYAnchor = blockYLocation;
+ selectionAnchor = caretOffset;
+ }
+ doBlockSelection(sendEvent);
+}
+void setBlockSelectionLocation (int anchorX, int anchorY, int x, int y, boolean sendEvent) {
+ int verticalScrollOffset = getVerticalScrollOffset();
+ blockXAnchor = anchorX + horizontalScrollOffset;
+ blockYAnchor = anchorY + verticalScrollOffset;
+ selectionAnchor = getOffsetAtPoint(anchorX, anchorY, null);
+ setBlockSelectionLocation(x, y, sendEvent);
+}
+void setBlockSelectionOffset (int offset, boolean sendEvent) {
+ Point point = getPointAtOffset(offset);
+ int verticalScrollOffset = getVerticalScrollOffset();
+ blockXLocation = point.x + horizontalScrollOffset;
+ blockYLocation = point.y + verticalScrollOffset;
+ setCaretOffset(offset, SWT.DEFAULT);
+ if (blockXAnchor == -1) {
+ blockXAnchor = blockXLocation;
+ blockYAnchor = blockYLocation;
+ selectionAnchor = caretOffset;
+ }
+ doBlockSelection(sendEvent);
+}
+void setBlockSelectionOffset (int anchorOffset, int offset, boolean sendEvent) {
+ int verticalScrollOffset = getVerticalScrollOffset();
+ Point anchorPoint = getPointAtOffset(anchorOffset);
+ blockXAnchor = anchorPoint.x + horizontalScrollOffset;
+ blockYAnchor = anchorPoint.y + verticalScrollOffset;
+ selectionAnchor = anchorOffset;
+ setBlockSelectionOffset(offset, sendEvent);
+}
+/**
* Sets the receiver's caret. Set the caret's height and location.
*
* </p>
@@ -6783,6 +7782,21 @@ public void setBidiColoring(boolean mode) {
checkWidget();
bidiColoring = mode;
}
+/**
+ * Sets the bottom margin.
+ *
+ * @param bottomMargin the bottom margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setBottomMargin (int bottomMargin) {
+ checkWidget();
+ setMargins(leftMargin, topMargin, rightMargin, bottomMargin);
+}
/**
* Moves the Caret to the current caret offset.
*/
@@ -6836,6 +7850,7 @@ void setCaretLocation(Point location, int direction) {
BidiUtil.setKeyboardLanguage(BidiUtil.KEYBOARD_BIDI);
}
}
+ updateCaretVisibility();
}
columnX = location.x;
}
@@ -6857,24 +7872,40 @@ public void setCaretOffset(int offset) {
int length = getCharCount();
if (length > 0 && offset != caretOffset) {
if (offset < 0) {
- caretOffset = 0;
+ offset = 0;
} else if (offset > length) {
- caretOffset = length;
+ offset = length;
} else {
if (isLineDelimiter(offset)) {
// offset is inside a multi byte line delimiter. This is an
// illegal operation and an exception is thrown. Fixes 1GDKK3R
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- caretOffset = offset;
}
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
+ setCaretOffset(offset, PREVIOUS_OFFSET_TRAILING);
// clear the selection if the caret is moved.
// don't notify listeners about the selection change.
- clearSelection(false);
+ if (blockSelection) {
+ clearBlockSelection(true, false);
+ } else {
+ clearSelection(false);
+ }
}
setCaretLocation();
-}
+}
+void setCaretOffset(int offset, int alignment) {
+ if (caretOffset != offset) {
+ caretOffset = offset;
+ if (isListening(CaretMoved)) {
+ StyledTextEvent event = new StyledTextEvent(content);
+ event.end = caretOffset;
+ notifyListeners(CaretMoved, event);
+ }
+ }
+ if (alignment != SWT.DEFAULT) {
+ caretAlignment = alignment;
+ }
+}
/**
* Copies the specified text range to the clipboard. The text will be placed
* in the clipboard in plain text format and RTF format.
@@ -6936,9 +7967,13 @@ public void setContent(StyledTextContent newContent) {
* @see Control#setCursor(Cursor)
*/
public void setCursor (Cursor cursor) {
+ checkWidget();
+ if (cursor != null && cursor.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+ this.cursor = cursor;
if (cursor == null) {
Display display = getDisplay();
- super.setCursor(display.getSystemCursor(SWT.CURSOR_IBEAM));
+ int type = blockSelection ? SWT.CURSOR_CROSS : SWT.CURSOR_IBEAM;
+ super.setCursor(display.getSystemCursor(type));
} else {
super.setCursor(cursor);
}
@@ -7015,6 +8050,8 @@ public void setForeground(Color color) {
checkWidget();
foreground = color;
super.setForeground(getForeground());
+ resetCache(0, content.getLineCount());
+ setCaretLocation();
super.redraw();
}
/**
@@ -7192,6 +8229,21 @@ public void setKeyBinding(int key, int action) {
}
}
}
+/**
+ * Sets the left margin.
+ *
+ * @param leftMargin the left margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setLeftMargin (int leftMargin) {
+ checkWidget();
+ setMargins(leftMargin, topMargin, rightMargin, bottomMargin);
+}
/**
* Sets the alignment of the specified lines. The argument should be one of <code>SWT.LEFT</code>,
* <code>SWT.CENTER</code> or <code>SWT.RIGHT</code>.
@@ -7237,11 +8289,12 @@ public void setLineAlignment(int startLine, int lineCount, int alignment) {
renderer.setLineAlignment(startLine, lineCount, alignment);
resetCache(startLine, lineCount);
- redrawLines(startLine, lineCount);
+ redrawLines(startLine, lineCount, false);
int caretLine = getCaretLine();
if (startLine <= caretLine && caretLine < startLine + lineCount) {
setCaretLocation();
}
+ setAlignment();
}
/**
* Sets the background color of the specified lines.
@@ -7289,7 +8342,7 @@ public void setLineBackground(int startLine, int lineCount, Color background) {
} else {
renderer.clearLineBackground(startLine, lineCount);
}
- redrawLines(startLine, lineCount);
+ redrawLines(startLine, lineCount, false);
}
/**
* Sets the bullet of the specified lines.
@@ -7329,10 +8382,11 @@ public void setLineBullet(int startLine, int lineCount, Bullet bullet) {
if (startLine < 0 || startLine + lineCount > content.getLineCount()) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
-
+ int oldBottom = getLinePixel(startLine + lineCount);
renderer.setLineBullet(startLine, lineCount, bullet);
resetCache(startLine, lineCount);
- redrawLines(startLine, lineCount);
+ int newBottom = getLinePixel(startLine + lineCount);
+ redrawLines(startLine, lineCount, oldBottom != newBottom);
int caretLine = getCaretLine();
if (startLine <= caretLine && caretLine < startLine + lineCount) {
setCaretLocation();
@@ -7382,10 +8436,11 @@ public void setLineIndent(int startLine, int lineCount, int indent) {
if (startLine < 0 || startLine + lineCount > content.getLineCount()) {
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
-
+ int oldBottom = getLinePixel(startLine + lineCount);
renderer.setLineIndent(startLine, lineCount, indent);
resetCache(startLine, lineCount);
- redrawLines(startLine, lineCount);
+ int newBottom = getLinePixel(startLine + lineCount);
+ redrawLines(startLine, lineCount, oldBottom != newBottom);
int caretLine = getCaretLine();
if (startLine <= caretLine && caretLine < startLine + lineCount) {
setCaretLocation();
@@ -7433,7 +8488,7 @@ public void setLineJustify(int startLine, int lineCount, boolean justify) {
renderer.setLineJustify(startLine, lineCount, justify);
resetCache(startLine, lineCount);
- redrawLines(startLine, lineCount);
+ redrawLines(startLine, lineCount, false);
int caretLine = getCaretLine();
if (startLine <= caretLine && caretLine < startLine + lineCount) {
setCaretLocation();
@@ -7458,13 +8513,51 @@ public void setLineSpacing(int lineSpacing) {
setCaretLocation();
super.redraw();
}
-void setMargins (int leftMargin, int topMargin, int rightMargin, int bottomMargin) {
+/**
+ * Sets the color of the margins.
+ *
+ * @param color the new color (or null)
+ * @exception IllegalArgumentException <ul>
+ * <li>ERROR_INVALID_ARGUMENT - if the argument has been disposed</li>
+ * </ul>
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setMarginColor(Color color) {
+ checkWidget();
+ if (color != null && color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+ marginColor = color;
+ super.redraw();
+}
+/**
+ * Sets the margins.
+ *
+ * @param leftMargin the left margin.
+ * @param topMargin the top margin.
+ * @param rightMargin the right margin.
+ * @param bottomMargin the bottom margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setMargins (int leftMargin, int topMargin, int rightMargin, int bottomMargin) {
checkWidget();
- this.leftMargin = leftMargin;
- this.topMargin = topMargin;
- this.rightMargin = rightMargin;
- this.bottomMargin = bottomMargin;
+ this.leftMargin = Math.max(0, leftMargin);
+ this.topMargin = Math.max(0, topMargin);
+ this.rightMargin = Math.max(0, rightMargin);
+ this.bottomMargin = Math.max(0, bottomMargin);
+ resetCache(0, content.getLineCount());
+ setScrollBars(true);
setCaretLocation();
+ setAlignment();
+ super.redraw();
}
/**
* Flips selection anchor based on word selection direction.
@@ -7515,6 +8608,21 @@ public void setOrientation(int orientation) {
createKeyBindings();
super.redraw();
}
+/**
+ * Sets the right margin.
+ *
+ * @param rightMargin the right margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setRightMargin (int rightMargin) {
+ checkWidget();
+ setMargins(leftMargin, topMargin, rightMargin, bottomMargin);
+}
/**
* Adjusts the maximum and the page size of the scroll bars to
* reflect content width/length changes.
@@ -7531,9 +8639,9 @@ void setScrollBars(boolean vertical) {
// (ie. because the thumb size is less than the scroll maximum)
// avoids flashing on Motif, fixes 1G7RE1J and 1G5SE92
if (clientAreaHeight < maximum) {
- verticalBar.setMaximum(maximum);
- verticalBar.setThumb(clientAreaHeight);
- verticalBar.setPageIncrement(clientAreaHeight);
+ verticalBar.setMaximum(maximum - topMargin - bottomMargin);
+ verticalBar.setThumb(clientAreaHeight - topMargin - bottomMargin);
+ verticalBar.setPageIncrement(clientAreaHeight - topMargin - bottomMargin);
} else if (verticalBar.getThumb() != inactive || verticalBar.getMaximum() != inactive) {
verticalBar.setValues(
verticalBar.getSelection(),
@@ -7552,7 +8660,7 @@ void setScrollBars(boolean vertical) {
// (ie. because the thumb size is less than the scroll maximum)
// avoids flashing on Motif, fixes 1G7RE1J and 1G5SE92
if (clientAreaWidth < maximum) {
- horizontalBar.setMaximum(maximum);
+ horizontalBar.setMaximum(maximum - leftMargin - rightMargin);
horizontalBar.setThumb(clientAreaWidth - leftMargin - rightMargin);
horizontalBar.setPageIncrement(clientAreaWidth - leftMargin - rightMargin);
} else if (horizontalBar.getThumb() != inactive || horizontalBar.getMaximum() != inactive) {
@@ -7632,6 +8740,8 @@ public void setSelectionBackground (Color color) {
if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
selectionBackground = color;
+ resetCache(0, content.getLineCount());
+ setCaretLocation();
super.redraw();
}
/**
@@ -7659,6 +8769,8 @@ public void setSelectionForeground (Color color) {
if (color.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
selectionForeground = color;
+ resetCache(0, content.getLineCount());
+ setCaretLocation();
super.redraw();
}
/**
@@ -7700,7 +8812,7 @@ public void setSelection(int start, int end) {
* @param sendEvent a Selection event is sent when set to true and when
* the selection is reset.
*/
-void setSelection(int start, int length, boolean sendEvent) {
+void setSelection(int start, int length, boolean sendEvent, boolean doBlock) {
int end = start + length;
if (start > end) {
int temp = end;
@@ -7712,16 +8824,21 @@ void setSelection(int start, int length, boolean sendEvent) {
if (selection.x != start || selection.y != end ||
(length > 0 && selectionAnchor != selection.x) ||
(length < 0 && selectionAnchor != selection.y)) {
- clearSelection(sendEvent);
- if (length < 0) {
- selectionAnchor = selection.y = end;
- caretOffset = selection.x = start;
+ if (blockSelection && doBlock) {
+ setBlockSelectionOffset(start, end, sendEvent);
} else {
- selectionAnchor = selection.x = start;
- caretOffset = selection.y = end;
+ clearSelection(sendEvent);
+ if (length < 0) {
+ selectionAnchor = selection.y = end;
+ selection.x = start;
+ setCaretOffset(start, PREVIOUS_OFFSET_TRAILING);
+ } else {
+ selectionAnchor = selection.x = start;
+ selection.y = end;
+ setCaretOffset(end, PREVIOUS_OFFSET_TRAILING);
+ }
+ internalRedrawRange(selection.x, selection.y - selection.x);
}
- caretAlignment = PREVIOUS_OFFSET_TRAILING;
- internalRedrawRange(selection.x, selection.y - selection.x);
}
}
/**
@@ -7759,7 +8876,7 @@ public void setSelectionRange(int start, int length) {
// is thrown. Fixes 1GDKK3R
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
- setSelection(start, length, false);
+ setSelection(start, length, false, true);
setCaretLocation();
}
/**
@@ -7927,13 +9044,13 @@ void setStyleRanges(int start, int length, int[] ranges, StyleRange[] styles, bo
rangeEnd = styles[styles.length - 1].start + styles[styles.length - 1].length;
}
}
- int lastLineBottom = 0;
+ int expectedBottom = 0;
if (!isFixedLineHeight() && !reset) {
int lineEnd = content.getLineAtOffset(Math.max(end, rangeEnd));
int partialTopIndex = getPartialTopIndex();
int partialBottomIndex = getPartialBottomIndex();
if (partialTopIndex <= lineEnd && lineEnd <= partialBottomIndex) {
- lastLineBottom = getLinePixel(lineEnd + 1);
+ expectedBottom = getLinePixel(lineEnd + 1);
}
}
if (reset) {
@@ -7954,24 +9071,22 @@ void setStyleRanges(int start, int length, int[] ranges, StyleRange[] styles, bo
int partialTopIndex = getPartialTopIndex();
int partialBottomIndex = getPartialBottomIndex();
if (!(lineStart > partialBottomIndex || lineEnd < partialTopIndex)) {
- int y = 0;
- int height = clientAreaHeight;
+ int top = 0;
+ int bottom = clientAreaHeight;
if (partialTopIndex <= lineStart && lineStart <= partialBottomIndex) {
- int lineTop = Math.max(y, getLinePixel(lineStart));
- y = lineTop;
- height -= lineTop;
+ top = Math.max(0, getLinePixel(lineStart));
}
if (partialTopIndex <= lineEnd && lineEnd <= partialBottomIndex) {
- int newLastLineBottom = getLinePixel(lineEnd + 1);
- if (!isFixedLineHeight()) {
- scrollText(lastLineBottom, newLastLineBottom);
- }
- height = newLastLineBottom - y;
+ bottom = getLinePixel(lineEnd + 1);
+ }
+ if (!isFixedLineHeight() && bottom != expectedBottom) {
+ bottom = clientAreaHeight;
}
- super.redraw(0, y, clientAreaWidth, height, false);
+ super.redraw(0, top, clientAreaWidth, bottom - top, false);
}
}
setCaretLocation();
+ doMouseLinkCursor();
}
/**
* Sets styles to be used for rendering the widget content. All styles
@@ -8066,7 +9181,7 @@ public void setText(String text) {
styledTextEvent.text = content.getTextRange(event.start, event.end - event.start);
}
content.setText(event.text);
- sendModifyEvent(event);
+ notifyListeners(SWT.Modify, event);
if (styledTextEvent != null) {
notifyListeners(ExtendedModify, styledTextEvent);
}
@@ -8138,6 +9253,21 @@ public void setTopIndex(int topIndex) {
}
scrollVertical(pixel, true);
}
+/**
+ * Sets the top margin.
+ *
+ * @param topMargin the top margin.
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setTopMargin (int topMargin) {
+ checkWidget();
+ setMargins(leftMargin, topMargin, rightMargin, bottomMargin);
+}
/**
* Sets the top pixel offset. Do nothing if there is no text set.
* <p>
@@ -8190,6 +9320,7 @@ public void setWordWrap(boolean wrap) {
checkWidget();
if ((getStyle() & SWT.SINGLE) != 0) return;
if (wordWrap == wrap) return;
+ if (wordWrap && blockSelection) setBlockSelection(false);
wordWrap = wrap;
setVariableLineHeight();
resetCache(0, content.getLineCount());
@@ -8203,27 +9334,26 @@ public void setWordWrap(boolean wrap) {
super.redraw();
}
boolean showLocation(Rectangle rect, boolean scrollPage) {
- int clientAreaWidth = this.clientAreaWidth - leftMargin - rightMargin;
- int clientAreaHeight = this.clientAreaHeight - topMargin - bottomMargin;
boolean scrolled = false;
- if (rect.y <= topMargin) {
+ if (rect.y < topMargin) {
scrolled = scrollVertical(rect.y - topMargin, true);
- } else if (rect.y + rect.height > clientAreaHeight) {
- if (clientAreaHeight == 0) {
- scrolled = scrollVertical(rect.y, true);
+ } else if (rect.y + rect.height > clientAreaHeight - bottomMargin) {
+ if (clientAreaHeight - topMargin - bottomMargin <= 0) {
+ scrolled = scrollVertical(rect.y - topMargin, true);
} else {
- scrolled = scrollVertical(rect.y + rect.height - clientAreaHeight, true);
+ scrolled = scrollVertical(rect.y + rect.height - (clientAreaHeight - bottomMargin), true);
}
}
- if (clientAreaWidth > 0) {
- int minScroll = scrollPage ? clientAreaWidth / 4 : 0;
+ int width = clientAreaWidth - rightMargin - leftMargin;
+ if (width > 0) {
+ int minScroll = scrollPage ? width / 4 : 0;
if (rect.x < leftMargin) {
int scrollWidth = Math.max(leftMargin - rect.x, minScroll);
int maxScroll = horizontalScrollOffset;
scrolled = scrollHorizontal(-Math.min(maxScroll, scrollWidth), true);
- } else if (rect.x + rect.width > clientAreaWidth) {
- int scrollWidth = Math.max(rect.x + rect.width - clientAreaWidth, minScroll);
- int maxScroll = renderer.getWidth() - horizontalScrollOffset - this.clientAreaWidth;
+ } else if (rect.x + rect.width > (clientAreaWidth - rightMargin)) {
+ int scrollWidth = Math.max(rect.x + rect.width - (clientAreaWidth - rightMargin), minScroll);
+ int maxScroll = renderer.getWidth() - horizontalScrollOffset - clientAreaWidth;
scrolled = scrollHorizontal(Math.min(maxScroll, scrollWidth), true);
}
}
@@ -8278,7 +9408,7 @@ public void showSelection() {
endBounds = getBoundsAtOffset(endOffset);
}
// the character at endOffset is not part of the selection
- endBounds.width = 0;
+ endBounds.width = endOffset == caretOffset ? getCaretWidth() : 0;
showLocation(endBounds, false);
} else {
// just show the end of the selection since the selection start
@@ -8286,6 +9416,21 @@ public void showSelection() {
showLocation(endBounds, true);
}
}
+void updateCaretVisibility() {
+ Caret caret = getCaret();
+ if (caret != null) {
+ if (blockSelection && blockXLocation != -1) {
+ caret.setVisible(false);
+ } else {
+ Point location = caret.getLocation();
+ Point size = caret.getSize();
+ boolean visible =
+ topMargin <= location.y + size.y && location.y <= clientAreaHeight - bottomMargin &&
+ leftMargin <= location.x + size.x && location.x <= clientAreaWidth - rightMargin;
+ caret.setVisible(visible);
+ }
+ }
+}
/**
* Updates the selection and caret position depending on the text change.
* <p>
@@ -8320,10 +9465,10 @@ void updateSelection(int startOffset, int replacedLength, int newLength) {
}
if (selection.y > startOffset && selection.x < startOffset + replacedLength) {
// selection intersects replaced text. set caret behind text change
- setSelection(startOffset + newLength, 0, true);
+ setSelection(startOffset + newLength, 0, true, false);
} else {
// move selection to keep same text selected
- setSelection(selection.x + newLength - replacedLength, selection.y - selection.x, true);
+ setSelection(selection.x + newLength - replacedLength, selection.y - selection.x, true, false);
}
setCaretLocation();
}
diff --git a/org/eclipse/swt/custom/StyledTextListener.java b/org/eclipse/swt/custom/StyledTextListener.java
index 3133b21..166e911 100644
--- a/org/eclipse/swt/custom/StyledTextListener.java
+++ b/org/eclipse/swt/custom/StyledTextListener.java
@@ -88,6 +88,12 @@ public void handleEvent(Event e) {
((StyledTextEvent) e).end = wordBoundaryEvent.newOffset;
break;
}
+ case StyledText.CaretMoved: {
+ CaretEvent caretEvent = new CaretEvent((StyledTextEvent) e);
+ ((CaretListener) eventListener).caretMoved(caretEvent);
+ ((StyledTextEvent) e).end = caretEvent.caretOffset;
+ break;
+ }
}
}
}
diff --git a/org/eclipse/swt/custom/StyledTextRenderer.java b/org/eclipse/swt/custom/StyledTextRenderer.java
index 4b52718..86dcf4d 100644
--- a/org/eclipse/swt/custom/StyledTextRenderer.java
+++ b/org/eclipse/swt/custom/StyledTextRenderer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@ class StyledTextRenderer {
StyleRange[] styles;
StyleRange[] stylesSet;
int stylesSetCount = 0;
+ boolean hasLinks, fixedPitch;
final static int BULLET_MARGIN = 8;
final static boolean COMPACT_STYLES = true;
@@ -358,6 +359,9 @@ int drawLine(int lineIndex, int paintX, int paintY, GC gc, Color widgetBackgroun
Point selection = styledText.getSelection();
int selectionStart = selection.x - lineOffset;
int selectionEnd = selection.y - lineOffset;
+ if (styledText.getBlockSelection()) {
+ selectionStart = selectionEnd = 0;
+ }
Rectangle client = styledText.getClientArea();
Color lineBackground = getLineBackground(lineIndex, null);
StyledTextEvent event = styledText.getLineBackgroundData(lineOffset, line);
@@ -465,7 +469,7 @@ FontData[] getFontData(int style) {
int getHeight () {
int defaultLineHeight = getLineHeight();
if (styledText.isFixedLineHeight()) {
- return lineCount * defaultLineHeight;
+ return lineCount * defaultLineHeight + styledText.topMargin + styledText.bottomMargin;
}
int totalHeight = 0;
int width = styledText.getWrapWidth();
@@ -483,6 +487,45 @@ int getHeight () {
}
return totalHeight + styledText.topMargin + styledText.bottomMargin;
}
+boolean hasLink(int offset) {
+ if (offset == -1) return false;
+ int lineIndex = content.getLineAtOffset(offset);
+ int lineOffset = content.getOffsetAtLine(lineIndex);
+ String line = content.getLine(lineIndex);
+ StyledTextEvent event = styledText.getLineStyleData(lineOffset, line);
+ if (event != null) {
+ StyleRange[] styles = event.styles;
+ if (styles != null) {
+ int[] ranges = event.ranges;
+ if (ranges != null) {
+ for (int i = 0; i < ranges.length; i+=2) {
+ if (ranges[i] <= offset && offset < ranges[i] + ranges[i+1] && styles[i >> 1].underline && styles[i >> 1].underlineStyle == SWT.UNDERLINE_LINK) {
+ return true;
+ }
+ }
+ } else {
+ for (int i = 0; i < styles.length; i++) {
+ if (styles[i].start <= offset && offset < styles[i].start + styles[i].length && styles[i >> 1].underline && styles[i >> 1].underlineStyle == SWT.UNDERLINE_LINK) {
+ return true;
+ }
+ }
+ }
+ }
+ } else {
+ if (ranges != null) {
+ int rangeCount = styleCount << 1;
+ int index = getRangeIndex(offset, -1, rangeCount);
+ if (index >= rangeCount) return false;
+ int rangeStart = ranges[index];
+ int rangeLength = ranges[index + 1];
+ StyleRange rangeStyle = styles[index >> 1];
+ if (rangeStart <= offset && offset < rangeStart + rangeLength && rangeStyle.underline && rangeStyle.underlineStyle == SWT.UNDERLINE_LINK) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
int getLineAlignment(int index, int defaultAlignment) {
if (lines == null) return defaultAlignment;
LineInfo info = lines[index];
@@ -567,6 +610,7 @@ int getRangeIndex(int offset, int low, int high) {
return high;
}
int[] getRanges(int start, int length) {
+ if (length == 0) return null;
int[] newRanges;
int end = start + length - 1;
if (ranges != null) {
@@ -574,7 +618,8 @@ int[] getRanges(int start, int length) {
int rangeStart = getRangeIndex(start, -1, rangeCount);
if (rangeStart >= rangeCount) return null;
if (ranges[rangeStart] > end) return null;
- int rangeEnd = Math.min(rangeCount - 2, getRangeIndex(end, rangeStart - 1, rangeCount) + 1);
+ int rangeEnd = Math.min(rangeCount - 2, getRangeIndex(end, rangeStart - 1, rangeCount));
+ if (ranges[rangeEnd] > end) rangeEnd = Math.max(rangeStart, rangeEnd - 2);
newRanges = new int[rangeEnd - rangeStart + 2];
System.arraycopy(ranges, rangeStart, newRanges, 0, newRanges.length);
} else {
@@ -582,12 +627,13 @@ int[] getRanges(int start, int length) {
if (rangeStart >= styleCount) return null;
if (styles[rangeStart].start > end) return null;
int rangeEnd = Math.min(styleCount - 1, getRangeIndex(end, rangeStart - 1, styleCount));
+ if (styles[rangeEnd].start > end) rangeEnd = Math.max(rangeStart, rangeEnd - 1);
newRanges = new int[(rangeEnd - rangeStart + 1) << 1];
for (int i = rangeStart, j = 0; i <= rangeEnd; i++, j += 2) {
StyleRange style = styles[i];
newRanges[j] = style.start;
newRanges[j + 1] = style.length;
- }
+ }
}
if (start > newRanges[0]) {
newRanges[1] = newRanges[0] + newRanges[1] - start;
@@ -599,6 +645,7 @@ int[] getRanges(int start, int length) {
return newRanges;
}
StyleRange[] getStyleRanges(int start, int length, boolean includeRanges) {
+ if (length == 0) return null;
StyleRange[] newStyles;
int end = start + length - 1;
if (ranges != null) {
@@ -606,7 +653,8 @@ StyleRange[] getStyleRanges(int start, int length, boolean includeRanges) {
int rangeStart = getRangeIndex(start, -1, rangeCount);
if (rangeStart >= rangeCount) return null;
if (ranges[rangeStart] > end) return null;
- int rangeEnd = Math.min(rangeCount - 2, getRangeIndex(end, rangeStart - 1, rangeCount) + 1);
+ int rangeEnd = Math.min(rangeCount - 2, getRangeIndex(end, rangeStart - 1, rangeCount));
+ if (ranges[rangeEnd] > end) rangeEnd = Math.max(rangeStart, rangeEnd - 2);
newStyles = new StyleRange[((rangeEnd - rangeStart) >> 1) + 1];
if (includeRanges) {
for (int i = rangeStart, j = 0; i <= rangeEnd; i += 2, j++) {
@@ -622,29 +670,27 @@ StyleRange[] getStyleRanges(int start, int length, boolean includeRanges) {
if (rangeStart >= styleCount) return null;
if (styles[rangeStart].start > end) return null;
int rangeEnd = Math.min(styleCount - 1, getRangeIndex(end, rangeStart - 1, styleCount));
+ if (styles[rangeEnd].start > end) rangeEnd = Math.max(rangeStart, rangeEnd - 1);
newStyles = new StyleRange[rangeEnd - rangeStart + 1];
System.arraycopy(styles, rangeStart, newStyles, 0, newStyles.length);
}
- StyleRange style = newStyles[0];
- if (start > style.start) {
- if (!includeRanges || ranges == null) newStyles[0] = style = (StyleRange)style.clone();
- style.length = style.start + style.length - start;
- style.start = start;
- }
- style = newStyles[newStyles.length - 1];
- if (end < style.start + style.length - 1) {
- if (end < style.start) {
- StyleRange[] tmp = new StyleRange[newStyles.length - 1];
- System.arraycopy(newStyles, 0, tmp, 0, newStyles.length - 1);
- newStyles = tmp;
- } else {
- if (!includeRanges || ranges == null) newStyles[newStyles.length - 1] = style = (StyleRange)style.clone();
+ if (includeRanges || ranges == null) {
+ StyleRange style = newStyles[0];
+ if (start > style.start) {
+ newStyles[0] = style = (StyleRange)style.clone();
+ style.length = style.start + style.length - start;
+ style.start = start;
+ }
+ style = newStyles[newStyles.length - 1];
+ if (end < style.start + style.length - 1) {
+ newStyles[newStyles.length - 1] = style = (StyleRange)style.clone();
style.length = end - style.start + 1;
}
}
return newStyles;
}
StyleRange getStyleRange(StyleRange style) {
+ if (style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) hasLinks = true;
if (style.start == 0 && style.length == 0 && style.fontStyle == SWT.NORMAL) return style;
StyleRange clone = (StyleRange)style.clone();
clone.start = clone.length = 0;
@@ -960,6 +1006,7 @@ void reset() {
bullets = null;
bulletsIndices = null;
redrawLines = null;
+ hasLinks = false;
}
void reset(int startLine, int lineCount) {
int endLine = startLine + lineCount;
@@ -1025,6 +1072,7 @@ void setFont(Font font, int tabs) {
if (styledText != null) {
GC gc = new GC(styledText);
averageCharWidth = gc.getFontMetrics().getAverageCharWidth();
+ fixedPitch = gc.stringExtent("l").x == gc.stringExtent("W").x; //$NON-NLS-1$ //$NON-NLS-2$
gc.dispose();
}
}
@@ -1113,6 +1161,7 @@ void setStyleRanges (int[] newRanges, StyleRange[] newStyles) {
ranges = null;
styles = null;
stylesSet = null;
+ hasLinks = false;
return;
}
if (newRanges == null && COMPACT_STYLES) {
diff --git a/org/eclipse/swt/custom/TableCursor.java b/org/eclipse/swt/custom/TableCursor.java
index 6354c1d..0408aa5 100644
--- a/org/eclipse/swt/custom/TableCursor.java
+++ b/org/eclipse/swt/custom/TableCursor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@ package org.eclipse.swt.custom;
import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.accessibility.*;
import org.eclipse.swt.events.*;
/**
@@ -138,7 +139,7 @@ public class TableCursor extends Canvas {
Table table;
TableItem row = null;
TableColumn column = null;
- Listener tableListener, resizeListener, disposeItemListener, disposeColumnListener;
+ Listener listener, tableListener, resizeListener, disposeItemListener, disposeColumnListener;
Color background = null;
Color foreground = null;
@@ -181,11 +182,11 @@ public TableCursor(Table parent, int style) {
setBackground(null);
setForeground(null);
- Listener listener = new Listener() {
+ listener = new Listener() {
public void handleEvent(Event event) {
switch (event.type) {
case SWT.Dispose :
- dispose(event);
+ onDispose(event);
break;
case SWT.FocusIn :
case SWT.FocusOut :
@@ -260,6 +261,19 @@ public TableCursor(Table parent, int style) {
if (vBar != null) {
vBar.addListener(SWT.Selection, resizeListener);
}
+
+ getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {
+ public void getRole(AccessibleControlEvent e) {
+ e.detail = ACC.ROLE_TABLECELL;
+ }
+ });
+ getAccessible().addAccessibleListener(new AccessibleAdapter() {
+ public void getName(AccessibleEvent e) {
+ if (row == null) return;
+ int columnIndex = column == null ? 0 : table.indexOf(column);
+ e.result = row.getText(columnIndex);
+ }
+ });
}
/**
@@ -298,7 +312,11 @@ public void addSelectionListener(SelectionListener listener) {
addListener(SWT.DefaultSelection, typedListener);
}
-void dispose(Event event) {
+void onDispose(Event event) {
+ removeListener(SWT.Dispose, listener);
+ notifyListeners(SWT.Dispose, event);
+ event.type = SWT.None;
+
table.removeListener(SWT.FocusIn, tableListener);
table.removeListener(SWT.MouseDown, tableListener);
unhookRowColumnListeners();
@@ -557,6 +575,7 @@ void setRowColumn(TableItem row, TableColumn column, boolean notify) {
notifyListeners(SWT.Selection, new Event());
}
}
+ getAccessible().setFocus(ACC.CHILDID_SELF);
}
public void setVisible(boolean visible) {
diff --git a/org/eclipse/swt/custom/TableTree.java b/org/eclipse/swt/custom/TableTree.java
index efcfc93..4ac4da4 100644
--- a/org/eclipse/swt/custom/TableTree.java
+++ b/org/eclipse/swt/custom/TableTree.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@ public class TableTree extends Composite {
Table table;
TableTreeItem[] items = EMPTY_ITEMS;
Image plusImage, minusImage, sizeImage;
+ Listener listener;
/*
* TableTreeItems are not treated as children but rather as items.
@@ -113,7 +114,7 @@ public TableTree(Composite parent, int style) {
table.addListener(tableEvents[i], tableListener);
}
- Listener listener = new Listener() {
+ listener = new Listener() {
public void handleEvent(Event e) {
switch (e.type) {
case SWT.Dispose: onDispose(e); break;
@@ -438,6 +439,9 @@ public int indexOf (TableTreeItem item) {
}
void onDispose(Event e) {
+ removeListener(SWT.Dispose, listener);
+ notifyListeners(SWT.Dispose, e);
+ e.type = SWT.None;
/*
* Usually when an item is disposed, destroyItem will change the size of the items array
* and dispose of the underlying table items.
diff --git a/org/eclipse/swt/custom/TextChangeListener.java b/org/eclipse/swt/custom/TextChangeListener.java
index 1ed1a47..a7c53a8 100644
--- a/org/eclipse/swt/custom/TextChangeListener.java
+++ b/org/eclipse/swt/custom/TextChangeListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/custom/ViewForm.java b/org/eclipse/swt/custom/ViewForm.java
index fe513bf..55c1915 100644
--- a/org/eclipse/swt/custom/ViewForm.java
+++ b/org/eclipse/swt/custom/ViewForm.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@ import org.eclipse.swt.*;
* </p>
*
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ViewForm extends Composite {
@@ -116,6 +117,7 @@ public class ViewForm extends Composite {
Point oldSize;
Color selectionBackground;
+ Listener listener;
static final int OFFSCREEN = -200;
static final int BORDER1_COLOR = SWT.COLOR_WIDGET_NORMAL_SHADOW;
@@ -153,10 +155,10 @@ public ViewForm(Composite parent, int style) {
setBorderVisible((style & SWT.BORDER) != 0);
- Listener listener = new Listener() {
+ listener = new Listener() {
public void handleEvent(Event e) {
switch (e.type) {
- case SWT.Dispose: onDispose(); break;
+ case SWT.Dispose: onDispose(e); break;
case SWT.Paint: onPaint(e.gc); break;
case SWT.Resize: onResize(); break;
}
@@ -239,7 +241,11 @@ public Control getTopRight() {
//checkWidget();
return topRight;
}
-void onDispose() {
+void onDispose(Event event) {
+ removeListener(SWT.Dispose, listener);
+ notifyListeners(SWT.Dispose, event);
+ event.type = SWT.None;
+
topLeft = null;
topCenter = null;
topRight = null;
diff --git a/org/eclipse/swt/custom/ViewFormLayout.java b/org/eclipse/swt/custom/ViewFormLayout.java
index ba5f969..18d4b6d 100644
--- a/org/eclipse/swt/custom/ViewFormLayout.java
+++ b/org/eclipse/swt/custom/ViewFormLayout.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -193,9 +193,18 @@ protected void layout(Composite composite, boolean flushCache) {
}
content.setBounds(rect.x + form.marginWidth + form.highlight, y, rect.width - 2 * form.marginWidth - 2*form.highlight, rect.y + rect.height - y - form.marginHeight - form.highlight);
}
- if (oldSeperator != -1 && form.separator != -1) {
- int t = Math.min(form.separator, oldSeperator);
- int b = Math.max(form.separator, oldSeperator);
+ if (oldSeperator != form.separator) {
+ int t, b;
+ if (oldSeperator == -1) {
+ t = form.separator;
+ b = form.separator + 1;
+ } else if (form.separator == -1) {
+ t = oldSeperator;
+ b = oldSeperator + 1;
+ } else {
+ t = Math.min(form.separator, oldSeperator);
+ b = Math.max(form.separator, oldSeperator);
+ }
form.redraw(form.borderLeft, t, form.getSize().x - form.borderLeft - form.borderRight, b - t, false);
}
}
diff --git a/org/eclipse/swt/dnd/Clipboard.java b/org/eclipse/swt/dnd/Clipboard.java
index 1a60fc4..87b1e17 100644
--- a/org/eclipse/swt/dnd/Clipboard.java
+++ b/org/eclipse/swt/dnd/Clipboard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Display;
* @see <a href="http://www.eclipse.org/swt/snippets/#clipboard">Clipboard snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ClipboardExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Clipboard {
diff --git a/org/eclipse/swt/dnd/DNDEvent.java b/org/eclipse/swt/dnd/DNDEvent.java
index 7d7f648..b74fd27 100644
--- a/org/eclipse/swt/dnd/DNDEvent.java
+++ b/org/eclipse/swt/dnd/DNDEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,4 +20,6 @@ class DNDEvent extends Event {
public int operations;
public int feedback;
public Image image;
+ public int offsetX;
+ public int offsetY;
}
diff --git a/org/eclipse/swt/dnd/DragSource.java b/org/eclipse/swt/dnd/DragSource.java
index 609a578..3874254 100644
--- a/org/eclipse/swt/dnd/DragSource.java
+++ b/org/eclipse/swt/dnd/DragSource.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -96,6 +96,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#dnd">Drag and Drop snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: DNDExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class DragSource extends Widget {
@@ -358,6 +359,7 @@ void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selecti
event.dataType = transferData;
notifyListeners(DND.DragSetData, event);
+ if (!event.doit) return;
Transfer transfer = null;
for (int i = 0; i < transferAgents.length; i++) {
Transfer transferAgent = transferAgents[i];
diff --git a/org/eclipse/swt/dnd/DragSourceEvent.java b/org/eclipse/swt/dnd/DragSourceEvent.java
index bfc6a74..9336768 100644
--- a/org/eclipse/swt/dnd/DragSourceEvent.java
+++ b/org/eclipse/swt/dnd/DragSourceEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,7 +39,9 @@ public class DragSourceEvent extends TypedEvent {
* <p>Flag to determine if the drag and drop operation should proceed.
* The application can set this value to false to prevent the drag from starting.
* Set to true by default.</p>
- *
+ * <p>In dragSetData:</p>
+ * <p>This will be set to true when the call to dragSetData is made. Set it to
+ * false to cancel the drag.</p>
* <p>In dragFinished:</p>
* <p>Flag to indicate if the operation was performed successfully.
* True if the operation was performed successfully.</p>
@@ -49,12 +51,14 @@ public class DragSourceEvent extends TypedEvent {
/**
* In dragStart, the x coordinate (relative to the control) of the
* position the mouse went down to start the drag.
+ *
* @since 3.2
*/
public int x;
/**
* In dragStart, the y coordinate (relative to the control) of the
- * position the mouse went down to start the drag .
+ * position the mouse went down to start the drag.
+ *
* @since 3.2
*/
public int y;
@@ -74,6 +78,19 @@ public class DragSourceEvent extends TypedEvent {
*/
public Image image;
+ /**
+ * In dragStart, the x offset (relative to the image) where the drag source image will be displayed.
+ *
+ * @since 3.5
+ */
+ public int offsetX;
+ /**
+ * In dragStart, the y offset (relative to the image) where the drag source image will be displayed.
+ *
+ * @since 3.5
+ */
+ public int offsetY;
+
static final long serialVersionUID = 3257002142513770808L;
/**
@@ -91,6 +108,8 @@ public DragSourceEvent(DNDEvent e) {
this.x = e.x;
this.y = e.y;
this.image = e.image;
+ this.offsetX = e.offsetX;
+ this.offsetY = e.offsetY;
}
void updateEvent(DNDEvent e) {
e.widget = this.widget;
@@ -102,5 +121,21 @@ void updateEvent(DNDEvent e) {
e.x = this.x;
e.y = this.y;
e.image = this.image;
+ e.offsetX = this.offsetX;
+ e.offsetY = this.offsetY;
+}
+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the event
+ */
+public String toString() {
+ String string = super.toString ();
+ return string.substring (0, string.length() - 1) // remove trailing '}'
+ + " operation=" + detail
+ + " type=" + (dataType != null ? dataType.type : 0)
+ + " doit=" + doit
+ + "}";
}
}
diff --git a/org/eclipse/swt/dnd/DragSourceListener.java b/org/eclipse/swt/dnd/DragSourceListener.java
index a7c23ca..0ce0aa7 100644
--- a/org/eclipse/swt/dnd/DragSourceListener.java
+++ b/org/eclipse/swt/dnd/DragSourceListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@ public void dragStart(DragSourceEvent event);
* <li>(in)time
* <li>(in)dataType - the type of data requested.
* <li>(out)data - the application inserts the actual data here (must match the dataType)
+ * <li>(out)doit - set this to cancel the drag
* </ul></p>
*
* @param event the information associated with the drag set data event
diff --git a/org/eclipse/swt/dnd/DropTarget.java b/org/eclipse/swt/dnd/DropTarget.java
index af4b85d..c9cc25a 100644
--- a/org/eclipse/swt/dnd/DropTarget.java
+++ b/org/eclipse/swt/dnd/DropTarget.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@ import org.eclipse.swt.internal.gtk.*;
*
* Class <code>DropTarget</code> defines the target object for a drag and drop transfer.
*
- * IMPORTANT: This class is <em>not</em> intended to be subclassed.
+ * <p>IMPORTANT: This class is <em>not</em> intended to be subclassed.</p>
*
* <p>This class identifies the <code>Control</code> over which the user must position the cursor
* in order to drop the data being transferred. It also specifies what data types can be dropped on
@@ -71,6 +71,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#dnd">Drag and Drop snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: DNDExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class DropTarget extends Widget {
@@ -97,6 +98,7 @@ public class DropTarget extends Widget {
int drag_drop_handler;
static final String DEFAULT_DROP_TARGET_EFFECT = "DEFAULT_DROP_TARGET_EFFECT"; //$NON-NLS-1$
+ static final String IS_ACTIVE = "org.eclipse.swt.internal.control.isactive"; //$NON-NLS-1$
static final int DRAGOVER_HYSTERESIS = 50;
static Callback Drag_Motion;
@@ -431,11 +433,16 @@ void drag_leave ( int /*long*/ widget, int /*long*/ context, int time){
boolean drag_motion ( int /*long*/ widget, int /*long*/ context, int x, int y, int time){
int oldKeyOperation = keyOperation;
- if (oldKeyOperation == -1) { //drag enter
+ /*
+ * Bug in GTK. GTK allows drag & drop on a shell even if a modal
+ * dialog/window is opened on that shell. The fix is to check for
+ * any active modal dialogs/shells before allowing the drop.
+ */
+ if ((oldKeyOperation == -1) || !((Boolean) control.getData(IS_ACTIVE)).booleanValue()) { //drag enter
selectedDataType = null;
selectedOperation = DND.DROP_NONE;
}
-
+
DNDEvent event = new DNDEvent();
if (!setEventData(context, x, y, time, event)) {
keyOperation = -1;
diff --git a/org/eclipse/swt/dnd/DropTargetEvent.java b/org/eclipse/swt/dnd/DropTargetEvent.java
index a2a6957..3b38964 100644
--- a/org/eclipse/swt/dnd/DropTargetEvent.java
+++ b/org/eclipse/swt/dnd/DropTargetEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@ public class DropTargetEvent extends TypedEvent {
* @see DND#DROP_MOVE
* @see DND#DROP_COPY
* @see DND#DROP_LINK
+ * @see DND#DROP_DEFAULT
*/
public int detail;
@@ -46,6 +47,7 @@ public class DropTargetEvent extends TypedEvent {
* @see DND#DROP_MOVE
* @see DND#DROP_COPY
* @see DND#DROP_LINK
+ * @see DND#DROP_DEFAULT
*/
public int operations;
@@ -114,4 +116,31 @@ void updateEvent(DNDEvent e) {
e.feedback = this.feedback;
e.item = this.item;
}
+/**
+ * Returns a string containing a concise, human-readable
+ * description of the receiver.
+ *
+ * @return a string representation of the event
+ */
+public String toString() {
+ String string = super.toString ();
+ StringBuffer sb = new StringBuffer();
+ sb.append(string.substring (0, string.length() - 1)); // remove trailing '}'
+ sb.append(" x="); sb.append(x);
+ sb.append(" y="); sb.append(y);
+ sb.append(" item="); sb.append(item);
+ sb.append(" operations="); sb.append(operations);
+ sb.append(" operation="); sb.append(detail);
+ sb.append(" feedback="); sb.append(feedback);
+ sb.append(" dataTypes={ ");
+ if (dataTypes != null) {
+ for (int i = 0; i < dataTypes.length; i++) {
+ sb.append(dataTypes[i].type); sb.append(' ');
+ }
+ }
+ sb.append('}');
+ sb.append(" currentDataType="); sb.append(currentDataType != null ? currentDataType.type : '0');
+ sb.append('}');
+ return sb.toString();
+}
}
diff --git a/org/eclipse/swt/dnd/DropTargetListener.java b/org/eclipse/swt/dnd/DropTargetListener.java
index df430ab..531a0de 100644
--- a/org/eclipse/swt/dnd/DropTargetListener.java
+++ b/org/eclipse/swt/dnd/DropTargetListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/dnd/FileTransfer.java b/org/eclipse/swt/dnd/FileTransfer.java
index f8cfac3..8b0338f 100644
--- a/org/eclipse/swt/dnd/FileTransfer.java
+++ b/org/eclipse/swt/dnd/FileTransfer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,7 +37,8 @@ public class FileTransfer extends ByteArrayTransfer {
private static FileTransfer _instance = new FileTransfer();
private static final String URI_LIST = "text/uri-list"; //$NON-NLS-1$
private static final int URI_LIST_ID = registerType(URI_LIST);
- private static final byte[] separator = new byte[]{'\r', '\n'};
+ private static final String GNOME_LIST = "x-special/gnome-copied-files"; //$NON-NLS-1$
+ private static final int GNOME_LIST_ID = registerType(GNOME_LIST);
private FileTransfer() {}
@@ -67,8 +68,16 @@ public void javaToNative(Object object, TransferData transferData) {
if (!checkFile(object) || !isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
}
+ boolean gnomeList = transferData.type == GNOME_LIST_ID;
+ byte[] buffer, separator;
+ if (gnomeList) {
+ buffer = new byte[] {'c','o','p','y'};
+ separator = new byte[] {'\n'};
+ } else {
+ buffer = new byte[0];
+ separator = new byte[] {'\r', '\n'};
+ }
String[] files = (String[])object;
- byte[] buffer = new byte[0];
for (int i = 0; i < files.length; i++) {
String string = files[i];
if (string == null) continue;
@@ -89,10 +98,10 @@ public void javaToNative(Object object, TransferData transferData) {
byte[] temp = new byte[length];
OS.memmove (temp, uriPtr, length);
OS.g_free(uriPtr);
- int newLength = (i > 0) ? buffer.length+separator.length+temp.length : temp.length;
+ int newLength = (buffer.length > 0) ? buffer.length+separator.length+temp.length : temp.length;
byte[] newBuffer = new byte[newLength];
int offset = 0;
- if (i > 0) {
+ if (buffer.length > 0) {
System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
offset += buffer.length;
System.arraycopy(separator, 0, newBuffer, offset, separator.length);
@@ -126,23 +135,29 @@ public Object nativeToJava(TransferData transferData) {
int length = transferData.length;
byte[] temp = new byte[length];
OS.memmove(temp, transferData.pValue, length);
+ boolean gnomeList = transferData.type == GNOME_LIST_ID;
+ int sepLength = gnomeList ? 1 : 2;
int /*long*/[] files = new int /*long*/[0];
int offset = 0;
for (int i = 0; i < temp.length - 1; i++) {
- if (temp[i] == '\r' && temp[i+1] == '\n') {
- int size = i - offset;
- int /*long*/ file = OS.g_malloc(size + 1);
- byte[] fileBuffer = new byte[size + 1];
- System.arraycopy(temp, offset, fileBuffer, 0, size);
- OS.memmove(file, fileBuffer, size + 1);
- int /*long*/[] newFiles = new int /*long*/[files.length + 1];
- System.arraycopy(files, 0, newFiles, 0, files.length);
- newFiles[files.length] = file;
- files = newFiles;
- offset = i + 2;
+ boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n';
+ if (terminator) {
+ if (!(gnomeList && offset == 0)) {
+ /* The content of the first line in a gnome-list is always either 'copy' or 'cut' */
+ int size = i - offset;
+ int /*long*/ file = OS.g_malloc(size + 1);
+ byte[] fileBuffer = new byte[size + 1];
+ System.arraycopy(temp, offset, fileBuffer, 0, size);
+ OS.memmove(file, fileBuffer, size + 1);
+ int /*long*/[] newFiles = new int /*long*/[files.length + 1];
+ System.arraycopy(files, 0, newFiles, 0, files.length);
+ newFiles[files.length] = file;
+ files = newFiles;
+ }
+ offset = i + sepLength;
}
}
- if (offset < temp.length - 2) {
+ if (offset < temp.length - sepLength) {
int size = temp.length - offset;
int /*long*/ file = OS.g_malloc(size + 1);
byte[] fileBuffer = new byte[size + 1];
@@ -180,11 +195,11 @@ public Object nativeToJava(TransferData transferData) {
}
protected int[] getTypeIds(){
- return new int[]{URI_LIST_ID};
+ return new int[]{URI_LIST_ID, GNOME_LIST_ID};
}
protected String[] getTypeNames(){
- return new String[]{URI_LIST};
+ return new String[]{URI_LIST, GNOME_LIST};
}
boolean checkFile(Object object) {
diff --git a/org/eclipse/swt/dnd/ImageTransfer.java b/org/eclipse/swt/dnd/ImageTransfer.java
index 1bd5a34..cf28027 100644
--- a/org/eclipse/swt/dnd/ImageTransfer.java
+++ b/org/eclipse/swt/dnd/ImageTransfer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,7 +36,7 @@ public class ImageTransfer extends ByteArrayTransfer {
private static ImageTransfer _instance = new ImageTransfer();
- private static final String JPEG = "image/jpge"; //$NON-NLS-1$
+ private static final String JPEG = "image/jpeg"; //$NON-NLS-1$
private static final int JPEG_ID = registerType(JPEG);
private static final String PNG = "image/png"; //$NON-NLS-1$
private static final int PNG_ID = registerType(PNG);
@@ -111,13 +111,13 @@ public void javaToNative(Object object, TransferData transferData) {
if (transferData.type == XV_ID) typeStr = "xv";
byte[] type = Converter.wcsToMbcs(null, typeStr , true);
int /*long*/ [] buffer = new int /*long*/ [1];
- int [] len = new int [1];
+ int /*long*/ [] len = new int /*long*/ [1];
if (type == null) return;
- OS.gdk_pixbuf_save_to_buffer(pixbuf, buffer, len, type , null, null);
+ OS.gdk_pixbuf_save_to_bufferv(pixbuf, buffer, len, type, null, null, null);
OS.g_object_unref(pixbuf);
image.dispose();
transferData.pValue = buffer[0];
- transferData.length = (len[0] + 3) / 4 * 4;
+ transferData.length = (int)(len[0] + 3) / 4 * 4;
transferData.result = 1;
transferData.format = 32;
}
diff --git a/org/eclipse/swt/dnd/URLTransfer.java b/org/eclipse/swt/dnd/URLTransfer.java
index 80a2d6e..63226b1 100644
--- a/org/eclipse/swt/dnd/URLTransfer.java
+++ b/org/eclipse/swt/dnd/URLTransfer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,6 +25,7 @@ import org.eclipse.swt.internal.gtk.*;
* </code></pre>
*
* @see Transfer
+ * @since 3.4
*/
public class URLTransfer extends ByteArrayTransfer {
diff --git a/org/eclipse/swt/events/ArmListener.java b/org/eclipse/swt/events/ArmListener.java
index 9f81711..23e983a 100644
--- a/org/eclipse/swt/events/ArmListener.java
+++ b/org/eclipse/swt/events/ArmListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/ControlListener.java b/org/eclipse/swt/events/ControlListener.java
index 94f3019..4895ec1 100644
--- a/org/eclipse/swt/events/ControlListener.java
+++ b/org/eclipse/swt/events/ControlListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/DisposeListener.java b/org/eclipse/swt/events/DisposeListener.java
index 3d5926a..980f0b3 100644
--- a/org/eclipse/swt/events/DisposeListener.java
+++ b/org/eclipse/swt/events/DisposeListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/FocusListener.java b/org/eclipse/swt/events/FocusListener.java
index 3eacb2c..9aa3097 100644
--- a/org/eclipse/swt/events/FocusListener.java
+++ b/org/eclipse/swt/events/FocusListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/HelpListener.java b/org/eclipse/swt/events/HelpListener.java
index baf8f4c..9437c09 100644
--- a/org/eclipse/swt/events/HelpListener.java
+++ b/org/eclipse/swt/events/HelpListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/KeyListener.java b/org/eclipse/swt/events/KeyListener.java
index 4d139e6..6107f83 100644
--- a/org/eclipse/swt/events/KeyListener.java
+++ b/org/eclipse/swt/events/KeyListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/ModifyListener.java b/org/eclipse/swt/events/ModifyListener.java
index 6a6c8dc..614b13a 100644
--- a/org/eclipse/swt/events/ModifyListener.java
+++ b/org/eclipse/swt/events/ModifyListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/MouseEvent.java b/org/eclipse/swt/events/MouseEvent.java
index c3b445b..19da769 100644
--- a/org/eclipse/swt/events/MouseEvent.java
+++ b/org/eclipse/swt/events/MouseEvent.java
@@ -40,8 +40,8 @@ public class MouseEvent extends TypedEvent {
public int button;
/**
- * the state of the keyboard modifier keys at the time
- * the event was generated
+ * the state of the keyboard modifier keys and mouse masks
+ * at the time the event was generated.
*/
public int stateMask;
diff --git a/org/eclipse/swt/events/MouseListener.java b/org/eclipse/swt/events/MouseListener.java
index a7e0fb2..8ee2158 100644
--- a/org/eclipse/swt/events/MouseListener.java
+++ b/org/eclipse/swt/events/MouseListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/MouseMoveListener.java b/org/eclipse/swt/events/MouseMoveListener.java
index d84a99a..cc4e00f 100644
--- a/org/eclipse/swt/events/MouseMoveListener.java
+++ b/org/eclipse/swt/events/MouseMoveListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/MouseTrackListener.java b/org/eclipse/swt/events/MouseTrackListener.java
index 3fe0f05..9b01407 100644
--- a/org/eclipse/swt/events/MouseTrackListener.java
+++ b/org/eclipse/swt/events/MouseTrackListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/PaintListener.java b/org/eclipse/swt/events/PaintListener.java
index 49b7776..7a047c8 100644
--- a/org/eclipse/swt/events/PaintListener.java
+++ b/org/eclipse/swt/events/PaintListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/events/TraverseListener.java b/org/eclipse/swt/events/TraverseListener.java
index 3571d0a..2d1d4b3 100644
--- a/org/eclipse/swt/events/TraverseListener.java
+++ b/org/eclipse/swt/events/TraverseListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/graphics/Device.java b/org/eclipse/swt/graphics/Device.java
index baa1209..fbacfcf 100644
--- a/org/eclipse/swt/graphics/Device.java
+++ b/org/eclipse/swt/graphics/Device.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,15 +92,13 @@ public abstract class Device implements Drawable {
* fix is to remove this feature. Unfortunately,
* too many application programs rely on this
* feature.
- *
- * This code will be removed in the future.
*/
protected static Device CurrentDevice;
protected static Runnable DeviceFinder;
static {
try {
Class.forName ("org.eclipse.swt.widgets.Display");
- } catch (Throwable e) {}
+ } catch (ClassNotFoundException e) {}
}
/*
@@ -792,6 +790,23 @@ protected void release () {
}
gdkColors = null;
colorRefCount = null;
+
+ if (COLOR_BLACK != null) COLOR_BLACK.dispose();
+ if (COLOR_DARK_RED != null) COLOR_DARK_RED.dispose();
+ if (COLOR_DARK_GREEN != null) COLOR_DARK_GREEN.dispose();
+ if (COLOR_DARK_YELLOW != null) COLOR_DARK_YELLOW.dispose();
+ if (COLOR_DARK_BLUE != null) COLOR_DARK_BLUE.dispose();
+ if (COLOR_DARK_MAGENTA != null) COLOR_DARK_MAGENTA.dispose();
+ if (COLOR_DARK_CYAN != null) COLOR_DARK_CYAN.dispose();
+ if (COLOR_GRAY != null) COLOR_GRAY.dispose();
+ if (COLOR_DARK_GRAY != null) COLOR_DARK_GRAY.dispose();
+ if (COLOR_RED != null) COLOR_RED.dispose();
+ if (COLOR_GREEN != null) COLOR_GREEN.dispose();
+ if (COLOR_YELLOW != null) COLOR_YELLOW.dispose();
+ if (COLOR_BLUE != null) COLOR_BLUE.dispose();
+ if (COLOR_MAGENTA != null) COLOR_MAGENTA.dispose();
+ if (COLOR_CYAN != null) COLOR_CYAN.dispose();
+ if (COLOR_WHITE != null) COLOR_WHITE.dispose();
COLOR_BLACK = COLOR_DARK_RED = COLOR_DARK_GREEN = COLOR_DARK_YELLOW = COLOR_DARK_BLUE =
COLOR_DARK_MAGENTA = COLOR_DARK_CYAN = COLOR_GRAY = COLOR_DARK_GRAY = COLOR_RED =
COLOR_GREEN = COLOR_YELLOW = COLOR_BLUE = COLOR_MAGENTA = COLOR_CYAN = COLOR_WHITE = null;
diff --git a/org/eclipse/swt/graphics/DeviceData.java b/org/eclipse/swt/graphics/DeviceData.java
index 7578eab..6fc287f 100644
--- a/org/eclipse/swt/graphics/DeviceData.java
+++ b/org/eclipse/swt/graphics/DeviceData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/graphics/Drawable.java b/org/eclipse/swt/graphics/Drawable.java
index ec64415..2d909d1 100644
--- a/org/eclipse/swt/graphics/Drawable.java
+++ b/org/eclipse/swt/graphics/Drawable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@ package org.eclipse.swt.graphics;
* their associated GC. SWT images, and device objects such as the Display
* device and the Printer device, are drawables.
* <p>
- * <b>IMPORTANT:</b> This class is <em>not</em> part of the SWT
+ * <b>IMPORTANT:</b> This interface is <em>not</em> part of the SWT
* public API. It is marked public only so that it can be shared
* within the packages provided by SWT. It should never be
* referenced from application code.
diff --git a/org/eclipse/swt/graphics/FontData.java b/org/eclipse/swt/graphics/FontData.java
index f4caa13..6d15004 100644
--- a/org/eclipse/swt/graphics/FontData.java
+++ b/org/eclipse/swt/graphics/FontData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -431,7 +431,7 @@ public void setStyle(int style) {
* @see FontData
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer(128);
buffer.append("1|");
buffer.append(getName());
buffer.append("|");
diff --git a/org/eclipse/swt/graphics/GC.java b/org/eclipse/swt/graphics/GC.java
index cc4806a..78c020d 100644
--- a/org/eclipse/swt/graphics/GC.java
+++ b/org/eclipse/swt/graphics/GC.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,14 @@ import org.eclipse.swt.*;
* </p>
*
* <p>
+ * The result of drawing on an image that was created with an indexed
+ * palette using a color that is not in the palette is platform specific.
+ * Some platforms will match to the nearest color while other will draw
+ * the color itself. This happens because the allocated image might use
+ * a direct palette on platforms that do not support indexed palette.
+ * </p>
+ *
+ * <p>
* Application code must explicitly invoke the <code>GC.dispose()</code>
* method to release the operating system resources managed by each instance
* when those instances are no longer required. This is <em>particularly</em>
@@ -1624,20 +1632,23 @@ public void drawText (String string, int x, int y, int flags) {
}
setString(string, flags);
if (cairo != 0) {
+ checkGC(FONT);
if ((flags & SWT.DRAW_TRANSPARENT) == 0) {
checkGC(BACKGROUND);
- int[] width = new int[1], height = new int[1];
- OS.pango_layout_get_size(data.layout, width, height);
- Cairo.cairo_rectangle(cairo, x, y, OS.PANGO_PIXELS(width[0]), OS.PANGO_PIXELS(height[0]));
+ if (data.stringWidth == -1) {
+ computeStringSize();
+ }
+ Cairo.cairo_rectangle(cairo, x, y, data.stringWidth, data.stringHeight);
Cairo.cairo_fill(cairo);
}
- checkGC(FOREGROUND | FONT);
+ checkGC(FOREGROUND);
if ((data.style & SWT.MIRRORED) != 0) {
Cairo.cairo_save(cairo);
- int[] width = new int[1], height = new int[1];
- OS.pango_layout_get_size(data.layout, width, height);
+ if (data.stringWidth == -1) {
+ computeStringSize();
+ }
Cairo.cairo_scale(cairo, -1f, 1);
- Cairo.cairo_translate(cairo, -2 * x - OS.PANGO_PIXELS(width[0]), 0);
+ Cairo.cairo_translate(cairo, -2 * x - data.stringWidth, 0);
}
Cairo.cairo_move_to(cairo, x, y);
OS.pango_cairo_show_layout(cairo, data.layout);
@@ -1654,21 +1665,20 @@ public void drawText (String string, int x, int y, int flags) {
OS.gdk_draw_layout_with_colors(data.drawable, handle, x, y, data.layout, null, background);
} else {
int /*long*/ layout = data.layout;
- int[] w = new int[1], h = new int[1];
- OS.pango_layout_get_size(layout, w, h);
- int width = OS.PANGO_PIXELS(w[0]);
- int height = OS.PANGO_PIXELS(h[0]);
- int /*long*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), width, height, -1);
+ if (data.stringWidth == -1) {
+ computeStringSize();
+ }
+ int /*long*/ pixmap = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), data.stringWidth, data.stringHeight, -1);
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
int /*long*/ gdkGC = OS.gdk_gc_new(pixmap);
if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES);
GdkColor black = new GdkColor();
OS.gdk_gc_set_foreground(gdkGC, black);
- OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, width, height);
+ OS.gdk_draw_rectangle(pixmap, gdkGC, 1, 0, 0, data.stringWidth, data.stringHeight);
OS.gdk_gc_set_foreground(gdkGC, data.foreground);
OS.gdk_draw_layout_with_colors(pixmap, gdkGC, 0, 0, layout, null, background);
OS.g_object_unref(gdkGC);
- OS.gdk_draw_drawable(data.drawable, handle, pixmap, 0, 0, x, y, width, height);
+ OS.gdk_draw_drawable(data.drawable, handle, pixmap, 0, 0, x, y, data.stringWidth, data.stringHeight);
OS.g_object_unref(pixmap);
}
}
@@ -2499,6 +2509,7 @@ public Pattern getForegroundPattern() {
* @see GCData
*
* @since 3.2
+ * @noreference This method is not intended to be referenced by clients.
*/
public GCData getGCData() {
if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
@@ -2839,7 +2850,14 @@ void initCairo() {
data.disposeCairo = true;
Cairo.cairo_set_fill_rule(cairo, Cairo.CAIRO_FILL_RULE_EVEN_ODD);
data.state &= ~(BACKGROUND | FOREGROUND | FONT | LINE_WIDTH | LINE_CAP | LINE_JOIN | LINE_STYLE | DRAW_OFFSET);
- setCairoClip(cairo, data.clipRgn);
+ setCairoClip(data.damageRgn, data.clipRgn);
+}
+
+void computeStringSize() {
+ int[] width = new int[1], height = new int[1];
+ OS.pango_layout_get_size(data.layout, width, height);
+ data.stringHeight = OS.PANGO_PIXELS(height[0]);
+ data.stringWidth = OS.PANGO_PIXELS(width[0]);
}
/**
@@ -2948,6 +2966,7 @@ public void setAdvanced(boolean advanced) {
if (cairo != 0) Cairo.cairo_destroy(cairo);
data.cairo = 0;
data.interpolation = SWT.DEFAULT;
+ data.alpha = 0xFF;
data.backgroundPattern = data.foregroundPattern = null;
data.state = 0;
setClipping(0);
@@ -3107,15 +3126,13 @@ static void setCairoFont(int /*long*/ cairo, int /*long*/ font) {
Cairo.cairo_set_font_size(cairo, height);
}
-static void setCairoClip(int /*long*/ cairo, int /*long*/ clipRgn) {
- Cairo.cairo_reset_clip(cairo);
- if (clipRgn == 0) return;
+static void setCairoRegion(int /*long*/ cairo, int /*long*/ rgn) {
if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
- OS.gdk_cairo_region(cairo, clipRgn);
+ OS.gdk_cairo_region(cairo, rgn);
} else {
int[] nRects = new int[1];
int /*long*/[] rects = new int /*long*/[1];
- OS.gdk_region_get_rectangles(clipRgn, rects, nRects);
+ OS.gdk_region_get_rectangles(rgn, rects, nRects);
GdkRectangle rect = new GdkRectangle();
for (int i=0; i<nRects[0]; i++) {
OS.memmove(rect, rects[0] + (i * GdkRectangle.sizeof), GdkRectangle.sizeof);
@@ -3123,7 +3140,6 @@ static void setCairoClip(int /*long*/ cairo, int /*long*/ clipRgn) {
}
if (rects[0] != 0) OS.g_free(rects[0]);
}
- Cairo.cairo_clip(cairo);
}
static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int alpha) {
@@ -3135,6 +3151,25 @@ static void setCairoPatternColor(int /*long*/ pattern, int offset, Color c, int
Cairo.cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, aa);
}
+void setCairoClip(int /*long*/ damageRgn, int /*long*/ clipRgn) {
+ int /*long*/ cairo = data.cairo;
+ Cairo.cairo_reset_clip(cairo);
+ if (damageRgn != 0) {
+ double[] matrix = new double[6];
+ Cairo.cairo_get_matrix(cairo, matrix);
+ double[] identity = new double[6];
+ Cairo.cairo_matrix_init_identity(identity);
+ Cairo.cairo_set_matrix(cairo, identity);
+ setCairoRegion(cairo, damageRgn);
+ Cairo.cairo_clip(cairo);
+ Cairo.cairo_set_matrix(cairo, matrix);
+ }
+ if (clipRgn != 0) {
+ setCairoRegion(cairo, clipRgn);
+ Cairo.cairo_clip(cairo);
+ }
+}
+
void setClipping(int /*long*/ clipRgn) {
int /*long*/ cairo = data.cairo;
if (clipRgn == 0) {
@@ -3144,7 +3179,7 @@ void setClipping(int /*long*/ clipRgn) {
}
if (cairo != 0) {
data.clippingTransform = null;
- setCairoClip(cairo, clipRgn);
+ setCairoClip(data.damageRgn, 0);
} else {
int /*long*/ clipping = data.damageRgn != 0 ? data.damageRgn : 0;
OS.gdk_gc_set_clip_region(handle, clipping);
@@ -3156,7 +3191,7 @@ void setClipping(int /*long*/ clipRgn) {
if (cairo != 0) {
if (data.clippingTransform == null) data.clippingTransform = new double[6];
Cairo.cairo_get_matrix(cairo, data.clippingTransform);
- setCairoClip(cairo, clipRgn);
+ setCairoClip(data.damageRgn, clipRgn);
} else {
int /*long*/ clipping = clipRgn;
if (data.damageRgn != 0) {
@@ -3981,10 +4016,10 @@ public Point textExtent(String string, int flags) {
}
setString(string, flags);
checkGC(FONT);
- if (data.stringWidth != -1) return new Point(data.stringWidth, data.stringHeight);
- int[] width = new int[1], height = new int[1];
- OS.pango_layout_get_size(data.layout, width, height);
- return new Point(data.stringWidth = OS.PANGO_PIXELS(width[0]), data.stringHeight = OS.PANGO_PIXELS(height[0]));
+ if (data.stringWidth == -1) {
+ computeStringSize();
+ }
+ return new Point(data.stringWidth, data.stringHeight);
}
/**
diff --git a/org/eclipse/swt/graphics/GCData.java b/org/eclipse/swt/graphics/GCData.java
index ea52ea5..d507acb 100644
--- a/org/eclipse/swt/graphics/GCData.java
+++ b/org/eclipse/swt/graphics/GCData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import org.eclipse.swt.*;
* platforms, and should never be called from application code.
* </p>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noinstantiate This class is not intended to be instantiated by clients.
*/
public final class GCData {
public Device device;
diff --git a/org/eclipse/swt/graphics/Image.java b/org/eclipse/swt/graphics/Image.java
index 76f833e..1754574 100644
--- a/org/eclipse/swt/graphics/Image.java
+++ b/org/eclipse/swt/graphics/Image.java
@@ -528,6 +528,12 @@ public Image(Device device, InputStream stream) {
public Image(Device device, String filename) {
super(device);
if (filename == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
+ initNative(filename);
+ if (this.pixmap == 0) init(new ImageData(filename));
+ init();
+}
+
+void initNative(String filename) {
try {
int length = filename.length ();
char [] chars = new char [length];
@@ -566,11 +572,8 @@ public Image(Device device, String filename) {
this.pixmap = pixmap_return[0];
if (pixmap == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.g_object_unref (pixbuf);
- return;
}
} catch (SWTException e) {}
- init(new ImageData(filename));
- init();
}
void createAlphaMask (int width, int height) {
@@ -849,8 +852,7 @@ public ImageData getImageData() {
OS.g_object_unref(pixbuf);
PaletteData palette = new PaletteData(0xFF0000, 0xFF00, 0xFF);
- ImageData data = new ImageData(width, height, 24, palette);
- data.data = srcData;
+ ImageData data = new ImageData(width, height, 24, palette, 4, srcData);
data.bytesPerLine = stride;
if (transparentPixel == -1 && type == SWT.ICON && mask != 0) {
diff --git a/org/eclipse/swt/graphics/ImageData.java b/org/eclipse/swt/graphics/ImageData.java
index 0158f49..24c7f64 100644
--- a/org/eclipse/swt/graphics/ImageData.java
+++ b/org/eclipse/swt/graphics/ImageData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -247,7 +247,7 @@ public final class ImageData implements CloneableCompatibility {
* @param palette the palette of the image (must not be null)
*
* @exception IllegalArgumentException <ul>
- * <li>ERROR_INVALID_ARGUMENT - if the width or height is negative, or if the depth is not
+ * <li>ERROR_INVALID_ARGUMENT - if the width or height is zero or negative, or if the depth is not
* one of 1, 2, 4, 8, 16, 24 or 32</li>
* <li>ERROR_NULL_ARGUMENT - if the palette is null</li>
* </ul>
@@ -271,7 +271,7 @@ public ImageData(int width, int height, int depth, PaletteData palette) {
* @param data the data of the image
*
* @exception IllegalArgumentException <ul>
- * <li>ERROR_INVALID_ARGUMENT - if the width or height is negative, or if the depth is not
+ * <li>ERROR_INVALID_ARGUMENT - if the width or height is zero or negative, or if the depth is not
* one of 1, 2, 4, 8, 16, 24 or 32, or the data array is too small to contain the image data</li>
* <li>ERROR_NULL_ARGUMENT - if the palette or data is null</li>
* <li>ERROR_CANNOT_BE_ZERO - if the scanlinePad is zero</li>
@@ -1919,6 +1919,37 @@ static void blit(int op,
}
return;
}
+ /*Fast 32 to 32 blit */
+ if (alphaMode == 0x10000 && stype == TYPE_GENERIC_32_MSB && dtype == TYPE_GENERIC_32_MSB) {
+ if (srcRedMask == 0xFF00 && srcGreenMask == 0xff0000 && srcBlueMask == 0xff000000 && destRedMask == 0xFF0000 && destGreenMask == 0xff00 && destBlueMask == 0xff) {
+ for (int dy = destHeight, sfy = sfyi; dy > 0; --dy, sp = spr += (sfy >>> 16) * srcStride, sfy = (sfy & 0xffff) + sfyi, dp = dpr += dpryi) {
+ for (int dx = destWidth, sfx = sfxi; dx > 0; --dx, dp += dprxi, sfx = (sfx & 0xffff) + sfxi) {
+ destData[dp] = srcData[sp + 3];
+ destData[dp + 1] = srcData[sp + 2];
+ destData[dp + 2] = srcData[sp + 1];
+ destData[dp + 3] = srcData[sp];
+ sp += (sfx >>> 16) * 4;
+ }
+ }
+ return;
+ }
+ }
+ /*Fast 24 to 32 blit */
+ if (alphaMode == 0x10000 && stype == TYPE_GENERIC_24 && dtype == TYPE_GENERIC_32_MSB) {
+ if (srcRedMask == 0xFF && srcGreenMask == 0xff00 && srcBlueMask == 0xff0000 && destRedMask == 0xFF0000 && destGreenMask == 0xff00 && destBlueMask == 0xff) {
+ for (int dy = destHeight, sfy = sfyi; dy > 0; --dy, sp = spr += (sfy >>> 16) * srcStride, sfy = (sfy & 0xffff) + sfyi, dp = dpr += dpryi) {
+ for (int dx = destWidth, sfx = sfxi; dx > 0; --dx, dp += dprxi, sfx = (sfx & 0xffff) + sfxi) {
+ destData[dp] = 0;
+ destData[dp + 1] = srcData[sp + 2];
+ destData[dp + 2] = srcData[sp + 1];
+ destData[dp + 3] = srcData[sp];
+ sp += (sfx >>> 16) * 3;
+ }
+ }
+ return;
+ }
+ }
+
/*** Comprehensive blit (apply transformations) ***/
final int srcRedShift = getChannelShift(srcRedMask);
final byte[] srcReds = ANY_TO_EIGHT[getChannelWidth(srcRedMask, srcRedShift)];
@@ -2729,6 +2760,32 @@ static void blit(int op,
boolean flipX, boolean flipY) {
if ((destWidth <= 0) || (destHeight <= 0) || (alphaMode == ALPHA_TRANSPARENT)) return;
+ /*** Fast blit (straight copy) ***/
+ if (srcX == 0 && srcY == 0 && destX == 0 && destY == 0 && destWidth == srcWidth && destHeight == srcHeight) {
+ if (destDepth == 24 && srcDepth == 8 && (op & BLIT_ALPHA) == 0 && destRedMask == 0xFF0000 && destGreenMask == 0xFF00 && destBlueMask == 0xFF) {
+ for (int y = 0, sp = 0, dp = 0, spad = srcStride - srcWidth, dpad = destStride - (destWidth * 3); y < destHeight; y++, sp += spad, dp += dpad) {
+ for (int x = 0; x < destWidth; x++) {
+ int index = srcData[sp++] & 0xff;
+ destData[dp++] = srcReds[index];
+ destData[dp++] = srcGreens[index];
+ destData[dp++] = srcBlues[index];
+ }
+ }
+ return;
+ }
+ if (destDepth == 32 && destOrder == MSB_FIRST && srcDepth == 8 && (op & BLIT_ALPHA) == 0 && destRedMask == 0xFF0000 && destGreenMask == 0xFF00 && destBlueMask == 0xFF) {
+ for (int y = 0, sp = 0, dp = 0, spad = srcStride - srcWidth, dpad = destStride - (destWidth * 4); y < destHeight; y++, sp += spad, dp += dpad) {
+ for (int x = 0; x < destWidth; x++) {
+ int index = srcData[sp++] & 0xff;
+ dp++;
+ destData[dp++] = srcReds[index];
+ destData[dp++] = srcGreens[index];
+ destData[dp++] = srcBlues[index];
+ }
+ }
+ return;
+ }
+ }
// these should be supplied as params later
final int destAlphaMask = 0;
diff --git a/org/eclipse/swt/graphics/ImageLoaderListener.java b/org/eclipse/swt/graphics/ImageLoaderListener.java
index 8749771..631779f 100644
--- a/org/eclipse/swt/graphics/ImageLoaderListener.java
+++ b/org/eclipse/swt/graphics/ImageLoaderListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/graphics/Rectangle.java b/org/eclipse/swt/graphics/Rectangle.java
index 9004086..c09e15f 100644
--- a/org/eclipse/swt/graphics/Rectangle.java
+++ b/org/eclipse/swt/graphics/Rectangle.java
@@ -120,7 +120,7 @@ public void add (Rectangle rect) {
* @return <code>true</code> if the rectangle contains the point and <code>false</code> otherwise
*/
public boolean contains (int x, int y) {
- return (x >= this.x) && (y >= this.y) && ((x - this.x) < width) && ((y - this.y) < height);
+ return (x >= this.x) && (y >= this.y) && x < (this.x + width) && y < (this.y + height);
}
/**
diff --git a/org/eclipse/swt/graphics/TextLayout.java b/org/eclipse/swt/graphics/TextLayout.java
index eb5cfdf..d72c2ba 100644
--- a/org/eclipse/swt/graphics/TextLayout.java
+++ b/org/eclipse/swt/graphics/TextLayout.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -200,6 +200,20 @@ void computeRuns () {
underlineStyle = OS.PANGO_UNDERLINE_ERROR;
}
break;
+ case SWT.UNDERLINE_LINK: {
+ if (style.foreground == null) {
+ int /*long*/ attr = OS.pango_attr_foreground_new((short)0, (short)0x3333, (short)0x9999);
+ OS.memmove (attribute, attr, PangoAttribute.sizeof);
+ attribute.start_index = byteStart;
+ attribute.end_index = byteEnd;
+ OS.memmove (attr, attribute, PangoAttribute.sizeof);
+ OS.pango_attr_list_insert(attrList, attr);
+ }
+ if (style.underlineColor == null) {
+ underlineStyle = OS.PANGO_UNDERLINE_SINGLE;
+ }
+ break;
+ }
}
if (underlineStyle != OS.PANGO_UNDERLINE_NONE && style.underlineColor == null) {
int /*long*/ attr = OS.pango_attr_underline_new(underlineStyle);
@@ -722,6 +736,7 @@ void drawBorder(GC gc, int x, int y, GdkColor selectionColor) {
OS.gdk_draw_rectangle(data.drawable, gdkGC, 1, rect.x, underlineY + underlineThickness * 2, rect.width, underlineThickness);
}
//FALLTHROUGH
+ case SWT.UNDERLINE_LINK:
case SWT.UNDERLINE_SINGLE:
if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) {
Cairo.cairo_rectangle(cairo, rect.x, underlineY, rect.width, underlineThickness);
@@ -887,6 +902,7 @@ public Rectangle getBounds() {
if (ascent != -1 && descent != -1) {
height = Math.max (height, ascent + descent);
}
+ height += OS.PANGO_PIXELS(OS.pango_layout_get_spacing(layout));
return new Rectangle(0, 0, width, height);
}
@@ -2040,7 +2056,12 @@ public void setTabs(int[] tabs) {
/**
* Sets the receiver's text.
- *
+ *<p>
+ * Note: Setting the text also clears all the styles. This method
+ * returns without doing anything if the new text is the same as
+ * the current text.
+ * </p>
+ *
* @param text the new text
*
* @exception IllegalArgumentException <ul>
diff --git a/org/eclipse/swt/graphics/TextStyle.java b/org/eclipse/swt/graphics/TextStyle.java
index 2f30c83..6b7b1cd 100644
--- a/org/eclipse/swt/graphics/TextStyle.java
+++ b/org/eclipse/swt/graphics/TextStyle.java
@@ -81,6 +81,7 @@ public class TextStyle {
* @see SWT#UNDERLINE_DOUBLE
* @see SWT#UNDERLINE_ERROR
* @see SWT#UNDERLINE_SQUIGGLE
+ * @see SWT#UNDERLINE_LINK
*
* @since 3.4
*/
@@ -137,6 +138,17 @@ public class TextStyle {
* @since 3.2
*/
public int rise;
+
+
+ /**
+ * the data. An user data field. It can be used to hold the HREF when the range
+ * is used as a link or the embed object when the range is used with <code>GlyphMetrics</code>.
+ * <p>
+ *
+ * @since 3.5
+ */
+ public Object data;
+
/**
* Create an empty text style.
@@ -185,6 +197,7 @@ public TextStyle (TextStyle style) {
borderColor = style.borderColor;
metrics = style.metrics;
rise = style.rise;
+ data = style.data;
}
/**
@@ -227,6 +240,9 @@ public boolean equals(Object object) {
if (borderColor != null) {
if (!borderColor.equals(style.borderColor)) return false;
} else if (style.borderColor != null) return false;
+ if (data != null) {
+ if (!data.equals(style.data)) return false;
+ } else if (style.data != null) return false;
return true;
}
@@ -262,7 +278,12 @@ boolean isAdherentBorder(TextStyle style) {
if (borderStyle != style.borderStyle) return false;
if (borderColor != null) {
if (!borderColor.equals(style.borderColor)) return false;
- } else if (style.borderColor != null) return false;
+ } else {
+ if (style.borderColor != null) return false;
+ if (foreground != null) {
+ if (!foreground.equals(style.foreground)) return false;
+ } else if (style.foreground != null) return false;
+ }
return true;
}
@@ -273,7 +294,12 @@ boolean isAdherentUnderline(TextStyle style) {
if (underlineStyle != style.underlineStyle) return false;
if (underlineColor != null) {
if (!underlineColor.equals(style.underlineColor)) return false;
- } else if (style.underlineColor != null) return false;
+ } else {
+ if (style.underlineColor != null) return false;
+ if (foreground != null) {
+ if (!foreground.equals(style.foreground)) return false;
+ } else if (style.foreground != null) return false;
+ }
return true;
}
@@ -283,7 +309,12 @@ boolean isAdherentStrikeout(TextStyle style) {
if (strikeout != style.strikeout) return false;
if (strikeoutColor != null) {
if (!strikeoutColor.equals(style.strikeoutColor)) return false;
- } else if (style.strikeoutColor != null) return false;
+ } else {
+ if (style.strikeoutColor != null) return false;
+ if (foreground != null) {
+ if (!foreground.equals(style.foreground)) return false;
+ } else if (style.foreground != null) return false;
+ }
return true;
}
@@ -294,42 +325,70 @@ boolean isAdherentStrikeout(TextStyle style) {
* @return a string representation of the <code>TextStyle</code>
*/
public String toString () {
- StringBuffer buffer = new StringBuffer("TextStyle {");
+ StringBuffer buffer = new StringBuffer("TextStyle {"); //$NON-NLS-1$
int startLength = buffer.length();
if (font != null) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("font=");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("font="); //$NON-NLS-1$
buffer.append(font);
}
if (foreground != null) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("foreground=");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("foreground="); //$NON-NLS-1$
buffer.append(foreground);
}
if (background != null) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("background=");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("background="); //$NON-NLS-1$
buffer.append(background);
}
if (underline) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("underlined");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("underline="); //$NON-NLS-1$
+ switch (underlineStyle) {
+ case SWT.UNDERLINE_SINGLE: buffer.append("single"); break; //$NON-NLS-1$
+ case SWT.UNDERLINE_DOUBLE: buffer.append("double"); break; //$NON-NLS-1$
+ case SWT.UNDERLINE_SQUIGGLE: buffer.append("squiggle"); break; //$NON-NLS-1$
+ case SWT.UNDERLINE_ERROR: buffer.append("error"); break; //$NON-NLS-1$
+ case SWT.UNDERLINE_LINK: buffer.append("link"); break; //$NON-NLS-1$
+ }
+ if (underlineColor != null) {
+ buffer.append(", underlineColor="); //$NON-NLS-1$
+ buffer.append(underlineColor);
+ }
}
if (strikeout) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("striked out");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("striked out"); //$NON-NLS-1$
+ if (strikeoutColor != null) {
+ buffer.append(", strikeoutColor="); //$NON-NLS-1$
+ buffer.append(strikeoutColor);
+ }
+ }
+ if (borderStyle != SWT.NONE) {
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("border="); //$NON-NLS-1$
+ switch (borderStyle) {
+ case SWT.BORDER_SOLID: buffer.append("solid"); break; //$NON-NLS-1$
+ case SWT.BORDER_DOT: buffer.append("dot"); break; //$NON-NLS-1$
+ case SWT.BORDER_DASH: buffer.append("dash"); break; //$NON-NLS-1$
+ }
+ if (borderColor != null) {
+ buffer.append(", borderColor="); //$NON-NLS-1$
+ buffer.append(borderColor);
+ }
}
if (rise != 0) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("rise=");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("rise="); //$NON-NLS-1$
buffer.append(rise);
}
if (metrics != null) {
- if (buffer.length() > startLength) buffer.append(", ");
- buffer.append("metrics=");
+ if (buffer.length() > startLength) buffer.append(", "); //$NON-NLS-1$
+ buffer.append("metrics="); //$NON-NLS-1$
buffer.append(metrics);
}
- buffer.append("}");
+ buffer.append("}"); //$NON-NLS-1$
return buffer.toString();
}
diff --git a/org/eclipse/swt/internal/C.java b/org/eclipse/swt/internal/C.java
index 68baea6..886cb6e 100644
--- a/org/eclipse/swt/internal/C.java
+++ b/org/eclipse/swt/internal/C.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,27 +23,119 @@ public class C extends Platform {
public static final int PTR_SIZEOF = PTR_sizeof ();
+/** @param ptr cast=(void *) */
public static final native void free (int /*long*/ ptr);
-public static final native int /*long*/ getenv (byte[] wcsToMbcs);
+/** @param env cast=(const char *) */
+public static final native int /*long*/ getenv (byte[] env);
public static final native int /*long*/ malloc (int /*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 (int /*long*/ dest, byte[] src, int /*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 (int /*long*/ dest, char[] src, int /*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 (int /*long*/ dest, double[] src, int /*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 (int /*long*/ dest, float[] src, int /*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 (int /*long*/ dest, int[] src, int /*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 (int /*long*/ dest, long[] src, int /*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 (int /*long*/ dest, short[] src, int /*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, int /*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, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove (int /*long*/ dest, int /*long*/ src, int /*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, int /*long*/ src, int /*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, int /*long*/ src, int /*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, int /*long*/ src, int /*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, int /*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, int /*long*/ src, int /*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, int /*long*/ src, int /*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, int /*long*/ src, int /*long*/ size);
+/**
+ * @param buffer cast=(void *),flags=critical
+ * @param num cast=(size_t)
+ */
public static final native int /*long*/ memset (int /*long*/ buffer, int c, int /*long*/ num);
public static final native int PTR_sizeof ();
+/** @param s cast=(char *) */
public static final native int strlen (int /*long*/ s);
}
diff --git a/org/eclipse/swt/internal/CloneableCompatibility.java b/org/eclipse/swt/internal/CloneableCompatibility.java
index 78e9391..66ab82a 100644
--- a/org/eclipse/swt/internal/CloneableCompatibility.java
+++ b/org/eclipse/swt/internal/CloneableCompatibility.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/Converter.java b/org/eclipse/swt/internal/Converter.java
index 648e808..779baed 100644
--- a/org/eclipse/swt/internal/Converter.java
+++ b/org/eclipse/swt/internal/Converter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/LONG.java b/org/eclipse/swt/internal/LONG.java
index 5adeda9..8609adc 100644
--- a/org/eclipse/swt/internal/LONG.java
+++ b/org/eclipse/swt/internal/LONG.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.swt.internal;
+/** @jniclass flags=no_gen */
public class LONG {
public int /*long*/ value;
diff --git a/org/eclipse/swt/internal/Library.java b/org/eclipse/swt/internal/Library.java
index 4272ee4..1f9a8c5 100644
--- a/org/eclipse/swt/internal/Library.java
+++ b/org/eclipse/swt/internal/Library.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@ public class Library {
/**
* SWT Minor version number (must be in the range 0..999)
*/
- static int MINOR_VERSION = 452;
+ static int MINOR_VERSION = 555;
/**
* SWT revision number (must be >= 0)
@@ -37,6 +37,12 @@ public class Library {
public static final int JAVA_VERSION, SWT_VERSION;
static final String SEPARATOR;
+
+ /* 64-bit support */
+ static /*final*/ boolean IS_64 = 0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL;
+ static final String SUFFIX_64 = "-64"; //$NON-NLS-1$
+ static final String SWTDIR_32 = "swtlib-32"; //$NON-NLS-1$
+ static final String SWTDIR_64 = "swtlib-64"; //$NON-NLS-1$
static {
SEPARATOR = System.getProperty("file.separator");
@@ -92,10 +98,12 @@ static boolean extract (String fileName, String mappedName) {
FileOutputStream os = null;
InputStream is = null;
File file = new File(fileName);
+ boolean extracted = false;
try {
if (!file.exists ()) {
is = Library.class.getResourceAsStream ("/" + mappedName); //$NON-NLS-1$
if (is != null) {
+ extracted = true;
int read;
byte [] buffer = new byte [4096];
os = new FileOutputStream (fileName);
@@ -109,9 +117,9 @@ static boolean extract (String fileName, String mappedName) {
Runtime.getRuntime ().exec (new String []{"chmod", "755", fileName}).waitFor(); //$NON-NLS-1$ //$NON-NLS-2$
} catch (Throwable e) {}
}
- if (load (fileName)) return true;
}
}
+ if (load (fileName)) return true;
} catch (Throwable e) {
try {
if (os != null) os.close ();
@@ -119,8 +127,8 @@ static boolean extract (String fileName, String mappedName) {
try {
if (is != null) is.close ();
} catch (IOException e1) {}
+ if (extracted && file.exists ()) file.delete ();
}
- if (file.exists ()) file.delete ();
return false;
}
@@ -167,15 +175,11 @@ public static void loadLibrary (String name, boolean mapName) {
String prop = System.getProperty ("sun.arch.data.model"); //$NON-NLS-1$
if (prop == null) prop = System.getProperty ("com.ibm.vm.bitmode"); //$NON-NLS-1$
if (prop != null) {
- if ("32".equals (prop)) { //$NON-NLS-1$
- if (0x1FFFFFFFFL == (int /*long*/)0x1FFFFFFFFL) {
- throw new UnsatisfiedLinkError ("Cannot load 64-bit SWT libraries on 32-bit JVM"); //$NON-NLS-1$
- }
+ if ("32".equals (prop) && IS_64) { //$NON-NLS-1$
+ throw new UnsatisfiedLinkError ("Cannot load 64-bit SWT libraries on 32-bit JVM"); //$NON-NLS-1$
}
- if ("64".equals (prop)) { //$NON-NLS-1$
- if (0x1FFFFFFFFL != (int /*long*/)0x1FFFFFFFFL) {
- throw new UnsatisfiedLinkError ("Cannot load 32-bit SWT libraries on 64-bit JVM"); //$NON-NLS-1$
- }
+ if ("64".equals (prop) && !IS_64) { //$NON-NLS-1$
+ throw new UnsatisfiedLinkError ("Cannot load 32-bit SWT libraries on 64-bit JVM"); //$NON-NLS-1$
}
}
@@ -197,8 +201,8 @@ public static void loadLibrary (String name, boolean mapName) {
}
libName1 = name + "-" + Platform.PLATFORM + "-" + version; //$NON-NLS-1$ //$NON-NLS-2$
libName2 = name + "-" + Platform.PLATFORM; //$NON-NLS-1$
- mappedName1 = System.mapLibraryName (libName1);
- mappedName2 = System.mapLibraryName (libName2);
+ mappedName1 = mapLibraryName (libName1);
+ mappedName2 = mapLibraryName (libName2);
} else {
libName1 = libName2 = mappedName1 = mappedName2 = name;
}
@@ -214,23 +218,50 @@ public static void loadLibrary (String name, boolean mapName) {
/* Try loading library from java library path */
if (load (libName1)) return;
if (mapName && load (libName2)) return;
-
+
/* Try loading library from the tmp directory if swt library path is not specified */
+ String fileName1 = mappedName1;
+ String fileName2 = mappedName2;
if (path == null) {
path = System.getProperty ("java.io.tmpdir"); //$NON-NLS-1$
- path = new File (path).getAbsolutePath ();
- if (load (path + SEPARATOR + mappedName1)) return;
- if (mapName && load (path + SEPARATOR + mappedName2)) return;
+ File dir = new File (path, IS_64 ? SWTDIR_64 : SWTDIR_32);
+ boolean make = false;
+ if ((dir.exists () && dir.isDirectory ()) || (make = dir.mkdir ())) {
+ path = dir.getAbsolutePath ();
+ if (make && !Platform.PLATFORM.equals ("win32")) { //$NON-NLS-1$
+ try {
+ Runtime.getRuntime ().exec (new String []{"chmod", "777", path}).waitFor(); //$NON-NLS-1$ //$NON-NLS-2$
+ } catch (Throwable e) {}
+ }
+ } else {
+ /* fall back to using the tmp directory */
+ if (IS_64) {
+ fileName1 = mapLibraryName (libName1 + SUFFIX_64);
+ fileName2 = mapLibraryName (libName2 + SUFFIX_64);
+ }
+ }
+ if (load (path + SEPARATOR + fileName1)) return;
+ if (mapName && load (path + SEPARATOR + fileName2)) return;
}
/* Try extracting and loading library from jar */
if (path != null) {
- if (extract (path + SEPARATOR + mappedName1, mappedName1)) return;
- if (mapName && extract (path + SEPARATOR + mappedName2, mappedName2)) return;
+ if (extract (path + SEPARATOR + fileName1, mappedName1)) return;
+ if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) return;
}
/* Failed to find the library */
throw new UnsatisfiedLinkError ("no " + libName1 + " or " + libName2 + " in swt.library.path, java.library.path or the jar file"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
+static String mapLibraryName (String libName) {
+ /* SWT libraries in the Macintosh use the extension .jnilib but the some VMs map to .dylib. */
+ libName = System.mapLibraryName (libName);
+ String ext = ".dylib"; //$NON-NLS-1$
+ if (libName.endsWith(ext)) {
+ libName = libName.substring(0, libName.length() - ext.length()) + ".jnilib"; //$NON-NLS-1$
+ }
+ return libName;
+}
+
}
diff --git a/org/eclipse/swt/internal/Lock.java b/org/eclipse/swt/internal/Lock.java
index 0937877..7254f52 100644
--- a/org/eclipse/swt/internal/Lock.java
+++ b/org/eclipse/swt/internal/Lock.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@
package org.eclipse.swt.internal;
/**
- * Instance of this represent a recursive monitor.
+ * Instances of this represent a recursive monitor.
*/
public class Lock {
int count, waitCount;
diff --git a/org/eclipse/swt/internal/SWTEventListener.java b/org/eclipse/swt/internal/SWTEventListener.java
index f7036a3..b242904 100644
--- a/org/eclipse/swt/internal/SWTEventListener.java
+++ b/org/eclipse/swt/internal/SWTEventListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/SWTEventObject.java b/org/eclipse/swt/internal/SWTEventObject.java
index 92ba54f..2296a36 100644
--- a/org/eclipse/swt/internal/SWTEventObject.java
+++ b/org/eclipse/swt/internal/SWTEventObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/SWTMessages.properties b/org/eclipse/swt/internal/SWTMessages.properties
old mode 100755
new mode 100644
index 6f5b8da..1aef256
--- a/org/eclipse/swt/internal/SWTMessages.properties
+++ b/org/eclipse/swt/internal/SWTMessages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2008 IBM Corporation and others.
+# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -33,7 +33,6 @@ SWT_NewFont=New Font
SWT_Remove=Remove
SWT_Up=Up
SWT_Down=Down
-SWT_Selection=Selection
SWT_Charset_Western=western
SWT_Charset_EastEuropean=eastern
SWT_Charset_SouthEuropean=southern
@@ -73,3 +72,10 @@ SWT_Download_Started=Downloading...
SWT_Download_Status=Download: {0,number,integer} KB of {1,number,integer} KB
SWT_Authentication_Required=Authentication Required
SWT_Enter_Username_and_Password=Enter user name and password for {0} at {1}
+SWT_Page_Load_Failed=Page load failed with error: {0}
+SWT_InvalidCert_Title=Invalid Certificate
+SWT_InvalidCert_Message=The security certificate presented by "{0}" has the following problem(s):
+SWT_InvalidCert_InvalidName=Certificate name is invalid or does not match site name. Certificate issued to: "{0}".
+SWT_InvalidCert_NotValid=Certificate is not currently valid. Valid date range: "{0}".
+SWT_InvalidCert_NotTrusted=Certificate is not from a trusted certifying authority. Certificate issuer: "{0}".
+SWT_InvalidCert_Connect=Would you like to connect to this site anyways?
diff --git a/org/eclipse/swt/internal/SerializableCompatibility.java b/org/eclipse/swt/internal/SerializableCompatibility.java
index dd5e66a..dc7dd4c 100644
--- a/org/eclipse/swt/internal/SerializableCompatibility.java
+++ b/org/eclipse/swt/internal/SerializableCompatibility.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/org/eclipse/swt/internal/accessibility/gtk/ATK.java
old mode 100755
new mode 100644
index 4ad24ab..77201aa
--- a/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/ATK.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -144,6 +144,7 @@ public static final int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle) {
lock.unlock();
}
}
+/** @param object cast=(AtkObject *) */
public static final native void _atk_focus_tracker_notify (int /*long*/ object);
public static final void atk_focus_tracker_notify (int /*long*/ object) {
lock.lock();
@@ -162,6 +163,10 @@ public static final int /*long*/ atk_get_default_registry () {
lock.unlock();
}
}
+/**
+ * @param factory cast=(AtkObjectFactory *)
+ * @param obj cast=(GObject *)
+ */
public static final native int /*long*/ _atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj);
public static final int /*long*/ atk_object_factory_create_accessible (int /*long*/ factory, int /*long*/ obj) {
lock.lock();
@@ -171,6 +176,7 @@ public static final int /*long*/ atk_object_factory_create_accessible (int /*lon
lock.unlock();
}
}
+/** @param factory cast=(AtkObjectFactory *) */
public static final native int /*long*/ _atk_object_factory_get_accessible_type (int /*long*/ factory);
public static final int /*long*/ atk_object_factory_get_accessible_type (int /*long*/ factory) {
lock.lock();
@@ -180,6 +186,10 @@ public static final int /*long*/ atk_object_factory_get_accessible_type (int /*l
lock.unlock();
}
}
+/**
+ * @param accessible cast=(AtkObject *)
+ * @param data cast=(gpointer)
+ */
public static final native void _atk_object_initialize (int /*long*/ accessible, int /*long*/ data);
public static final void atk_object_initialize (int /*long*/ accessible, int /*long*/ data) {
lock.lock();
@@ -189,6 +199,7 @@ public static final void atk_object_initialize (int /*long*/ accessible, int /*l
lock.unlock();
}
}
+/** @param accessible cast=(AtkObject *) */
public static final native int /*long*/ _atk_object_ref_relation_set (int /*long*/ accessible);
public static final int /*long*/ atk_object_ref_relation_set (int /*long*/ accessible) {
lock.lock();
@@ -198,6 +209,10 @@ public static final int /*long*/ atk_object_ref_relation_set (int /*long*/ acces
lock.unlock();
}
}
+/**
+ * @param registry cast=(AtkRegistry *)
+ * @param type cast=(GType)
+ */
public static final native int /*long*/ _atk_registry_get_factory (int /*long*/ registry, int /*long*/ type);
public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry, int /*long*/ type) {
lock.lock();
@@ -207,6 +222,11 @@ public static final int /*long*/ atk_registry_get_factory (int /*long*/ registry
lock.unlock();
}
}
+/**
+ * @param registry cast=(AtkRegistry *)
+ * @param type cast=(GType)
+ * @param factory_type cast=(GType)
+ */
public static final native void _atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type);
public static final void atk_registry_set_factory_type (int /*long*/ registry, int /*long*/ type, int /*long*/ factory_type) {
lock.lock();
@@ -216,6 +236,7 @@ public static final void atk_registry_set_factory_type (int /*long*/ registry, i
lock.unlock();
}
}
+/** @param set cast=(AtkRelationSet *) */
public static final native int _atk_relation_set_get_n_relations (int /*long*/ set);
public static final int atk_relation_set_get_n_relations (int /*long*/ set) {
lock.lock();
@@ -225,6 +246,7 @@ public static final int atk_relation_set_get_n_relations (int /*long*/ set) {
lock.unlock();
}
}
+/** @param set cast=(AtkRelationSet *) */
public static final native int /*long*/ _atk_relation_set_get_relation (int /*long*/ set, int i);
public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set, int i) {
lock.lock();
@@ -234,6 +256,10 @@ public static final int /*long*/ atk_relation_set_get_relation (int /*long*/ set
lock.unlock();
}
}
+/**
+ * @param set cast=(AtkRelationSet *)
+ * @param relation cast=(AtkRelation *)
+ */
public static final native void _atk_relation_set_remove (int /*long*/ set, int /*long*/ relation);
public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/ relation) {
lock.lock();
@@ -243,6 +269,10 @@ public static final void atk_relation_set_remove (int /*long*/ set, int /*long*/
lock.unlock();
}
}
+/**
+ * @param set cast=(AtkStateSet *)
+ * @param type cast=(AtkStateType)
+ */
public static final native boolean _atk_state_set_add_state (int /*long*/ set, int type);
public static final boolean atk_state_set_add_state (int /*long*/ set, int type) {
lock.lock();
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
old mode 100755
new mode 100644
index bcd2e4c..94409fc
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkActionIface.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -17,11 +17,17 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkActionIface {
// GTypeInterface parent;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ do_action;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_n_actions;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
public int /*long*/ get_description;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
public int /*long*/ get_name;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
public int /*long*/ get_keybinding;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ set_description;
// AtkFunction pad1;
// AtkFunction pad2;
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
old mode 100755
new mode 100644
index 2b896e7..50fdc76
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkComponentIface.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,17 +16,30 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkComponentIface {
+ /** @field cast=(guint (*)()) */
public int /*long*/ add_focus_handler;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ contains;
+ /** @field cast=(AtkObject *(*)()) */
public int /*long*/ ref_accessible_at_point;
+ /** @field cast=(void (*)()) */
public int /*long*/ get_extents;
+ /** @field cast=(void (*)()) */
public int /*long*/ get_position;
+ /** @field cast=(void (*)()) */
public int /*long*/ get_size;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ grab_focus;
+ /** @field cast=(void (*)()) */
public int /*long*/ remove_focus_handler;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ set_extents;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ set_position;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ set_size;
+ /** @field cast=(AtkLayer (*)()) */
public int /*long*/ get_layer;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_mdi_zorder;
}
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
old mode 100755
new mode 100644
index 06bb085..44e2331
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkHypertextIface.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,7 +16,10 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkHypertextIface {
+ /** @field cast=(AtkHyperlink *(*)()) */
public int /*long*/ get_link;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_n_links;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_link_index;
}
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
old mode 100755
new mode 100644
index 7a5e720..fc61911
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectClass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,27 +16,50 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkObjectClass {
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
public int /*long*/ get_name;
+ /** @field cast=(G_CONST_RETURN gchar *(*)()) */
public int /*long*/ get_description;
+ /** @field cast=(AtkObject *(*)()) */
public int /*long*/ get_parent;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_n_children;
+ /** @field cast=(AtkObject *(*)()) */
public int /*long*/ ref_child;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_index_in_parent;
+ /** @field cast=(AtkRelationSet *(*)()) */
public int /*long*/ ref_relation_set;
+ /** @field cast=(AtkRole (*)()) */
public int /*long*/ get_role;
+ /** @field cast=(AtkLayer (*)()) */
public int /*long*/ get_layer;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_mdi_zorder;
+ /** @field cast=(AtkStateSet *(*)()) */
public int /*long*/ ref_state_set;
+ /** @field cast=(void (*)()) */
public int /*long*/ set_name;
+ /** @field cast=(void (*)()) */
public int /*long*/ set_description;
+ /** @field cast=(void (*)()) */
public int /*long*/ set_parent;
+ /** @field cast=(void (*)()) */
public int /*long*/ set_role;
+ /** @field cast=(guint (*)()) */
public int /*long*/ connect_property_change_handler;
+ /** @field cast=(void (*)()) */
public int /*long*/ remove_property_change_handler;
+ /** @field cast=(void (*)()) */
public int /*long*/ initialize;
+ /** @field cast=(void (*)()) */
public int /*long*/ children_changed;
+ /** @field cast=(void (*)()) */
public int /*long*/ focus_event;
+ /** @field cast=(void (*)()) */
public int /*long*/ property_change;
+ /** @field cast=(void (*)()) */
public int /*long*/ state_change;
+ /** @field cast=(void (*)()) */
public int /*long*/ visible_data_changed;
}
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
old mode 100755
new mode 100644
index 2bdff02..cf340b8
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkObjectFactoryClass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,7 +16,10 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkObjectFactoryClass {
+ /** @field cast=(AtkObject *(*)()) */
public int /*long*/ create_accessible;
+ /** @field cast=(void (*)()) */
public int /*long*/ invalidate;
+ /** @field cast=(GType (*)()) */
public int /*long*/ get_accessible_type;
}
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
old mode 100755
new mode 100644
index d9e6215..71052af
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkSelectionIface.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,12 +16,20 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkSelectionIface {
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ add_selection;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ clear_selection;
+ /** @field cast=(AtkObject *(*)()) */
public int /*long*/ ref_selection;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_selection_count;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ is_child_selected;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ remove_selection;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ select_all_selection;
+ /** @field cast=(void (*)()) */
public int /*long*/ selection_changed;
}
diff --git a/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java b/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
old mode 100755
new mode 100644
index e1c2e0a..5e74aa7
--- a/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/AtkTextIface.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,24 +16,44 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class AtkTextIface {
+ /** @field cast=(gchar *(*)()) */
public int /*long*/ get_text;
+ /** @field cast=(gchar *(*)()) */
public int /*long*/ get_text_after_offset;
+ /** @field cast=(gchar *(*)()) */
public int /*long*/ get_text_at_offset;
+ /** @field cast=(gunichar (*)()) */
public int /*long*/ get_character_at_offset;
+ /** @field cast=(gchar *(*)()) */
public int /*long*/ get_text_before_offset;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_caret_offset;
+ /** @field cast=(AtkAttributeSet *(*)()) */
public int /*long*/ get_run_attributes;
+ /** @field cast=(AtkAttributeSet *(*)()) */
public int /*long*/ get_default_attributes;
+ /** @field cast=(void (*)()) */
public int /*long*/ get_character_extents;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_character_count;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_offset_at_point;
+ /** @field cast=(gint (*)()) */
public int /*long*/ get_n_selections;
+ /** @field cast=(gchar *(*)()) */
public int /*long*/ get_selection;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ add_selection;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ remove_selection;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ set_selection;
+ /** @field cast=(gboolean (*)()) */
public int /*long*/ set_caret_offset;
+ /** @field cast=(void (*)()) */
public int /*long*/ text_changed;
+ /** @field cast=(void (*)()) */
public int /*long*/ text_caret_moved;
+ /** @field cast=(void (*)()) */
public int /*long*/ text_selection_changed;
}
diff --git a/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java b/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
old mode 100755
new mode 100644
index be760f4..6b1013b
--- a/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
+++ b/org/eclipse/swt/internal/accessibility/gtk/GtkAccessible.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,5 +16,6 @@ package org.eclipse.swt.internal.accessibility.gtk;
public class GtkAccessible {
+ /** @field cast=(GtkWidget *) */
public int /*long*/ widget;
}
diff --git a/org/eclipse/swt/internal/cairo/Cairo.java b/org/eclipse/swt/internal/cairo/Cairo.java
old mode 100755
new mode 100644
index d015c10..8836edd
--- a/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/org/eclipse/swt/internal/cairo/Cairo.java
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.cairo;
@@ -105,6 +105,10 @@ public static final native int cairo_text_extents_t_sizeof ();
/** Natives */
public static final native int CAIRO_VERSION_ENCODE(int major, int minor, int micro);
+/**
+ * @param cr cast=(cairo_t *)
+ * @param path cast=(cairo_path_t *)
+ */
public static final native void _cairo_append_path(int /*long*/ cr, int /*long*/ path);
public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {
lock.lock();
@@ -114,6 +118,7 @@ public static final void cairo_append_path(int /*long*/ cr, int /*long*/ path) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);
public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
lock.lock();
@@ -123,6 +128,7 @@ public static final void cairo_arc(int /*long*/ cr, double xc, double yc, double
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2);
public static final void cairo_arc_negative(int /*long*/ cr, double xc, double yc, double radius, double angle1, double angle2) {
lock.lock();
@@ -132,6 +138,7 @@ public static final void cairo_arc_negative(int /*long*/ cr, double xc, double y
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_clip(int /*long*/ cr);
public static final void cairo_clip(int /*long*/ cr) {
lock.lock();
@@ -141,6 +148,7 @@ public static final void cairo_clip(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_clip_preserve(int /*long*/ cr);
public static final void cairo_clip_preserve(int /*long*/ cr) {
lock.lock();
@@ -150,6 +158,7 @@ public static final void cairo_clip_preserve(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_close_path(int /*long*/ cr);
public static final void cairo_close_path(int /*long*/ cr) {
lock.lock();
@@ -159,6 +168,7 @@ public static final void cairo_close_path(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_copy_page(int /*long*/ cr);
public static final void cairo_copy_page(int /*long*/ cr) {
lock.lock();
@@ -168,6 +178,7 @@ public static final void cairo_copy_page(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int /*long*/ _cairo_copy_path(int /*long*/ cr);
public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {
lock.lock();
@@ -177,6 +188,7 @@ public static final int /*long*/ cairo_copy_path(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int /*long*/ _cairo_copy_path_flat(int /*long*/ cr);
public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {
lock.lock();
@@ -186,6 +198,7 @@ public static final int /*long*/ cairo_copy_path_flat(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param target cast=(cairo_surface_t *) */
public static final native int /*long*/ _cairo_create(int /*long*/ target);
public static final int /*long*/ cairo_create(int /*long*/ target) {
lock.lock();
@@ -195,6 +208,7 @@ public static final int /*long*/ cairo_create(int /*long*/ target) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3);
public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) {
lock.lock();
@@ -204,6 +218,7 @@ public static final void cairo_curve_to(int /*long*/ cr, double x1, double y1, d
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_destroy(int /*long*/ cr);
public static final void cairo_destroy(int /*long*/ cr) {
lock.lock();
@@ -213,6 +228,7 @@ public static final void cairo_destroy(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_device_to_user(int /*long*/ cr, double[] x, double[] y);
public static final void cairo_device_to_user(int /*long*/ cr, double[] x, double[] y) {
lock.lock();
@@ -222,6 +238,7 @@ public static final void cairo_device_to_user(int /*long*/ cr, double[] x, doubl
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy);
public static final void cairo_device_to_user_distance(int /*long*/ cr, double[] dx, double[] dy) {
lock.lock();
@@ -231,6 +248,7 @@ public static final void cairo_device_to_user_distance(int /*long*/ cr, double[]
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_fill(int /*long*/ cr);
public static final void cairo_fill(int /*long*/ cr) {
lock.lock();
@@ -240,6 +258,7 @@ public static final void cairo_fill(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
lock.lock();
@@ -249,6 +268,7 @@ public static final void cairo_fill_extents(int /*long*/ cr, double[] x1, double
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_fill_preserve(int /*long*/ cr);
public static final void cairo_fill_preserve(int /*long*/ cr) {
lock.lock();
@@ -258,6 +278,7 @@ public static final void cairo_fill_preserve(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents);
public static final void cairo_font_extents(int /*long*/ cr, cairo_font_extents_t extents) {
lock.lock();
@@ -276,6 +297,7 @@ public static final int /*long*/ cairo_font_options_create() {
lock.unlock();
}
}
+/** @param options cast=(cairo_font_options_t *) */
public static final native void _cairo_font_options_destroy(int /*long*/ options);
public static final void cairo_font_options_destroy(int /*long*/ options) {
lock.lock();
@@ -285,6 +307,7 @@ public static final void cairo_font_options_destroy(int /*long*/ options) {
lock.unlock();
}
}
+/** @param options cast=(cairo_font_options_t *) */
public static final native int _cairo_font_options_get_antialias(int /*long*/ options);
public static final int cairo_font_options_get_antialias(int /*long*/ options) {
lock.lock();
@@ -294,6 +317,7 @@ public static final int cairo_font_options_get_antialias(int /*long*/ options) {
lock.unlock();
}
}
+/** @param options cast=(cairo_font_options_t *) */
public static final native void _cairo_font_options_set_antialias(int /*long*/ options, int antialias);
public static final void cairo_font_options_set_antialias(int /*long*/ options, int antialias) {
lock.lock();
@@ -303,6 +327,7 @@ public static final void cairo_font_options_set_antialias(int /*long*/ options,
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_get_antialias(int /*long*/ cr);
public static final int cairo_get_antialias(int /*long*/ cr) {
lock.lock();
@@ -312,6 +337,7 @@ public static final int cairo_get_antialias(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_get_current_point(int /*long*/ cr, double[] x, double[] y);
public static final void cairo_get_current_point(int /*long*/ cr, double[] x, double[] y) {
lock.lock();
@@ -321,6 +347,7 @@ public static final void cairo_get_current_point(int /*long*/ cr, double[] x, do
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_get_fill_rule(int /*long*/ cr);
public static final int cairo_get_fill_rule(int /*long*/ cr) {
lock.lock();
@@ -330,6 +357,7 @@ public static final int cairo_get_fill_rule(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int /*long*/ _cairo_get_font_face(int /*long*/ cr);
public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {
lock.lock();
@@ -339,6 +367,10 @@ public static final int /*long*/ cairo_get_font_face(int /*long*/ cr) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_get_font_matrix(int /*long*/ cr, double[] matrix);
public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix) {
lock.lock();
@@ -348,6 +380,10 @@ public static final void cairo_get_font_matrix(int /*long*/ cr, double[] matrix)
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param options cast=(cairo_font_options_t *)
+ */
public static final native void _cairo_get_font_options(int /*long*/ cr, int /*long*/ options);
public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ options) {
lock.lock();
@@ -357,6 +393,7 @@ public static final void cairo_get_font_options(int /*long*/ cr, int /*long*/ op
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_get_line_cap(int /*long*/ cr);
public static final int cairo_get_line_cap(int /*long*/ cr) {
lock.lock();
@@ -366,6 +403,7 @@ public static final int cairo_get_line_cap(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_get_line_join(int /*long*/ cr);
public static final int cairo_get_line_join(int /*long*/ cr) {
lock.lock();
@@ -375,6 +413,7 @@ public static final int cairo_get_line_join(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native double _cairo_get_line_width(int /*long*/ cr);
public static final double cairo_get_line_width(int /*long*/ cr) {
lock.lock();
@@ -384,6 +423,10 @@ public static final double cairo_get_line_width(int /*long*/ cr) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_get_matrix(int /*long*/ cr, double[] matrix);
public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {
lock.lock();
@@ -393,6 +436,7 @@ public static final void cairo_get_matrix(int /*long*/ cr, double[] matrix) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native double _cairo_get_miter_limit(int /*long*/ cr);
public static final double cairo_get_miter_limit(int /*long*/ cr) {
lock.lock();
@@ -402,6 +446,7 @@ public static final double cairo_get_miter_limit(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_get_operator(int /*long*/ cr);
public static final int cairo_get_operator(int /*long*/ cr) {
lock.lock();
@@ -411,6 +456,7 @@ public static final int cairo_get_operator(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int /*long*/ _cairo_get_source(int /*long*/ cr);
public static final int /*long*/ cairo_get_source(int /*long*/ cr) {
lock.lock();
@@ -420,6 +466,7 @@ public static final int /*long*/ cairo_get_source(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int /*long*/ _cairo_get_target(int /*long*/ cr);
public static final int /*long*/ cairo_get_target(int /*long*/ cr) {
lock.lock();
@@ -429,6 +476,7 @@ public static final int /*long*/ cairo_get_target(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native double _cairo_get_tolerance(int /*long*/ cr);
public static final double cairo_get_tolerance(int /*long*/ cr) {
lock.lock();
@@ -438,6 +486,11 @@ public static final double cairo_get_tolerance(int /*long*/ cr) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param glyphs cast=(cairo_glyph_t *)
+ * @param extents cast=(cairo_text_extents_t *)
+ */
public static final native void _cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents);
public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs, int /*long*/ extents) {
lock.lock();
@@ -447,6 +500,10 @@ public static final void cairo_glyph_extents(int /*long*/ cr, int /*long*/ glyph
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param glyphs cast=(cairo_glyph_t *)
+ */
public static final native void _cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {
lock.lock();
@@ -456,6 +513,7 @@ public static final void cairo_glyph_path(int /*long*/ cr, int /*long*/ glyphs,
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_identity_matrix(int /*long*/ cr);
public static final void cairo_identity_matrix(int /*long*/ cr) {
lock.lock();
@@ -474,6 +532,7 @@ public static final int /*long*/ cairo_image_surface_create(int format, int widt
lock.unlock();
}
}
+/** @param data cast=(unsigned char *) */
public static final native int /*long*/ _cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride);
public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*/ data, int format, int width, int height, int stride) {
lock.lock();
@@ -483,6 +542,7 @@ public static final int /*long*/ cairo_image_surface_create_for_data(int /*long*
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native int _cairo_image_surface_get_height(int /*long*/ surface);
public static final int cairo_image_surface_get_height(int /*long*/ surface) {
lock.lock();
@@ -492,6 +552,7 @@ public static final int cairo_image_surface_get_height(int /*long*/ surface) {
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native int _cairo_image_surface_get_width(int /*long*/ surface);
public static final int cairo_image_surface_get_width(int /*long*/ surface) {
lock.lock();
@@ -501,6 +562,7 @@ public static final int cairo_image_surface_get_width(int /*long*/ surface) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_in_fill(int /*long*/ cr, double x, double y);
public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {
lock.lock();
@@ -510,6 +572,7 @@ public static final int cairo_in_fill(int /*long*/ cr, double x, double y) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_in_stroke(int /*long*/ cr, double x, double y);
public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {
lock.lock();
@@ -519,6 +582,7 @@ public static final int cairo_in_stroke(int /*long*/ cr, double x, double y) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_line_to(int /*long*/ cr, double x, double y);
public static final void cairo_line_to(int /*long*/ cr, double x, double y) {
lock.lock();
@@ -528,6 +592,10 @@ public static final void cairo_line_to(int /*long*/ cr, double x, double y) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param pattern cast=(cairo_pattern_t *)
+ */
public static final native void _cairo_mask(int /*long*/ cr, int /*long*/ pattern);
public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {
lock.lock();
@@ -537,6 +605,10 @@ public static final void cairo_mask(int /*long*/ cr, int /*long*/ pattern) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param surface cast=(cairo_surface_t *)
+ */
public static final native void _cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y);
public static final void cairo_mask_surface(int /*long*/ cr, int /*long*/ surface, double surface_x, double surface_y) {
lock.lock();
@@ -546,6 +618,7 @@ public static final void cairo_mask_surface(int /*long*/ cr, int /*long*/ surfac
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_init(double[] matrix, double xx, double yx, double xy, double yy, double x0, double y0);
public static final void cairo_matrix_init(double[] matrix, double xx, double yx, double xy, double yy, double x0, double y0) {
lock.lock();
@@ -555,6 +628,7 @@ public static final void cairo_matrix_init(double[] matrix, double xx, double yx
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_init_identity(double[] matrix);
public static final void cairo_matrix_init_identity(double[] matrix) {
lock.lock();
@@ -564,6 +638,7 @@ public static final void cairo_matrix_init_identity(double[] matrix) {
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_init_rotate(double[] matrix, double radians);
public static final void cairo_matrix_init_rotate(double[] matrix, double radians) {
lock.lock();
@@ -573,6 +648,7 @@ public static final void cairo_matrix_init_rotate(double[] matrix, double radian
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_init_scale(double[] matrix, double sx, double sy);
public static final void cairo_matrix_init_scale(double[] matrix, double sx, double sy) {
lock.lock();
@@ -582,6 +658,7 @@ public static final void cairo_matrix_init_scale(double[] matrix, double sx, dou
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_init_translate(double[] matrix, double tx, double ty);
public static final void cairo_matrix_init_translate(double[] matrix, double tx, double ty) {
lock.lock();
@@ -591,6 +668,7 @@ public static final void cairo_matrix_init_translate(double[] matrix, double tx,
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native int _cairo_matrix_invert(double[] matrix);
public static final int cairo_matrix_invert(double[] matrix) {
lock.lock();
@@ -600,6 +678,11 @@ public static final int cairo_matrix_invert(double[] matrix) {
lock.unlock();
}
}
+/**
+ * @param result cast=(cairo_matrix_t *)
+ * @param a cast=(cairo_matrix_t *)
+ * @param b cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_matrix_multiply(double[] result, double[] a, double[] b);
public static final void cairo_matrix_multiply(double[] result, double[] a, double[] b) {
lock.lock();
@@ -609,6 +692,7 @@ public static final void cairo_matrix_multiply(double[] result, double[] a, doub
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_rotate(double[] matrix, double radians);
public static final void cairo_matrix_rotate(double[] matrix, double radians) {
lock.lock();
@@ -618,6 +702,7 @@ public static final void cairo_matrix_rotate(double[] matrix, double radians) {
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_scale(double[] matrix, double sx, double sy);
public static final void cairo_matrix_scale(double[] matrix, double sx, double sy) {
lock.lock();
@@ -627,6 +712,7 @@ public static final void cairo_matrix_scale(double[] matrix, double sx, double s
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_transform_distance(double[] matrix, double[] dx, double[] dy);
public static final void cairo_matrix_transform_distance(double[] matrix, double[] dx, double[] dy) {
lock.lock();
@@ -636,6 +722,7 @@ public static final void cairo_matrix_transform_distance(double[] matrix, double
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_transform_point(double[] matrix, double[] x, double[] y);
public static final void cairo_matrix_transform_point(double[] matrix, double[] x, double[] y) {
lock.lock();
@@ -645,6 +732,7 @@ public static final void cairo_matrix_transform_point(double[] matrix, double[]
lock.unlock();
}
}
+/** @param matrix cast=(cairo_matrix_t *) */
public static final native void _cairo_matrix_translate(double[] matrix, double tx, double ty);
public static final void cairo_matrix_translate(double[] matrix, double tx, double ty) {
lock.lock();
@@ -654,6 +742,7 @@ public static final void cairo_matrix_translate(double[] matrix, double tx, doub
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_move_to(int /*long*/ cr, double x, double y);
public static final void cairo_move_to(int /*long*/ cr, double x, double y) {
lock.lock();
@@ -663,6 +752,7 @@ public static final void cairo_move_to(int /*long*/ cr, double x, double y) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_new_path(int /*long*/ cr);
public static final void cairo_new_path(int /*long*/ cr) {
lock.lock();
@@ -672,6 +762,7 @@ public static final void cairo_new_path(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_paint(int /*long*/ cr);
public static final void cairo_paint(int /*long*/ cr) {
lock.lock();
@@ -681,6 +772,7 @@ public static final void cairo_paint(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_paint_with_alpha(int /*long*/ cr, double alpha);
public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {
lock.lock();
@@ -690,6 +782,7 @@ public static final void cairo_paint_with_alpha(int /*long*/ cr, double alpha) {
lock.unlock();
}
}
+/** @param path cast=(cairo_path_t *) */
public static final native void _cairo_path_destroy(int /*long*/ path);
public static final void cairo_path_destroy(int /*long*/ path) {
lock.lock();
@@ -699,6 +792,7 @@ public static final void cairo_path_destroy(int /*long*/ path) {
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native void _cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue);
public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern, double offset, double red, double green, double blue) {
lock.lock();
@@ -708,6 +802,7 @@ public static final void cairo_pattern_add_color_stop_rgb(int /*long*/ pattern,
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native void _cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha);
public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern, double offset, double red, double green, double blue, double alpha) {
lock.lock();
@@ -717,6 +812,7 @@ public static final void cairo_pattern_add_color_stop_rgba(int /*long*/ pattern,
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native int /*long*/ _cairo_pattern_create_for_surface(int /*long*/ surface);
public static final int /*long*/ cairo_pattern_create_for_surface(int /*long*/ surface) {
lock.lock();
@@ -744,6 +840,7 @@ public static final int /*long*/ cairo_pattern_create_radial(double cx0, double
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native void _cairo_pattern_destroy(int /*long*/ pattern);
public static final void cairo_pattern_destroy(int /*long*/ pattern) {
lock.lock();
@@ -753,6 +850,7 @@ public static final void cairo_pattern_destroy(int /*long*/ pattern) {
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native int _cairo_pattern_get_extend(int /*long*/ pattern);
public static final int cairo_pattern_get_extend(int /*long*/ pattern) {
lock.lock();
@@ -762,6 +860,7 @@ public static final int cairo_pattern_get_extend(int /*long*/ pattern) {
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native int _cairo_pattern_get_filter(int /*long*/ pattern);
public static final int cairo_pattern_get_filter(int /*long*/ pattern) {
lock.lock();
@@ -771,6 +870,10 @@ public static final int cairo_pattern_get_filter(int /*long*/ pattern) {
lock.unlock();
}
}
+/**
+ * @param pattern cast=(cairo_pattern_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix);
public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[] matrix) {
lock.lock();
@@ -780,6 +883,7 @@ public static final void cairo_pattern_get_matrix(int /*long*/ pattern, double[]
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native void _cairo_pattern_reference(int /*long*/ pattern);
public static final void cairo_pattern_reference(int /*long*/ pattern) {
lock.lock();
@@ -789,6 +893,7 @@ public static final void cairo_pattern_reference(int /*long*/ pattern) {
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native void _cairo_pattern_set_extend(int /*long*/ pattern, int extend);
public static final void cairo_pattern_set_extend(int /*long*/ pattern, int extend) {
lock.lock();
@@ -798,6 +903,7 @@ public static final void cairo_pattern_set_extend(int /*long*/ pattern, int exte
lock.unlock();
}
}
+/** @param pattern cast=(cairo_pattern_t *) */
public static final native void _cairo_pattern_set_filter(int /*long*/ pattern, int filter);
public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filter) {
lock.lock();
@@ -807,6 +913,10 @@ public static final void cairo_pattern_set_filter(int /*long*/ pattern, int filt
lock.unlock();
}
}
+/**
+ * @param pattern cast=(cairo_pattern_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix);
public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[] matrix) {
lock.lock();
@@ -816,6 +926,10 @@ public static final void cairo_pattern_set_matrix(int /*long*/ pattern, double[]
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
public static final native void _cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);
public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {
lock.lock();
@@ -825,6 +939,10 @@ public static final void cairo_pdf_surface_set_size(int /*long*/ surface, double
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
public static final native void _cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points);
public static final void cairo_ps_surface_set_size(int /*long*/ surface, double width_in_points, double height_in_points) {
lock.lock();
@@ -834,6 +952,7 @@ public static final void cairo_ps_surface_set_size(int /*long*/ surface, double
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height);
public static final void cairo_rectangle(int /*long*/ cr, double x, double y, double width, double height) {
lock.lock();
@@ -843,6 +962,7 @@ public static final void cairo_rectangle(int /*long*/ cr, double x, double y, do
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int /*long*/ _cairo_reference(int /*long*/ cr);
public static final int /*long*/ cairo_reference(int /*long*/ cr) {
lock.lock();
@@ -852,6 +972,7 @@ public static final int /*long*/ cairo_reference(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3);
public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) {
lock.lock();
@@ -861,6 +982,7 @@ public static final void cairo_rel_curve_to(int /*long*/ cr, double dx1, double
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_rel_line_to(int /*long*/ cr, double dx, double dy);
public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy) {
lock.lock();
@@ -870,6 +992,7 @@ public static final void cairo_rel_line_to(int /*long*/ cr, double dx, double dy
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_rel_move_to(int /*long*/ cr, double dx, double dy);
public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy) {
lock.lock();
@@ -879,6 +1002,7 @@ public static final void cairo_rel_move_to(int /*long*/ cr, double dx, double dy
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_reset_clip(int /*long*/ cr);
public static final void cairo_reset_clip(int /*long*/ cr) {
lock.lock();
@@ -888,6 +1012,7 @@ public static final void cairo_reset_clip(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_restore(int /*long*/ cr);
public static final void cairo_restore(int /*long*/ cr) {
lock.lock();
@@ -897,6 +1022,7 @@ public static final void cairo_restore(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_rotate(int /*long*/ cr, double angle);
public static final void cairo_rotate(int /*long*/ cr, double angle) {
lock.lock();
@@ -906,6 +1032,7 @@ public static final void cairo_rotate(int /*long*/ cr, double angle) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_save(int /*long*/ cr);
public static final void cairo_save(int /*long*/ cr) {
lock.lock();
@@ -915,6 +1042,7 @@ public static final void cairo_save(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_scale(int /*long*/ cr, double sx, double sy);
public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {
lock.lock();
@@ -924,6 +1052,10 @@ public static final void cairo_scale(int /*long*/ cr, double sx, double sy) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param family cast=(const char *)
+ */
public static final native void _cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight);
public static final void cairo_select_font_face(int /*long*/ cr, byte[] family, int slant, int weight) {
lock.lock();
@@ -933,6 +1065,7 @@ public static final void cairo_select_font_face(int /*long*/ cr, byte[] family,
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_antialias(int /*long*/ cr, int antialias);
public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {
lock.lock();
@@ -942,6 +1075,7 @@ public static final void cairo_set_antialias(int /*long*/ cr, int antialias) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset);
public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int ndash, double offset) {
lock.lock();
@@ -951,6 +1085,7 @@ public static final void cairo_set_dash(int /*long*/ cr, double[] dashes, int nd
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_fill_rule(int /*long*/ cr, int fill_rule);
public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {
lock.lock();
@@ -960,6 +1095,10 @@ public static final void cairo_set_fill_rule(int /*long*/ cr, int fill_rule) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param font_face cast=(cairo_font_face_t *)
+ */
public static final native void _cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face);
public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_face) {
lock.lock();
@@ -969,6 +1108,10 @@ public static final void cairo_set_font_face(int /*long*/ cr, int /*long*/ font_
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_set_font_matrix(int /*long*/ cr, double[] matrix);
public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix) {
lock.lock();
@@ -978,6 +1121,10 @@ public static final void cairo_set_font_matrix(int /*long*/ cr, double[] matrix)
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param options cast=(cairo_font_options_t *)
+ */
public static final native void _cairo_set_font_options(int /*long*/ cr, int /*long*/ options);
public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ options) {
lock.lock();
@@ -987,6 +1134,7 @@ public static final void cairo_set_font_options(int /*long*/ cr, int /*long*/ op
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_font_size(int /*long*/ cr, double size);
public static final void cairo_set_font_size(int /*long*/ cr, double size) {
lock.lock();
@@ -996,6 +1144,7 @@ public static final void cairo_set_font_size(int /*long*/ cr, double size) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_line_cap(int /*long*/ cr, int line_cap);
public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {
lock.lock();
@@ -1005,6 +1154,7 @@ public static final void cairo_set_line_cap(int /*long*/ cr, int line_cap) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_line_join(int /*long*/ cr, int line_join);
public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {
lock.lock();
@@ -1014,6 +1164,7 @@ public static final void cairo_set_line_join(int /*long*/ cr, int line_join) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_line_width(int /*long*/ cr, double width);
public static final void cairo_set_line_width(int /*long*/ cr, double width) {
lock.lock();
@@ -1023,6 +1174,10 @@ public static final void cairo_set_line_width(int /*long*/ cr, double width) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_set_matrix(int /*long*/ cr, double[] matrix);
public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {
lock.lock();
@@ -1032,6 +1187,7 @@ public static final void cairo_set_matrix(int /*long*/ cr, double[] matrix) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_miter_limit(int /*long*/ cr, double limit);
public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {
lock.lock();
@@ -1041,6 +1197,7 @@ public static final void cairo_set_miter_limit(int /*long*/ cr, double limit) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_operator(int /*long*/ cr, int op);
public static final void cairo_set_operator(int /*long*/ cr, int op) {
lock.lock();
@@ -1050,6 +1207,10 @@ public static final void cairo_set_operator(int /*long*/ cr, int op) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param source cast=(cairo_pattern_t *)
+ */
public static final native void _cairo_set_source(int /*long*/ cr, int /*long*/ source);
public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source) {
lock.lock();
@@ -1059,6 +1220,7 @@ public static final void cairo_set_source(int /*long*/ cr, int /*long*/ source)
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue);
public static final void cairo_set_source_rgb(int /*long*/ cr, double red, double green, double blue) {
lock.lock();
@@ -1068,6 +1230,7 @@ public static final void cairo_set_source_rgb(int /*long*/ cr, double red, doubl
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha);
public static final void cairo_set_source_rgba(int /*long*/ cr, double red, double green, double blue, double alpha) {
lock.lock();
@@ -1077,6 +1240,10 @@ public static final void cairo_set_source_rgba(int /*long*/ cr, double red, doub
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param surface cast=(cairo_surface_t *)
+ */
public static final native void _cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y);
public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/ surface, double x, double y) {
lock.lock();
@@ -1086,6 +1253,7 @@ public static final void cairo_set_source_surface(int /*long*/ cr, int /*long*/
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_set_tolerance(int /*long*/ cr, double tolerance);
public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance) {
lock.lock();
@@ -1095,6 +1263,10 @@ public static final void cairo_set_tolerance(int /*long*/ cr, double tolerance)
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param glyphs cast=(cairo_glyph_t *)
+ */
public static final native void _cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs);
public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs, int num_glyphs) {
lock.lock();
@@ -1104,6 +1276,7 @@ public static final void cairo_show_glyphs(int /*long*/ cr, int /*long*/ glyphs,
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_show_page(int /*long*/ cr);
public static final void cairo_show_page(int /*long*/ cr) {
lock.lock();
@@ -1113,6 +1286,10 @@ public static final void cairo_show_page(int /*long*/ cr) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param utf8 cast=(const char *)
+ */
public static final native void _cairo_show_text(int /*long*/ cr, byte[] utf8);
public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {
lock.lock();
@@ -1122,6 +1299,7 @@ public static final void cairo_show_text(int /*long*/ cr, byte[] utf8) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native int _cairo_status(int /*long*/ cr);
public static final int cairo_status(int /*long*/ cr) {
lock.lock();
@@ -1140,6 +1318,7 @@ public static final int /*long*/ cairo_status_to_string(int status) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_stroke(int /*long*/ cr);
public static final void cairo_stroke(int /*long*/ cr) {
lock.lock();
@@ -1149,6 +1328,7 @@ public static final void cairo_stroke(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2);
public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) {
lock.lock();
@@ -1158,6 +1338,7 @@ public static final void cairo_stroke_extents(int /*long*/ cr, double[] x1, doub
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_stroke_preserve(int /*long*/ cr);
public static final void cairo_stroke_preserve(int /*long*/ cr) {
lock.lock();
@@ -1167,6 +1348,7 @@ public static final void cairo_stroke_preserve(int /*long*/ cr) {
lock.unlock();
}
}
+/** @param other cast=(cairo_surface_t *) */
public static final native int /*long*/ _cairo_surface_create_similar(int /*long*/ other, int format, int width, int height);
public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other, int format, int width, int height) {
lock.lock();
@@ -1176,6 +1358,7 @@ public static final int /*long*/ cairo_surface_create_similar(int /*long*/ other
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native void _cairo_surface_destroy(int /*long*/ surface);
public static final void cairo_surface_destroy(int /*long*/ surface) {
lock.lock();
@@ -1185,6 +1368,7 @@ public static final void cairo_surface_destroy(int /*long*/ surface) {
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native void _cairo_surface_finish(int /*long*/ surface);
public static final void cairo_surface_finish(int /*long*/ surface) {
lock.lock();
@@ -1194,6 +1378,10 @@ public static final void cairo_surface_finish(int /*long*/ surface) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param surface cast=(cairo_surface_t *)
+ */
public static final native int _cairo_surface_get_type(int /*long*/ surface);
public static final int cairo_surface_get_type(int /*long*/ surface) {
lock.lock();
@@ -1203,6 +1391,10 @@ public static final int cairo_surface_get_type(int /*long*/ surface) {
lock.unlock();
}
}
+/**
+ * @param surface cast=(cairo_surface_t *)
+ * @param key cast=(cairo_user_data_key_t *)
+ */
public static final native int /*long*/ _cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key);
public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surface, int /*long*/ key) {
lock.lock();
@@ -1212,6 +1404,7 @@ public static final int /*long*/ cairo_surface_get_user_data(int /*long*/ surfac
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native void _cairo_surface_reference(int /*long*/ surface);
public static final void cairo_surface_reference(int /*long*/ surface) {
lock.lock();
@@ -1221,6 +1414,7 @@ public static final void cairo_surface_reference(int /*long*/ surface) {
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native void _cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset);
public static final void cairo_surface_set_device_offset(int /*long*/ surface, double x_offset, double y_offset) {
lock.lock();
@@ -1230,6 +1424,7 @@ public static final void cairo_surface_set_device_offset(int /*long*/ surface, d
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch);
public static final void cairo_surface_set_fallback_resolution(int /*long*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) {
lock.lock();
@@ -1239,6 +1434,12 @@ public static final void cairo_surface_set_fallback_resolution(int /*long*/ surf
lock.unlock();
}
}
+/**
+ * @param surface cast=(cairo_surface_t *)
+ * @param key cast=(cairo_user_data_key_t *)
+ * @param user_data cast=(void *)
+ * @param destroy cast=(cairo_destroy_func_t)
+ */
public static final native int _cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy);
public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*long*/ key, int /*long*/ user_data, int /*long*/ destroy) {
lock.lock();
@@ -1248,6 +1449,11 @@ public static final int cairo_surface_set_user_data(int /*long*/ surface, int /*
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param utf8 cast=(const char *)
+ * @param extents cast=(cairo_text_extents_t *)
+ */
public static final native void _cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents);
public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_text_extents_t extents) {
lock.lock();
@@ -1257,6 +1463,10 @@ public static final void cairo_text_extents(int /*long*/ cr, byte[] utf8, cairo_
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param utf8 cast=(const char *)
+ */
public static final native void _cairo_text_path(int /*long*/ cr, byte[] utf8);
public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {
lock.lock();
@@ -1266,6 +1476,10 @@ public static final void cairo_text_path(int /*long*/ cr, byte[] utf8) {
lock.unlock();
}
}
+/**
+ * @param cr cast=(cairo_t *)
+ * @param matrix cast=(cairo_matrix_t *)
+ */
public static final native void _cairo_transform(int /*long*/ cr, double[] matrix);
public static final void cairo_transform(int /*long*/ cr, double[] matrix) {
lock.lock();
@@ -1275,6 +1489,7 @@ public static final void cairo_transform(int /*long*/ cr, double[] matrix) {
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_translate(int /*long*/ cr, double tx, double ty);
public static final void cairo_translate(int /*long*/ cr, double tx, double ty) {
lock.lock();
@@ -1284,6 +1499,7 @@ public static final void cairo_translate(int /*long*/ cr, double tx, double ty)
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_user_to_device(int /*long*/ cr, double[] x, double[] y);
public static final void cairo_user_to_device(int /*long*/ cr, double[] x, double[] y) {
lock.lock();
@@ -1293,6 +1509,7 @@ public static final void cairo_user_to_device(int /*long*/ cr, double[] x, doubl
lock.unlock();
}
}
+/** @param cr cast=(cairo_t *) */
public static final native void _cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy);
public static final void cairo_user_to_device_distance(int /*long*/ cr, double[] dx, double[] dy) {
lock.lock();
@@ -1303,6 +1520,11 @@ public static final void cairo_user_to_device_distance(int /*long*/ cr, double[]
}
}
public static final native int cairo_version();
+/**
+ * @param dpy cast=(Display *)
+ * @param drawable cast=(Drawable)
+ * @param visual cast=(Visual *)
+ */
public static final native int /*long*/ _cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height);
public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ visual, int width, int height) {
lock.lock();
@@ -1312,6 +1534,11 @@ public static final int /*long*/ cairo_xlib_surface_create(int /*long*/ dpy, int
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param pixmap cast=(Pixmap)
+ * @param screen cast=(Screen *)
+ */
public static final native int /*long*/ _cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height);
public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long*/ dpy, int /*long*/ pixmap, int /*long*/ screen, int width, int height) {
lock.lock();
@@ -1321,6 +1548,7 @@ public static final int /*long*/ cairo_xlib_surface_create_for_bitmap(int /*long
lock.unlock();
}
}
+/** @param surface cast=(cairo_surface_t *) */
public static final native void _cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height);
public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int width, int height) {
lock.lock();
@@ -1330,8 +1558,23 @@ public static final void cairo_xlib_surface_set_size(int /*long*/ surface, int w
lock.unlock();
}
}
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(cairo_path_t dest, int /*long*/ src, int /*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, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(double[] dest, int /*long*/ src, int /*long*/ size);
}
diff --git a/org/eclipse/swt/internal/cairo/cairo_font_extents_t.java b/org/eclipse/swt/internal/cairo/cairo_font_extents_t.java
old mode 100755
new mode 100644
index 3acd4a9..72562b8
--- a/org/eclipse/swt/internal/cairo/cairo_font_extents_t.java
+++ b/org/eclipse/swt/internal/cairo/cairo_font_extents_t.java
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2006 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.cairo;
diff --git a/org/eclipse/swt/internal/cairo/cairo_path_data_t.java b/org/eclipse/swt/internal/cairo/cairo_path_data_t.java
old mode 100755
new mode 100644
index 66d590e..03147de
--- a/org/eclipse/swt/internal/cairo/cairo_path_data_t.java
+++ b/org/eclipse/swt/internal/cairo/cairo_path_data_t.java
@@ -15,14 +15,16 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.cairo;
public class cairo_path_data_t {
+ /** @field accessor=header.type */
public int type;
+ /** @field accessor=header.length */
public int length;
public static final int sizeof = Cairo.cairo_path_data_t_sizeof();
}
diff --git a/org/eclipse/swt/internal/cairo/cairo_path_t.java b/org/eclipse/swt/internal/cairo/cairo_path_t.java
old mode 100755
new mode 100644
index dc55e7c..db690aa
--- a/org/eclipse/swt/internal/cairo/cairo_path_t.java
+++ b/org/eclipse/swt/internal/cairo/cairo_path_t.java
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.cairo;
@@ -23,6 +23,7 @@ package org.eclipse.swt.internal.cairo;
public class cairo_path_t {
public int status;
+ /** @field cast=(cairo_path_data_t *) */
public int /*long*/ data;
public int num_data;
public static final int sizeof = Cairo.cairo_path_t_sizeof();
diff --git a/org/eclipse/swt/internal/cairo/cairo_text_extents_t.java b/org/eclipse/swt/internal/cairo/cairo_text_extents_t.java
old mode 100755
new mode 100644
index f57b054..7408d29
--- a/org/eclipse/swt/internal/cairo/cairo_text_extents_t.java
+++ b/org/eclipse/swt/internal/cairo/cairo_text_extents_t.java
@@ -15,7 +15,7 @@
*
* IBM
* - Binding to permit interfacing between Cairo and SWT
- * - Copyright (C) 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2005, 2006 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.cairo;
diff --git a/org/eclipse/swt/internal/cde/CDE.java b/org/eclipse/swt/internal/cde/CDE.java
old mode 100755
new mode 100644
index 365d252..f2ea5b5
--- a/org/eclipse/swt/internal/cde/CDE.java
+++ b/org/eclipse/swt/internal/cde/CDE.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,6 +25,14 @@ public class CDE extends Platform {
public static final native int DtActionArg_sizeof();
/** Natives */
+
+/**
+ * @param appContext cast=(XtAppContext)
+ * @param display cast=(Display *)
+ * @param topWiget cast=(Widget)
+ * @param appName cast=(char *)
+ * @param appClass cast=(char *)
+ */
public static final native boolean _DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass);
public static final boolean DtAppInitialize(int /*long*/ appContext, int /*long*/ display, int /*long*/ topWiget, byte[] appName, byte[] appClass) {
lock.lock();
@@ -52,6 +60,7 @@ public static final int /*long*/ DtDtsDataTypeNames() {
lock.unlock();
}
}
+/** @param fileName cast=(char *) */
public static final native int /*long*/ _DtDtsFileToDataType(byte[] fileName);
public static final int /*long*/ DtDtsFileToDataType(byte[] fileName) {
lock.lock();
@@ -61,6 +70,7 @@ public static final int /*long*/ DtDtsFileToDataType(byte[] fileName) {
lock.unlock();
}
}
+/** @param dataType cast=(char *) */
public static final native boolean _DtDtsDataTypeIsAction(byte[] dataType);
public static final boolean DtDtsDataTypeIsAction(byte[] dataType) {
lock.lock();
@@ -70,6 +80,11 @@ public static final boolean DtDtsDataTypeIsAction(byte[] dataType) {
lock.unlock();
}
}
+/**
+ * @param dataType cast=(char *)
+ * @param attrName cast=(char *)
+ * @param optName cast=(char *)
+ */
public static final native int /*long*/ _DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName);
public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) {
lock.lock();
@@ -79,6 +94,7 @@ public static final int /*long*/ DtDtsDataTypeToAttributeValue(byte[] dataType,
lock.unlock();
}
}
+/** @param dataType cast=(char *) */
public static final native void _DtDtsFreeDataType(int /*long*/ dataType);
public static final void DtDtsFreeDataType(int /*long*/ dataType) {
lock.lock();
@@ -88,6 +104,7 @@ public static final void DtDtsFreeDataType(int /*long*/ dataType) {
lock.unlock();
}
}
+/** @param dataTypeList cast=(char **) */
public static final native void _DtDtsFreeDataTypeNames(int /*long*/ dataTypeList);
public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {
lock.lock();
@@ -97,6 +114,7 @@ public static final void DtDtsFreeDataTypeNames(int /*long*/ dataTypeList) {
lock.unlock();
}
}
+/** @param attrValue cast=(char *) */
public static final native void _DtDtsFreeAttributeValue(int /*long*/ attrValue);
public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {
lock.lock();
@@ -106,6 +124,15 @@ public static final void DtDtsFreeAttributeValue(int /*long*/ attrValue) {
lock.unlock();
}
}
+/**
+ * @param topWidget cast=(Widget)
+ * @param action cast=(char *)
+ * @param termOpts cast=(char *)
+ * @param execHost cast=(char *)
+ * @param contextDir cast=(char *)
+ * @param callback cast=(DtActionCallbackProc)
+ * @param clientData cast=(XtPointer)
+ */
public static final native long _DtActionInvoke(int /*long*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, int /*long*/ callback, int /*long*/ clientData);
public static final long DtActionInvoke(int /*long*/ topWidget, byte[] action, DtActionArg args, int argCount, byte[] termOpts, byte[] execHost, byte[] contextDir, int useIndicator, int /*long*/ callback, int /*long*/ clientData) {
lock.lock();
@@ -115,6 +142,7 @@ public static final long DtActionInvoke(int /*long*/ topWidget, byte[] action, D
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _topLevelShellWidgetClass();
public static final int /*long*/ topLevelShellWidgetClass() {
lock.lock();
@@ -124,6 +152,13 @@ public static final int /*long*/ topLevelShellWidgetClass() {
lock.unlock();
}
}
+/**
+ * @param appName cast=(String)
+ * @param appClass cast=(String)
+ * @param widgetClass cast=(WidgetClass)
+ * @param display cast=(Display *)
+ * @param argList cast=(ArgList)
+ */
public static final native int /*long*/ _XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount);
public static final int /*long*/ XtAppCreateShell(byte[] appName, byte[] appClass, int /*long*/ widgetClass, int /*long*/ display, int /*long*/ [] argList, int argCount) {
lock.lock();
@@ -142,6 +177,16 @@ public static final int /*long*/ XtCreateApplicationContext() {
lock.unlock();
}
}
+/**
+ * @param app_context cast=(XtAppContext)
+ * @param display cast=(Display *)
+ * @param appName cast=(String)
+ * @param appClass cast=(String)
+ * @param options cast=(XrmOptionDescRec *)
+ * @param num_options cast=(Cardinal)
+ * @param argc cast=(int *)
+ * @param argv cast=(String *)
+ */
public static final native void _XtDisplayInitialize(int /*long*/ app_context, int /*long*/ display, byte[] appName, byte[] appClass, int /*long*/ options, int num_options, int /*long*/ [] argc, int argv);
public static final void XtDisplayInitialize(int /*long*/ appContext, int /*long*/ display, byte[] appName, byte[] appClass, int /*long*/ options, int num_options, int /*long*/ [] argc, int argv) {
lock.lock();
@@ -151,6 +196,7 @@ public static final void XtDisplayInitialize(int /*long*/ appContext, int /*long
lock.unlock();
}
}
+/** @param widget cast=(Widget) */
public static final native void _XtRealizeWidget(int /*long*/ widget);
public static final void XtRealizeWidget(int /*long*/ widget) {
lock.lock();
@@ -160,6 +206,7 @@ public static final void XtRealizeWidget(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(Widget) */
public static final native void _XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth);
public static final void XtResizeWidget(int /*long*/ widget, int width, int height, int borderWidth) {
lock.lock();
@@ -169,6 +216,7 @@ public static final void XtResizeWidget(int /*long*/ widget, int width, int heig
lock.unlock();
}
}
+/** @param widget cast=(Widget) */
public static final native void _XtSetMappedWhenManaged(int /*long*/ widget, boolean flag);
public static final void XtSetMappedWhenManaged(int /*long*/ widget, boolean flag) {
lock.lock();
diff --git a/org/eclipse/swt/internal/cde/DtActionArg.java b/org/eclipse/swt/internal/cde/DtActionArg.java
old mode 100755
new mode 100644
index ff3d88a..a9e3698
--- a/org/eclipse/swt/internal/cde/DtActionArg.java
+++ b/org/eclipse/swt/internal/cde/DtActionArg.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@ package org.eclipse.swt.internal.cde;
public class DtActionArg {
public int argClass;
+ /** @field accessor=u.file.name,cast=(char *) */
public int /*long*/ name;
public static final int sizeof = CDE.DtActionArg_sizeof();
}
diff --git a/org/eclipse/swt/internal/gnome/GNOME.java b/org/eclipse/swt/internal/gnome/GNOME.java
old mode 100755
new mode 100644
index e17677f..9802b71
--- a/org/eclipse/swt/internal/gnome/GNOME.java
+++ b/org/eclipse/swt/internal/gnome/GNOME.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -34,6 +34,8 @@ public static final int GNOME_VFS_MAKE_URI_DIR_CURRENT = 1<<1;
public static final native int GnomeVFSMimeApplication_sizeof();
/** Natives */
+
+/** @param mem cast=(gpointer) */
public static final native void _g_free(int /*long*/ mem);
public static final void g_free(int /*long*/ mem) {
lock.lock();
@@ -43,6 +45,10 @@ public static final void g_free(int /*long*/ mem) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param data cast=(gpointer)
+ */
public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);
public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {
lock.lock();
@@ -52,6 +58,7 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native void _g_list_free(int /*long*/ list);
public static final void g_list_free(int /*long*/ list) {
lock.lock();
@@ -70,6 +77,7 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
lock.unlock();
}
}
+/** @param object cast=(gpointer) */
public static final native void _g_object_unref(int /*long*/ object);
public static final void g_object_unref(int /*long*/ object) {
lock.lock();
@@ -79,6 +87,16 @@ public static final void g_object_unref(int /*long*/ object) {
lock.unlock();
}
}
+/**
+ * @param icon_theme cast=(GnomeIconTheme *)
+ * @param thumbnail_factory cast=(GnomeThumbnailFactory *)
+ * @param file_uri cast=(const char *)
+ * @param custom_icon cast=(const char *)
+ * @param file_info cast=(GnomeVFSFileInfo *)
+ * @param mime_type cast=(const char *)
+ * @param flags cast=(GnomeIconLookupFlags)
+ * @param result cast=(GnomeIconLookupResultFlags *)
+ */
public static final native int /*long*/ _gnome_icon_lookup(int /*long*/ icon_theme, int /*long*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, int /*long*/ file_info, byte[] mime_type, int flags, int[] result);
public static final int /*long*/ gnome_icon_lookup(int /*long*/ icon_theme, int /*long*/ thumbnail_factory, byte[] file_uri, byte[] custom_icon, int /*long*/ file_info, byte[] mime_type, int flags, int[] result) {
lock.lock();
@@ -88,6 +106,11 @@ public static final int /*long*/ gnome_icon_lookup(int /*long*/ icon_theme, int
lock.unlock();
}
}
+/**
+ * @param theme cast=(GnomeIconTheme *)
+ * @param icon_name cast=(const char *)
+ * @param icon_data cast=(const GnomeIconData **)
+ */
public static final native int /*long*/ _gnome_icon_theme_lookup_icon(int /*long*/ theme, int /*long*/ icon_name, int size, int /*long*/[] icon_data, int[] base_size);
public static final int /*long*/ gnome_icon_theme_lookup_icon(int /*long*/ theme, int /*long*/ icon_name, int size, int /*long*/[] icon_data, int[] base_size) {
lock.lock();
@@ -124,6 +147,7 @@ public static final boolean gnome_vfs_init() {
lock.unlock();
}
}
+/** @param uri cast=(const char *) */
public static final native int /*long*/ _gnome_vfs_make_uri_from_input(byte[] uri);
public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {
lock.lock();
@@ -133,6 +157,10 @@ public static final int /*long*/ gnome_vfs_make_uri_from_input(byte[] uri) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param uri cast=(const char *)
+ */
public static final native int /*long*/ _gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs);
public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) {
lock.lock();
@@ -142,6 +170,7 @@ public static final int /*long*/ gnome_vfs_make_uri_from_input_with_dirs(byte[]
lock.unlock();
}
}
+/** @param application cast=(GnomeVFSMimeApplication *) */
public static final native void _gnome_vfs_mime_application_free(int /*long*/ application);
public static final void gnome_vfs_mime_application_free(int /*long*/ application) {
lock.lock();
@@ -151,6 +180,11 @@ public static final void gnome_vfs_mime_application_free(int /*long*/ applicatio
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param application cast=(GnomeVFSMimeApplication *)
+ * @param uris cast=(GList *)
+ */
public static final native int _gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris);
public static final int gnome_vfs_mime_application_launch(int /*long*/ application, int /*long*/ uris) {
lock.lock();
@@ -160,6 +194,7 @@ public static final int gnome_vfs_mime_application_launch(int /*long*/ applicati
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native void _gnome_vfs_mime_extensions_list_free(int /*long*/ list);
public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list) {
lock.lock();
@@ -169,6 +204,7 @@ public static final void gnome_vfs_mime_extensions_list_free(int /*long*/ list)
lock.unlock();
}
}
+/** @param mimeType cast=(const char *) */
public static final native int /*long*/ _gnome_vfs_mime_get_default_application(byte[] mimeType);
public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] mimeType) {
lock.lock();
@@ -178,6 +214,7 @@ public static final int /*long*/ gnome_vfs_mime_get_default_application(byte[] m
lock.unlock();
}
}
+/** @param mime_type cast=(const char *) */
public static final native int /*long*/ _gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type);
public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/ mime_type) {
lock.lock();
@@ -187,6 +224,7 @@ public static final int /*long*/ gnome_vfs_mime_get_extensions_list(int /*long*/
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native void _gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list);
public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*long*/ list) {
lock.lock();
@@ -196,6 +234,7 @@ public static final void gnome_vfs_mime_registered_mime_type_list_free(int /*lon
lock.unlock();
}
}
+/** @param file cast=(const char *) */
public static final native int /*long*/ _gnome_vfs_mime_type_from_name(byte[] file);
public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {
lock.lock();
@@ -205,6 +244,10 @@ public static final int /*long*/ gnome_vfs_mime_type_from_name(byte[] file) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param url cast=(const char *)
+ */
public static final native int _gnome_vfs_url_show(int /*long*/ url);
public static final int gnome_vfs_url_show(int /*long*/ url) {
lock.lock();
@@ -214,5 +257,10 @@ public static final int gnome_vfs_url_show(int /*long*/ url) {
lock.unlock();
}
}
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param count cast=(size_t)
+ */
public static final native void memmove (GnomeVFSMimeApplication dest, int /*long*/ src, int /*long*/ count);
}
diff --git a/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java b/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
old mode 100755
new mode 100644
index 76e9309..53ab852
--- a/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
+++ b/org/eclipse/swt/internal/gnome/GnomeVFSMimeApplication.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,12 +16,19 @@ package org.eclipse.swt.internal.gnome;
public class GnomeVFSMimeApplication {
+ /** @field cast=(char *) */
public int /*long*/ id;
+ /** @field cast=(char *) */
public int /*long*/ name;
+ /** @field cast=(char *) */
public int /*long*/ command;
+ /** @field cast=(gboolean) */
public boolean can_open_multiple_files;
+ /** @field cast=(GnomeVFSMimeApplicationArgumentType) */
public int expects_uris;
+ /** @field cast=(GList *) */
public int /*long*/ supported_uri_schemes;
+ /** @field cast=(gboolean) */
public boolean requires_terminal;
public static final int sizeof = GNOME.GnomeVFSMimeApplication_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GInterfaceInfo.java b/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
old mode 100755
new mode 100644
index 4755245..6e5b746
--- a/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+++ b/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GInterfaceInfo {
+ /** @field cast=(GInterfaceInitFunc) */
public int /*long*/ interface_init;
+ /** @field cast=(GInterfaceFinalizeFunc) */
public int /*long*/ interface_finalize;
+ /** @field cast=(gpointer) */
public int /*long*/ interface_data;
public static final int sizeof = OS.GInterfaceInfo_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GObjectClass.java b/org/eclipse/swt/internal/gtk/GObjectClass.java
old mode 100755
new mode 100644
index dc0194b..649eba2
--- a/org/eclipse/swt/internal/gtk/GObjectClass.java
+++ b/org/eclipse/swt/internal/gtk/GObjectClass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,11 +16,18 @@ package org.eclipse.swt.internal.gtk;
public class GObjectClass {
+ /** @field cast=(GObject *(*)()) */
public int /*long*/ constructor;
+ /** @field cast=(void (*)()) */
public int /*long*/ set_property;
+ /** @field cast=(void (*)()) */
public int /*long*/ get_property;
+ /** @field cast=(void (*)()) */
public int /*long*/ dispose;
+ /** @field cast=(void (*)()) */
public int /*long*/ finalize;
+ /** @field cast=(void (*)()) */
public int /*long*/ dispatch_properties_changed;
+ /** @field cast=(void (*)()) */
public int /*long*/ notify;
}
diff --git a/org/eclipse/swt/internal/gtk/GTypeInfo.java b/org/eclipse/swt/internal/gtk/GTypeInfo.java
old mode 100755
new mode 100644
index 08eceb8..645454e
--- a/org/eclipse/swt/internal/gtk/GTypeInfo.java
+++ b/org/eclipse/swt/internal/gtk/GTypeInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,15 +16,25 @@ package org.eclipse.swt.internal.gtk;
public class GTypeInfo {
+ /** @field cast=(guint16) */
public short class_size;
+ /** @field cast=(GBaseInitFunc) */
public int /*long*/ base_init;
+ /** @field cast=(GBaseFinalizeFunc) */
public int /*long*/ base_finalize;
+ /** @field cast=(GClassInitFunc) */
public int /*long*/ class_init;
+ /** @field cast=(GClassFinalizeFunc) */
public int /*long*/ class_finalize;
+ /** @field cast=(gconstpointer) */
public int /*long*/ class_data;
+ /** @field cast=(guint16) */
public short instance_size;
+ /** @field cast=(guint16) */
public short n_preallocs;
+ /** @field cast=(GInstanceInitFunc) */
public int /*long*/ instance_init;
+ /** @field cast=(GTypeValueTable *) */
public int /*long*/ value_table;
public static final int sizeof = OS.GTypeInfo_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GTypeQuery.java b/org/eclipse/swt/internal/gtk/GTypeQuery.java
old mode 100755
new mode 100644
index b9ebe57..56d24af
--- a/org/eclipse/swt/internal/gtk/GTypeQuery.java
+++ b/org/eclipse/swt/internal/gtk/GTypeQuery.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,9 +16,13 @@ package org.eclipse.swt.internal.gtk;
public class GTypeQuery {
+ /** @field cast=(GType) */
public int type;
+ /** @field cast=(const gchar *) */
public int /*long*/ type_name;
+ /** @field cast=(guint) */
public int class_size;
+ /** @field cast=(guint) */
public int instance_size;
public static final int sizeof = OS.GTypeQuery_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkColor.java b/org/eclipse/swt/internal/gtk/GdkColor.java
old mode 100755
new mode 100644
index bea6a92..8bed11a
--- a/org/eclipse/swt/internal/gtk/GdkColor.java
+++ b/org/eclipse/swt/internal/gtk/GdkColor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,9 +16,13 @@ package org.eclipse.swt.internal.gtk;
public class GdkColor {
+ /** @field cast=(guint32) */
public int pixel;
+ /** @field cast=(guint16) */
public short red;
+ /** @field cast=(guint16) */
public short green;
+ /** @field cast=(guint16) */
public short blue;
public static final int sizeof = OS.GdkColor_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkDragContext.java b/org/eclipse/swt/internal/gtk/GdkDragContext.java
old mode 100755
new mode 100644
index 11113b2..912bd5f
--- a/org/eclipse/swt/internal/gtk/GdkDragContext.java
+++ b/org/eclipse/swt/internal/gtk/GdkDragContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,14 +16,23 @@ package org.eclipse.swt.internal.gtk;
public class GdkDragContext {
- public int protocol;
- public boolean is_source;
- public int /*long*/ source_window;
- public int /*long*/ dest_window;
- public int /*long*/ targets;
- public int actions;
- public int suggested_action;
- public int action;
- public int start_time;
+ /** @field cast=(GdkDragProtocol) */
+ public int protocol;
+ /** @field cast=(gboolean) */
+ public boolean is_source;
+ /** @field cast=(GdkWindow *) */
+ public int /*long*/ source_window;
+ /** @field cast=(GdkWindow *) */
+ public int /*long*/ dest_window;
+ /** @field cast=(GList *) */
+ public int /*long*/ targets;
+ /** @field cast=(GdkDragAction) */
+ public int actions;
+ /** @field cast=(GdkDragAction) */
+ public int suggested_action;
+ /** @field cast=(GdkDragAction) */
+ public int action;
+ /** @field cast=(guint32) */
+ public int start_time;
public static final int sizeof = OS.GdkDragContext_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEvent.java b/org/eclipse/swt/internal/gtk/GdkEvent.java
old mode 100755
new mode 100644
index eadd56b..ca105e7
--- a/org/eclipse/swt/internal/gtk/GdkEvent.java
+++ b/org/eclipse/swt/internal/gtk/GdkEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,6 +16,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEvent {
+ /** @field cast=(GdkEventType) */
public int type;
public static final int sizeof = OS.GdkEvent_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventAny.java b/org/eclipse/swt/internal/gtk/GdkEventAny.java
old mode 100755
new mode 100644
index 4dc4a3e..5519285
--- a/org/eclipse/swt/internal/gtk/GdkEventAny.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventAny.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,7 +16,9 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventAny extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
public static final int sizeof = OS.GdkEventAny_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventButton.java b/org/eclipse/swt/internal/gtk/GdkEventButton.java
old mode 100755
new mode 100644
index a7b3356..68a2789
--- a/org/eclipse/swt/internal/gtk/GdkEventButton.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventButton.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,16 +16,27 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventButton extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(guint32) */
public int time;
+ /** @field cast=(gdouble) */
public double x;
+ /** @field cast=(gdouble) */
public double y;
+ /** @field cast=(gdouble *) */
public int /*long*/ axes;
+ /** @field cast=(guint) */
public int state;
+ /** @field cast=(guint) */
public int button;
+ /** @field cast=(GdkDevice *) */
public int /*long*/ device;
+ /** @field cast=(gdouble) */
public double x_root;
+ /** @field cast=(gdouble) */
public double y_root;
public static final int sizeof = OS.GdkEventButton_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventCrossing.java b/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
old mode 100755
new mode 100644
index da360c5..0c1b40e
--- a/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,16 +16,22 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventCrossing extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(GdkWindow *) */
public int /*long*/ subwindow;
public int time;
public double x;
public double y;
public double x_root;
public double y_root;
+ /** @field cast=(GdkCrossingMode) */
public int mode;
+ /** @field cast=(GdkNotifyType) */
public int detail;
+ /** @field cast=(gboolean) */
public boolean focus;
public int state;
public static final int sizeof = OS.GdkEventCrossing_sizeof();
diff --git a/org/eclipse/swt/internal/gtk/GdkEventExpose.java b/org/eclipse/swt/internal/gtk/GdkEventExpose.java
old mode 100755
new mode 100644
index 120b292..df0afac
--- a/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventExpose.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,13 +16,21 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventExpose extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field accessor=area.x */
public int area_x;
+ /** @field accessor=area.y */
public int area_y;
+ /** @field accessor=area.width */
public int area_width;
+ /** @field accessor=area.height */
public int area_height;
+ /** @field cast=(GdkRegion *) */
public int /*long*/ region;
+ /** @field cast=(gint) */
public int count;
public static final int sizeof = OS.GdkEventExpose_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventFocus.java b/org/eclipse/swt/internal/gtk/GdkEventFocus.java
old mode 100755
new mode 100644
index 8e9a41f..83d66a9
--- a/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventFocus.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventFocus extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(gint16) */
public short in;
public static final int sizeof = OS.GdkEventFocus_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventKey.java b/org/eclipse/swt/internal/gtk/GdkEventKey.java
old mode 100755
new mode 100644
index b6bbaee..423dc2e
--- a/org/eclipse/swt/internal/gtk/GdkEventKey.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventKey.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,14 +16,23 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventKey extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(guint32) */
public int time;
+ /** @field cast=(guint) */
public int state;
+ /** @field cast=(guint) */
public int keyval;
+ /** @field cast=(gint) */
public int length;
+ /** @field cast=(gchar *) */
public int /*long*/ string;
+ /** @field cast=(guint16) */
public short hardware_keycode;
- public byte group;
+ /** @field cast=(guint8) */
+ public byte group;
public static final int sizeof = OS.GdkEventKey_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventMotion.java b/org/eclipse/swt/internal/gtk/GdkEventMotion.java
old mode 100755
new mode 100644
index 4d5a0e8..c85069f
--- a/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventMotion.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,16 +16,27 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventMotion extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(guint32) */
public int time;
+ /** @field cast=(gdouble) */
public double x;
+ /** @field cast=(gdouble) */
public double y;
+ /** @field cast=(gdouble *) */
public int /*long*/ axes;
+ /** @field cast=(guint) */
public int state;
+ /** @field cast=(gint16) */
public short is_hint;
+ /** @field cast=(GdkDevice *) */
public int /*long*/ device;
+ /** @field cast=(gdouble) */
public double x_root;
+ /** @field cast=(gdouble) */
public double y_root;
public static final int sizeof = OS.GdkEventMotion_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventScroll.java b/org/eclipse/swt/internal/gtk/GdkEventScroll.java
old mode 100755
new mode 100644
index 1411873..f364cd6
--- a/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventScroll.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,15 +16,25 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventScroll extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(guint32) */
public int time;
+ /** @field cast=(gdouble) */
public double x;
+ /** @field cast=(gdouble) */
public double y;
+ /** @field cast=(guint) */
public int state;
+ /** @field cast=(GdkScrollDirection) */
public int direction;
+ /** @field cast=(GdkDevice *) */
public int /*long*/ device;
+ /** @field cast=(gdouble) */
public double x_root;
+ /** @field cast=(gdouble) */
public double y_root;
public static final int sizeof = OS.GdkEventScroll_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventVisibility.java b/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
old mode 100755
new mode 100644
index d4d0916..3613c17
--- a/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventVisibility extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
+ /** @field cast=(gint8) */
public byte send_event;
+ /** @field cast=(GdkVisibilityState) */
public int state;
public static final int sizeof = OS.GdkEventVisibility_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkEventWindowState.java b/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
old mode 100755
new mode 100644
index 94ef5a5..1a5dfdf
--- a/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+++ b/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,6 +16,7 @@ package org.eclipse.swt.internal.gtk;
public class GdkEventWindowState extends GdkEvent {
+ /** @field cast=(GdkWindow *) */
public int /*long*/ window;
public byte send_event;
public int changed_mask;
diff --git a/org/eclipse/swt/internal/gtk/GdkGCValues.java b/org/eclipse/swt/internal/gtk/GdkGCValues.java
old mode 100755
new mode 100644
index 24f1146..b05fc32
--- a/org/eclipse/swt/internal/gtk/GdkGCValues.java
+++ b/org/eclipse/swt/internal/gtk/GdkGCValues.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,29 +16,53 @@ package org.eclipse.swt.internal.gtk;
public class GdkGCValues {
+ /** @field accessor=foreground.pixel,cast=(guint32) */
public int foreground_pixel;
+ /** @field accessor=foreground.red,cast=(guint16) */
public short foreground_red;
+ /** @field accessor=foreground.green,cast=(guint16) */
public short foreground_green;
+ /** @field accessor=foreground.blue,cast=(guint16) */
public short foreground_blue;
+ /** @field accessor=background.pixel,cast=(guint32) */
public int background_pixel;
+ /** @field accessor=background.red,cast=(guint16) */
public short background_red;
+ /** @field accessor=background.green,cast=(guint16) */
public short background_green;
+ /** @field accessor=background.blue,cast=(guint16) */
public short background_blue;
+ /** @field cast=(GdkFont *) */
public int /*long*/ font;
+ /** @field cast=(GdkFunction) */
public int /*long*/ function;
+ /** @field cast=(GdkFill) */
public int fill;
+ /** @field cast=(GdkPixmap *) */
public int /*long*/ tile;
+ /** @field cast=(GdkPixmap *) */
public int /*long*/ stipple;
+ /** @field cast=(GdkPixmap *) */
public int /*long*/ clip_mask;
+ /** @field cast=(GdkSubwindowMode) */
public int subwindow_mode;
+ /** @field cast=(gint) */
public int ts_x_origin;
+ /** @field cast=(gint) */
public int ts_y_origin;
+ /** @field cast=(gint) */
public int clip_x_origin;
+ /** @field cast=(gint) */
public int clip_y_origin;
+ /** @field cast=(gint) */
public int graphics_exposures;
+ /** @field cast=(gint) */
public int line_width;
+ /** @field cast=(GdkLineStyle) */
public int line_style;
+ /** @field cast=(GdkCapStyle) */
public int cap_style;
+ /** @field cast=(GdkJoinStyle) */
public int join_style;
public static final int sizeof = OS.GdkGCValues_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkGeometry.java b/org/eclipse/swt/internal/gtk/GdkGeometry.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/GdkImage.java b/org/eclipse/swt/internal/gtk/GdkImage.java
old mode 100755
new mode 100644
index 185772e..e0dcf54
--- a/org/eclipse/swt/internal/gtk/GdkImage.java
+++ b/org/eclipse/swt/internal/gtk/GdkImage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,16 +16,28 @@ package org.eclipse.swt.internal.gtk;
public class GdkImage {
+ /** @field cast=(GdkImageType) */
public int type;
+ /** @field cast=(GdkVisual *) */
public int /*long*/ visual;
+ /** @field cast=(GdkByteOrder) */
public int byte_order;
+ /** @field cast=(gint) */
public int width;
+ /** @field cast=(gint) */
public int height;
+ /** @field cast=(guint16) */
public short depth;
+ /** @field cast=(guint16) */
public short bpp;
+ /** @field cast=(guint16) */
public short bpl;
+ /** @field cast=(guint16) */
public short bits_per_pixel;
+ /** @field cast=(gpointer) */
public int /*long*/ mem;
+ /** @field cast=(GdkColormap *) */
public int /*long*/ colormap;
+ /** @field cast=(gpointer) */
public int /*long*/ windowing_data;
}
diff --git a/org/eclipse/swt/internal/gtk/GdkRectangle.java b/org/eclipse/swt/internal/gtk/GdkRectangle.java
old mode 100755
new mode 100644
index 7331c02..8224eb7
--- a/org/eclipse/swt/internal/gtk/GdkRectangle.java
+++ b/org/eclipse/swt/internal/gtk/GdkRectangle.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,9 +16,13 @@ package org.eclipse.swt.internal.gtk;
public class GdkRectangle {
+ /** @field cast=(gint) */
public int x;
+ /** @field cast=(gint) */
public int y;
+ /** @field cast=(gint) */
public int width;
+ /** @field cast=(gint) */
public int height;
public static final int sizeof = OS.GdkRectangle_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GdkVisual.java b/org/eclipse/swt/internal/gtk/GdkVisual.java
old mode 100755
new mode 100644
index 99e0688..7cf0b4b
--- a/org/eclipse/swt/internal/gtk/GdkVisual.java
+++ b/org/eclipse/swt/internal/gtk/GdkVisual.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,18 +16,32 @@ package org.eclipse.swt.internal.gtk;
public class GdkVisual {
+ /** @field cast=(GdkVisualType) */
public int type;
+ /** @field cast=(gint) */
public int depth;
+ /** @field cast=(GdkByteOrder) */
public int byte_order;
+ /** @field cast=(gint) */
public int colormap_size;
+ /** @field cast=(gint) */
public int bits_per_rgb;
+ /** @field cast=(guint32) */
public int red_mask;
+ /** @field cast=(gint) */
public int red_shift;
+ /** @field cast=(gint) */
public int red_prec;
+ /** @field cast=(guint32) */
public int green_mask;
+ /** @field cast=(gint) */
public int green_shift;
+ /** @field cast=(gint) */
public int green_prec;
+ /** @field cast=(guint32) */
public int blue_mask;
+ /** @field cast=(gint) */
public int blue_shift;
+ /** @field cast=(gint) */
public int blue_prec;
}
diff --git a/org/eclipse/swt/internal/gtk/GdkWindowAttr.java b/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
old mode 100755
new mode 100644
index 452d9dd..33e9930
--- a/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+++ b/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,17 +16,23 @@ package org.eclipse.swt.internal.gtk;
public class GdkWindowAttr {
+ /** @field cast=(gchar *) */
public int /*long*/ title;
public int event_mask;
public int x, y;
public int width;
public int height;
public int wclass;
+ /** @field cast=(GdkVisual *) */
public int /*long*/ visual;
+ /** @field cast=(GdkColormap *) */
public int /*long*/ colormap;
public int window_type;
+ /** @field cast=(GdkCursor *) */
public int /*long*/ cursor;
+ /** @field cast=(gchar *) */
public int /*long*/ wmclass_name;
+ /** @field cast=(gchar *) */
public int /*long*/ wmclass_class;
public boolean override_redirect;
public static final int sizeof = OS.GdkWindowAttr_sizeof();
diff --git a/org/eclipse/swt/internal/gtk/GtkAdjustment.java b/org/eclipse/swt/internal/gtk/GtkAdjustment.java
old mode 100755
new mode 100644
index efb2c83..abc22d8
--- a/org/eclipse/swt/internal/gtk/GtkAdjustment.java
+++ b/org/eclipse/swt/internal/gtk/GtkAdjustment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,10 +16,16 @@ package org.eclipse.swt.internal.gtk;
public class GtkAdjustment {
+ /** @field cast=(gdouble) */
public double lower;
+ /** @field cast=(gdouble) */
public double upper;
+ /** @field cast=(gdouble) */
public double value;
+ /** @field cast=(gdouble) */
public double step_increment;
+ /** @field cast=(gdouble) */
public double page_increment;
+ /** @field cast=(gdouble) */
public double page_size;
}
diff --git a/org/eclipse/swt/internal/gtk/GtkAllocation.java b/org/eclipse/swt/internal/gtk/GtkAllocation.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/GtkBorder.java b/org/eclipse/swt/internal/gtk/GtkBorder.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java b/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
old mode 100755
new mode 100644
index 6c8be50..d82483b
--- a/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+++ b/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,6 +16,8 @@ package org.eclipse.swt.internal.gtk;
public class GtkCellRendererClass {
+ /** @field cast=(void(*)()) */
public int /*long*/ render;
+ /** @field cast=(void(*)()) */
public int /*long*/ get_size;
}
diff --git a/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java b/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
old mode 100755
new mode 100644
index 6b72a6f..b94ccfa
--- a/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+++ b/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,12 @@ package org.eclipse.swt.internal.gtk;
public class GtkColorSelectionDialog {
+ /** @field cast=(GtkWidget *) */
public int /*long*/ colorsel;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ ok_button;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ cancel_button;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ help_button;
}
diff --git a/org/eclipse/swt/internal/gtk/GtkCombo.java b/org/eclipse/swt/internal/gtk/GtkCombo.java
old mode 100755
new mode 100644
index e0888d6..d9e4a58
--- a/org/eclipse/swt/internal/gtk/GtkCombo.java
+++ b/org/eclipse/swt/internal/gtk/GtkCombo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,6 +16,8 @@ package org.eclipse.swt.internal.gtk;
public class GtkCombo {
+ /** @field cast=(GtkWidget *) */
public int /*long*/ entry;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ list;
}
diff --git a/org/eclipse/swt/internal/gtk/GtkFileSelection.java b/org/eclipse/swt/internal/gtk/GtkFileSelection.java
old mode 100755
new mode 100644
index a66d4c6..8e0d862
--- a/org/eclipse/swt/internal/gtk/GtkFileSelection.java
+++ b/org/eclipse/swt/internal/gtk/GtkFileSelection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,24 +16,44 @@ package org.eclipse.swt.internal.gtk;
public class GtkFileSelection {
+ /** @field cast=(GtkWidget *) */
public int /*long*/ dir_list;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ file_list;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ selection_entry;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ selection_text;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ main_vbox;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ ok_button;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ cancel_button;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ help_button;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ history_pulldown;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ history_menu;
+ /** @field cast=(GList *) */
public int /*long*/ history_list;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ fileop_dialog;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ fileop_entry;
+ /** @field cast=(gchar *) */
public int /*long*/ fileop_file;
+ /** @field cast=(gpointer) */
public int /*long*/ cmpl_state; // gpointer
+ /** @field cast=(GtkWidget *) */
public int /*long*/ fileop_c_dir;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ fileop_del_file;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ fileop_ren_file;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ button_area;
+ /** @field cast=(GtkWidget *) */
public int /*long*/ action_area;
}
diff --git a/org/eclipse/swt/internal/gtk/GtkFixed.java b/org/eclipse/swt/internal/gtk/GtkFixed.java
old mode 100755
new mode 100644
index 630270e..93b1af7
--- a/org/eclipse/swt/internal/gtk/GtkFixed.java
+++ b/org/eclipse/swt/internal/gtk/GtkFixed.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,5 +16,6 @@ package org.eclipse.swt.internal.gtk;
public class GtkFixed {
+ /** @field cast=(GList *) */
public int /*long*/ children;
}
diff --git a/org/eclipse/swt/internal/gtk/GtkRequisition.java b/org/eclipse/swt/internal/gtk/GtkRequisition.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/GtkSelectionData.java b/org/eclipse/swt/internal/gtk/GtkSelectionData.java
old mode 100755
new mode 100644
index 55fede4..6c413af
--- a/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+++ b/org/eclipse/swt/internal/gtk/GtkSelectionData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,11 +16,17 @@ package org.eclipse.swt.internal.gtk;
public class GtkSelectionData {
+ /** @field cast=(GdkAtom) */
public int /*long*/ selection;
+ /** @field cast=(GdkAtom) */
public int /*long*/ target;
+ /** @field cast=(GdkAtom) */
public int /*long*/ type;
+ /** @field cast=(gint) */
public int format;
+ /** @field cast=(guchar *) */
public int /*long*/ data;
+ /** @field cast=(gint) */
public int length;
public static final int sizeof = OS.GtkSelectionData_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GtkTargetEntry.java b/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
old mode 100755
new mode 100644
index d9ee1ad..cf31774
--- a/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+++ b/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetEntry {
+ /** @field cast=(gchar *) */
public int /*long*/ target;
+ /** @field cast=(guint) */
public int flags;
+ /** @field cast=(guint) */
public int info;
public static final int sizeof = OS.GtkTargetEntry_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GtkTargetPair.java b/org/eclipse/swt/internal/gtk/GtkTargetPair.java
old mode 100755
new mode 100644
index 4433e5b..c98fb12
--- a/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+++ b/org/eclipse/swt/internal/gtk/GtkTargetPair.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class GtkTargetPair {
+ /** @field cast=(GdkAtom) */
public int /*long*/ target;
+ /** @field cast=(guint) */
public int flags;
+ /** @field cast=(guint) */
public int info;
public static final int sizeof = OS.GtkTargetPair_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/GtkWidgetClass.java b/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
old mode 100755
new mode 100644
index 051757a..691a60f
--- a/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+++ b/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -18,66 +18,128 @@ package org.eclipse.swt.internal.gtk;
public class GtkWidgetClass extends GObjectClass {
public int activate_signal;
public int set_scroll_adjustments_signal;
+ /** @field cast=(void(*)()) */
public int /*long*/ dispatch_child_properties_changed;
+ /** @field cast=(void(*)()) */
public int /*long*/ show;
+ /** @field cast=(void(*)()) */
public int /*long*/ show_all;
+ /** @field cast=(void(*)()) */
public int /*long*/ hide;
+ /** @field cast=(void(*)()) */
public int /*long*/ hide_all;
+ /** @field cast=(void(*)()) */
public int /*long*/ map;
+ /** @field cast=(void(*)()) */
public int /*long*/ unmap;
+ /** @field cast=(void(*)()) */
public int /*long*/ realize;
+ /** @field cast=(void(*)()) */
public int /*long*/ unrealize;
+ /** @field cast=(void(*)()) */
public int /*long*/ size_request;
+ /** @field cast=(void(*)()) */
public int /*long*/ size_allocate;
+ /** @field cast=(void(*)()) */
public int /*long*/ state_changed;
+ /** @field cast=(void(*)()) */
public int /*long*/ parent_set;
+ /** @field cast=(void(*)()) */
public int /*long*/ hierarchy_changed;
+ /** @field cast=(void(*)()) */
public int /*long*/ style_set;
+ /** @field cast=(void(*)()) */
public int /*long*/ direction_changed;
+ /** @field cast=(void(*)()) */
public int /*long*/ grab_notify;
+ /** @field cast=(void(*)()) */
public int /*long*/ child_notify;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ mnemonic_activate;
+ /** @field cast=(void(*)()) */
public int /*long*/ grab_focus;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ focus;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ button_press_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ button_release_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ scroll_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ motion_notify_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ delete_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ destroy_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ expose_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ key_press_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ key_release_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ enter_notify_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ leave_notify_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ configure_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ focus_in_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ focus_out_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ map_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ unmap_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ property_notify_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ selection_clear_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ selection_request_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ selection_notify_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ proximity_in_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ proximity_out_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ visibility_notify_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ client_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ no_expose_event;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ window_state_event;
+ /** @field cast=(void(*)()) */
public int /*long*/ selection_get;
+ /** @field cast=(void(*)()) */
public int /*long*/ selection_received;
+ /** @field cast=(void(*)()) */
public int /*long*/ drag_begin;
+ /** @field cast=(void(*)()) */
public int /*long*/ drag_end;
+ /** @field cast=(void(*)()) */
public int /*long*/ drag_data_get;
+ /** @field cast=(void(*)()) */
public int /*long*/ drag_data_delete;
+ /** @field cast=(void(*)()) */
public int /*long*/ drag_leave;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ drag_motion;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ drag_drop;
+ /** @field cast=(void(*)()) */
public int /*long*/ drag_data_received;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ popup_menu;
+ /** @field cast=(gboolean(*)()) */
public int /*long*/ show_help;
+ /** @field cast=(AtkObject*(*)()) */
public int /*long*/ get_accessible;
+ /** @field cast=(void(*)()) */
public int /*long*/ screen_changed;
}
diff --git a/org/eclipse/swt/internal/gtk/OS.java b/org/eclipse/swt/internal/gtk/OS.java
old mode 100755
new mode 100644
index 7613168..29323e0
--- a/org/eclipse/swt/internal/gtk/OS.java
+++ b/org/eclipse/swt/internal/gtk/OS.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2009 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
@@ -281,6 +281,8 @@ public class OS extends C {
public static final int GTK_ORIENTATION_VERTICAL = 0x1;
public static final int GTK_PACK_END = 1;
public static final int GTK_PACK_START = 0;
+ public static final int GTK_PAGE_ORIENTATION_PORTRAIT = 0;
+ public static final int GTK_PAGE_ORIENTATION_LANDSCAPE = 1;
public static final int GTK_POLICY_ALWAYS = 0x0;
public static final int GTK_POLICY_AUTOMATIC = 0x1;
public static final int GTK_POLICY_NEVER = 0x2;
@@ -355,6 +357,10 @@ public class OS extends C {
public static final int GTK_TREE_VIEW_DROP_AFTER = 1;
public static final int GTK_TREE_VIEW_DROP_INTO_OR_BEFORE = 2;
public static final int GTK_TREE_VIEW_DROP_INTO_OR_AFTER = 3;
+ public static final int GTK_TREE_VIEW_GRID_LINES_NONE = 0;
+ public static final int GTK_TREE_VIEW_GRID_LINES_HORIZONTAL = 1;
+ public static final int GTK_TREE_VIEW_GRID_LINES_VERTICAL = 2;
+ public static final int GTK_TREE_VIEW_GRID_LINES_BOTH = 3;
public static final int GDK_UNMAP = 15;
public static final int GTK_UNIT_PIXEL = 0;
public static final int GTK_UNIT_POINTS = 1;
@@ -369,6 +375,7 @@ public class OS extends C {
public static final int GTK_WINDOW_POPUP = 0x1;
public static final int GTK_WINDOW_TOPLEVEL = 0x0;
public static final int GDK_WINDOW_TYPE_HINT_DIALOG = 1;
+ public static final int GDK_WINDOW_TYPE_HINT_TOOLTIP = 10;
public static final int GTK_WRAP_NONE = 0;
public static final int GTK_WRAP_WORD = 2;
public static final int GTK_WRAP_WORD_CHAR = 3;
@@ -400,7 +407,9 @@ public class OS extends C {
public static final int PANGO_WEIGHT_NORMAL = 0x190;
public static final int PANGO_WRAP_WORD = 0;
public static final int PANGO_WRAP_WORD_CHAR = 2;
+ public static final int RTLD_GLOBAL = 0x100;
public static final int RTLD_LAZY = 1;
+ public static final int RTLD_NOW = 2;
public static final int XA_CARDINAL = 6;
public static final int XA_WINDOW = 33;
@@ -416,6 +425,7 @@ public class OS extends C {
public static final byte[] configure_event = ascii("configure-event");
public static final byte[] delete_event = ascii("delete-event");
public static final byte[] day_selected = ascii("day-selected");
+ public static final byte[] day_selected_double_click = ascii("day-selected-double-click");
public static final byte[] delete_range = ascii("delete-range");
public static final byte[] delete_text = ascii("delete-text");
public static final byte[] drag_data_delete = ascii("drag_data_delete");
@@ -453,6 +463,8 @@ public class OS extends C {
public static final byte[] realize = ascii("realize");
public static final byte[] row_activated = ascii("row-activated");
public static final byte[] row_changed = ascii("row-changed");
+ public static final byte[] row_inserted = ascii("row-inserted");
+ public static final byte[] row_deleted = ascii("row-deleted");
public static final byte[] scroll_child = ascii("scroll-child");
public static final byte[] scroll_event = ascii("scroll-event");
public static final byte[] select = ascii("select");
@@ -483,14 +495,18 @@ public class OS extends C {
public static final byte[] focus_line_width = ascii("focus-line-width");
public static final byte[] font_desc = ascii("font-desc");
public static final byte[] foreground_gdk = ascii("foreground-gdk");
+ public static final byte[] grid_line_width = ascii("grid-line-width");
+ public static final byte[] gtk_alternative_button_order = ascii("gtk-alternative-button-order");
public static final byte[] gtk_cursor_blink = ascii("gtk-cursor-blink");
public static final byte[] gtk_cursor_blink_time = ascii("gtk-cursor-blink-time");
public static final byte[] gtk_double_click_time = ascii("gtk-double-click-time");
public static final byte[] gtk_entry_select_on_focus = ascii("gtk-entry-select-on-focus");
+ public static final byte[] inner_border = ascii("inner-border");
public static final byte[] horizontal_separator = ascii("horizontal-separator");
public static final byte[] inconsistent = ascii("inconsistent");
public static final byte[] interior_focus = ascii("interior-focus");
public static final byte[] mode = ascii("mode");
+ public static final byte[] model = ascii("model");
public static final byte[] pixbuf = ascii("pixbuf");
public static final byte[] text = ascii("text");
public static final byte[] xalign = ascii("xalign");
@@ -576,32 +592,75 @@ public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
public static final native int XWindowChanges_sizeof();
public static final native int /*long*/ localeconv_decimal_point();
+/**
+ * @param path cast=(const char *)
+ * @param realPath cast=(char *)
+ */
public static final native int /*long*/ realpath(byte[] path, byte[] realPath);
/** Object private fields accessors */
+
+
+/** @param object_class cast=(GObjectClass *) */
+public static final native int /*long*/ G_OBJECT_CLASS_CONSTRUCTOR(int /*long*/ object_class);
+/**
+ * @param object_class cast=(GObjectClass *)
+ * @paramOFF constructor cast=(GObject* (*) (GType, guint, GObjectConstructParam *))
+ */
+public static final native void G_OBJECT_CLASS_SET_CONSTRUCTOR(int /*long*/ object_class, int /*long*/ constructor);
+/** @param widget cast=(GtkWidget *) */
public static final native int GTK_WIDGET_HEIGHT(int /*long*/ widget);
+/** @param widget cast=(GtkWidget *) */
public static final native int GTK_WIDGET_WIDTH(int /*long*/ widget);
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ GTK_WIDGET_WINDOW(int /*long*/ widget);
+/** @param widget cast=(GtkWidget *) */
public static final native int GTK_WIDGET_X(int /*long*/ widget);
+/** @param widget cast=(GtkWidget *) */
public static final native int GTK_WIDGET_Y(int /*long*/ widget);
+/** @param widget cast=(GtkScrolledWindow *) */
public static final native int /*long*/ GTK_SCROLLED_WINDOW_HSCROLLBAR(int /*long*/ widget);
+/** @param widget cast=(GtkScrolledWindow *) */
public static final native int /*long*/ GTK_SCROLLED_WINDOW_VSCROLLBAR(int /*long*/ widget);
+/** @param widget cast=(GtkScrolledWindow *) */
public static final native int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(int /*long*/ widget);
+/**
+ * @param acce_label cast=(GtkAccelLabel *)
+ * @param string cast=(gchar *)
+ */
public static final native void GTK_ACCEL_LABEL_SET_ACCEL_STRING(int /*long*/ acce_label, int /*long*/ string);
+/** @param acce_label cast=(GtkAccelLabel *) */
public static final native int /*long*/ GTK_ACCEL_LABEL_GET_ACCEL_STRING(int /*long*/ acce_label);
+/** @param widget cast=(GtkEntry *) */
public static final native int /*long*/ GTK_ENTRY_IM_CONTEXT(int /*long*/ widget);
+/** @param widget cast=(GtkTextView *) */
public static final native int /*long*/ GTK_TEXTVIEW_IM_CONTEXT(int /*long*/ widget);
+/** @param widget cast=(GtkTooltips *) */
public static final native int /*long*/ GTK_TOOLTIPS_TIP_WINDOW(int /*long*/ widget);
+/**
+ * @param widget cast=(GtkTooltips *)
+ * @param data cast=(GtkTooltipsData *)
+ */
public static final native void GTK_TOOLTIPS_SET_ACTIVE(int /*long*/ widget, int /*long*/ data);
+/** @param widget cast=(GtkWidget *) */
public static final native void GTK_WIDGET_SET_HEIGHT(int /*long*/ widget, int height);
+/** @param widget cast=(GtkWidget *) */
public static final native void GTK_WIDGET_SET_WIDTH(int /*long*/ widget, int width);
+/** @param widget cast=(GtkWidget *) */
public static final native void GTK_WIDGET_SET_X(int /*long*/ widget, int x);
+/** @param widget cast=(GtkWidget *) */
public static final native void GTK_WIDGET_SET_Y(int /*long*/ widget, int y);
+/** @param widget cast=(GtkWidget *) */
public static final native int GTK_WIDGET_REQUISITION_WIDTH(int /*long*/ widget);
+/** @param widget cast=(GtkWidget *) */
public static final native int GTK_WIDGET_REQUISITION_HEIGHT(int /*long*/ widget);
+/** @param event cast=(GdkEvent *) */
public static final native int GDK_EVENT_TYPE(int /*long*/ event);
+/** @param event cast=(GdkEventAny *) */
public static final native int /*long*/ GDK_EVENT_WINDOW(int /*long*/ event);
+/** @param xevent cast=(XEvent *) */
public static final native int X_EVENT_TYPE(int /*long*/ xevent);
+/** @param xevent cast=(XAnyEvent *) */
public static final native int /*long*/ X_EVENT_WINDOW(int /*long*/ xevent);
/** X11 Native methods and constants */
@@ -654,7 +713,9 @@ public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0,
lock.unlock();
}
}
+/** @method flags=no_gen */
public static final native boolean GDK_WINDOWING_X11();
+/** @param pixmap cast=(GdkPixmap *) */
public static final native int /*long*/ _GDK_PIXMAP_XID(int /*long*/ pixmap);
public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
lock.lock();
@@ -664,6 +725,11 @@ public static final int /*long*/ GDK_PIXMAP_XID(int /*long*/ pixmap) {
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param event_mask cast=(long)
+ * @param event_return cast=(XEvent *)
+ */
public static final native boolean _XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return);
public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ event_mask, int /*long*/ event_return) {
lock.lock();
@@ -673,6 +739,12 @@ public static final boolean XCheckMaskEvent(int /*long*/ display, int /*long*/ e
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param window cast=(Window)
+ * @param event_mask cast=(long)
+ * @param event_return cast=(XEvent *)
+ */
public static final native boolean _XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return);
public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/ window, int /*long*/ event_mask, int /*long*/ event_return) {
lock.lock();
@@ -682,6 +754,12 @@ public static final boolean XCheckWindowEvent(int /*long*/ display, int /*long*/
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param event_return cast=(XEvent *)
+ * @param predicate cast=(Bool (*)())
+ * @param arg cast=(XPointer)
+ */
public static final native boolean _XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg);
public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ event_return, int /*long*/ predicate, int /*long*/ arg) {
lock.lock();
@@ -691,6 +769,7 @@ public static final boolean XCheckIfEvent(int /*long*/ display, int /*long*/ eve
lock.unlock();
}
}
+/** @param display cast=(Display *) */
public static final native int _XDefaultScreen(int /*long*/ display);
public static final int XDefaultScreen(int /*long*/ display) {
lock.lock();
@@ -700,6 +779,7 @@ public static final int XDefaultScreen(int /*long*/ display) {
lock.unlock();
}
}
+/** @param display cast=(Display *) */
public static final native int /*long*/ _XDefaultRootWindow(int /*long*/ display);
public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
lock.lock();
@@ -709,6 +789,7 @@ public static final int /*long*/ XDefaultRootWindow(int /*long*/ display) {
lock.unlock();
}
}
+/** @param display cast=(Display *) */
public static final native void _XFlush(int /*long*/ display);
public static final void XFlush(int /*long*/ display) {
lock.lock();
@@ -718,6 +799,7 @@ public static final void XFlush(int /*long*/ display) {
lock.unlock();
}
}
+/** @param address cast=(void *) */
public static final native void _XFree(int /*long*/ address);
public static final void XFree(int /*long*/ address) {
lock.lock();
@@ -727,6 +809,10 @@ public static final void XFree(int /*long*/ address) {
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param selection cast=(Atom)
+ */
public static final native int /*long*/ _XGetSelectionOwner(int /*long*/ display, int /*long*/ selection);
public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*long*/ selection) {
lock.lock();
@@ -736,6 +822,11 @@ public static final int /*long*/ XGetSelectionOwner(int /*long*/ display, int /*
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param name cast=(char *)
+ * @param ifExists cast=(Bool)
+ */
public static final native int /*long*/ _XInternAtom(int /*long*/ display, byte[] name, boolean ifExists);
public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name, boolean ifExists) {
lock.lock();
@@ -745,6 +836,17 @@ public static final int /*long*/ XInternAtom(int /*long*/ display, byte[] name,
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param w cast=(Window)
+ * @param root_return cast=(Window *)
+ * @param child_return cast=(Window *)
+ * @param root_x_return cast=(int *)
+ * @param root_y_return cast=(int *)
+ * @param win_x_return cast=(int *)
+ * @param win_y_return cast=(int *)
+ * @param mask_return cast=(unsigned int *)
+ */
public static final native int _XQueryPointer(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) {
lock.lock();
@@ -754,6 +856,14 @@ public static final int XQueryPointer(int /*long*/ display, int /*long*/ w, int
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param w cast=(Window)
+ * @param root_return cast=(Window *)
+ * @param parent_return cast=(Window *)
+ * @param children_return cast=(Window **)
+ * @param nchildren_return cast=(unsigned int *)
+ */
public static final native int _XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return);
public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*long*/[] root_return, int /*long*/[] parent_return, int /*long*/[] children_return, int[] nchildren_return) {
lock.lock();
@@ -763,6 +873,10 @@ public static final int XQueryTree(int /*long*/ display, int /*long*/ w, int /*l
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param keysym cast=(KeySym)
+ */
public static final native int _XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym);
public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keysym) {
lock.lock();
@@ -772,6 +886,11 @@ public static final int XKeysymToKeycode(int /*long*/ display, int /*long*/ keys
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param window cast=(Window)
+ * @param num_prop_return cast=(int *)
+ */
public static final native int /*long*/ _XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return);
public static final int /*long*/ XListProperties(int /*long*/ display, int /*long*/ window, int[] num_prop_return) {
lock.lock();
@@ -781,6 +900,11 @@ public static final int /*long*/ XListProperties(int /*long*/ display, int /*lon
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param window cast=(Window)
+ * @param values flags=no_out
+ */
public static final native int _XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values);
public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/ window, int screen, int valueMask, XWindowChanges values) {
lock.lock();
@@ -790,6 +914,11 @@ public static final int XReconfigureWMWindow(int /*long*/ display, int /*long*/
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param w cast=(Window)
+ * @param event_send cast=(XEvent *)
+ */
public static final native int _XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send);
public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean propogate, int /*long*/ event_mask, int /*long*/ event_send) {
lock.lock();
@@ -799,6 +928,7 @@ public static final int XSendEvent(int /*long*/ display, int /*long*/ w, boolean
lock.unlock();
}
}
+/** @param handler cast=(XIOErrorHandler) */
public static final native int /*long*/ _XSetIOErrorHandler(int /*long*/ handler);
public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
lock.lock();
@@ -808,6 +938,7 @@ public static final int /*long*/ XSetIOErrorHandler(int /*long*/ handler) {
lock.unlock();
}
}
+/** @param handler cast=(XErrorHandler) */
public static final native int /*long*/ _XSetErrorHandler(int /*long*/ handler);
public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
lock.lock();
@@ -817,6 +948,10 @@ public static final int /*long*/ XSetErrorHandler(int /*long*/ handler) {
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param window cast=(Window)
+ */
public static final native int _XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time);
public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window, int revert, int time) {
lock.lock();
@@ -826,6 +961,11 @@ public static final int XSetInputFocus(int /*long*/ display, int /*long*/ window
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param w cast=(Window)
+ * @param prop_window cast=(Window)
+ */
public static final native int _XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window);
public static final int XSetTransientForHint(int /*long*/ display, int /*long*/ w, int /*long*/ prop_window) {
lock.lock();
@@ -835,6 +975,7 @@ public static final int XSetTransientForHint(int /*long*/ display, int /*long*/
lock.unlock();
}
}
+/** @param display cast=(Display *) */
public static final native int /*long*/ _XSynchronize(int /*long*/ display, boolean onoff);
public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onoff) {
lock.lock();
@@ -844,6 +985,11 @@ public static final int /*long*/ XSynchronize(int /*long*/ display, boolean onof
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param is_press cast=(Bool)
+ * @param delay cast=(unsigned long)
+ */
public static final native void _XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay);
public static final void XTestFakeButtonEvent(int /*long*/ display, int button, boolean is_press, int /*long*/ delay) {
lock.lock();
@@ -853,6 +999,11 @@ public static final void XTestFakeButtonEvent(int /*long*/ display, int button,
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param is_press cast=(Bool)
+ * @param delay cast=(unsigned long)
+ */
public static final native void _XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay);
public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, boolean is_press, int /*long*/ delay) {
lock.lock();
@@ -862,6 +1013,10 @@ public static final void XTestFakeKeyEvent(int /*long*/ display, int keycode, bo
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param delay cast=(unsigned long)
+ */
public static final native void _XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay);
public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_number, int x, int y, int /*long*/ delay) {
lock.lock();
@@ -871,6 +1026,11 @@ public static final void XTestFakeMotionEvent(int /*long*/ display, int screen_n
lock.unlock();
}
}
+/**
+ * @param display cast=(Display *)
+ * @param sourceWindow cast=(Window)
+ * @param destWindow cast=(Window)
+ */
public static final native int _XWarpPointer(int /*long*/ display, int /*long*/ sourceWindow, int /*long*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY);
public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWindow, int /*long*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY) {
lock.lock();
@@ -880,6 +1040,7 @@ public static final int XWarpPointer(int /*long*/ display, int /*long*/ sourceWi
lock.unlock();
}
}
+/** @param atom cast=(GdkAtom) */
public static final native int /*long*/ _gdk_x11_atom_to_xatom(int /*long*/ atom);
public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
lock.lock();
@@ -889,6 +1050,7 @@ public static final int /*long*/ gdk_x11_atom_to_xatom(int /*long*/ atom) {
lock.unlock();
}
}
+/** @param colormap cast=(GdkColormap *) */
public static final native int /*long*/ _gdk_x11_colormap_get_xcolormap(int /*long*/ colormap);
public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ colormap) {
lock.lock();
@@ -898,6 +1060,7 @@ public static final int /*long*/ gdk_x11_colormap_get_xcolormap(int /*long*/ col
lock.unlock();
}
}
+/** @param drawable cast=(GdkDrawable *) */
public static final native int /*long*/ _gdk_x11_drawable_get_xdisplay(int /*long*/ drawable);
public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ drawable) {
lock.lock();
@@ -907,6 +1070,7 @@ public static final int /*long*/ gdk_x11_drawable_get_xdisplay(int /*long*/ draw
lock.unlock();
}
}
+/** @param drawable cast=(GdkDrawable *) */
public static final native int /*long*/ _gdk_x11_drawable_get_xid(int /*long*/ drawable);
public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable) {
lock.lock();
@@ -916,6 +1080,11 @@ public static final int /*long*/ gdk_x11_drawable_get_xid(int /*long*/ drawable)
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ * @param xvisualid cast=(VisualID)
+ */
public static final native int /*long*/ _gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid);
public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ screen, int xvisualid) {
lock.lock();
@@ -925,6 +1094,10 @@ public static final int /*long*/ gdk_x11_screen_lookup_visual(int /*long*/ scree
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ */
public static final native int /*long*/ _gdk_x11_screen_get_window_manager_name(int /*long*/ screen);
public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*long*/ screen) {
lock.lock();
@@ -934,6 +1107,7 @@ public static final int /*long*/ gdk_x11_screen_get_window_manager_name(int /*lo
lock.unlock();
}
}
+/** @param visual cast=(GdkVisual *) */
public static final native int /*long*/ _gdk_x11_visual_get_xvisual(int /*long*/ visual);
public static final int /*long*/ gdk_x11_visual_get_xvisual(int /*long*/ visual) {
lock.lock();
@@ -961,6 +1135,11 @@ public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param function cast=(GdkFilterFunc)
+ * @param data cast=(gpointer)
+ */
public static final native void _gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);
public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {
lock.lock();
@@ -970,6 +1149,11 @@ public static final void gdk_window_add_filter(int /*long*/ window, int /*long*/
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param function cast=(GdkFilterFunc)
+ * @param data cast=(gpointer)
+ */
public static final native void _gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data);
public static final void gdk_window_remove_filter(int /*long*/ window, int /*long*/ function, int /*long*/ data) {
lock.lock();
@@ -979,15 +1163,65 @@ public static final void gdk_window_remove_filter(int /*long*/ window, int /*lon
lock.unlock();
}
}
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, XButtonEvent src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, XClientMessageEvent src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, XCrossingEvent src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, XExposeEvent src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, XFocusChangeEvent src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(XButtonEvent dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(XCrossingEvent dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(XExposeEvent dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(XFocusChangeEvent dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(XVisibilityEvent dest, int /*long*/ src, int /*long*/ size);
/** X render natives and constants */
@@ -1000,6 +1234,7 @@ public static final int PictOpSrc = 1;
public static final int PictOpOver = 3;
public static final native int XRenderPictureAttributes_sizeof();
+/** @method flags=dynamic */
public static final native boolean _XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep);
public static final boolean XRenderQueryExtension(int /*long*/ display, int[] event_basep, int[] error_basep) {
lock.lock();
@@ -1009,6 +1244,7 @@ public static final boolean XRenderQueryExtension(int /*long*/ display, int[] ev
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp);
public static final int XRenderQueryVersion(int /*long*/ display, int[] major_versionp, int[] minor_versionp) {
lock.lock();
@@ -1018,6 +1254,10 @@ public static final int XRenderQueryVersion(int /*long*/ display, int[] major_ve
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param attributes flags=no_out
+ */
public static final native int /*long*/ _XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes);
public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int /*long*/ drawable, int /*long*/ format, int /*long*/ valuemask, XRenderPictureAttributes attributes) {
lock.lock();
@@ -1027,6 +1267,7 @@ public static final int /*long*/ XRenderCreatePicture(int /*long*/ display, int
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count);
public static final void XRenderSetPictureClipRectangles(int /*long*/ display, int /*long*/ picture, int xOrigin, int yOrigin, short[] rects, int count) {
lock.lock();
@@ -1036,6 +1277,7 @@ public static final void XRenderSetPictureClipRectangles(int /*long*/ display, i
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform);
public static final void XRenderSetPictureTransform(int /*long*/ display, int /*long*/ picture, int[] transform) {
lock.lock();
@@ -1045,6 +1287,7 @@ public static final void XRenderSetPictureTransform(int /*long*/ display, int /*
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _XRenderFreePicture(int /*long*/ display, int /*long*/ picture);
public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ picture) {
lock.lock();
@@ -1054,6 +1297,7 @@ public static final void XRenderFreePicture(int /*long*/ display, int /*long*/ p
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height);
public static final void XRenderComposite(int /*long*/ display, int op, int /*long*/ src, int /*long*/ mask, int /*long*/ dst, int src_x, int src_y, int mask_x, int mask_y, int dst_x, int dst_y, int width, int height) {
lock.lock();
@@ -1063,6 +1307,7 @@ public static final void XRenderComposite(int /*long*/ display, int op, int /*lo
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _XRenderFindStandardFormat(int /*long*/ display, int format);
public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display, int format) {
lock.lock();
@@ -1072,6 +1317,7 @@ public static final int /*long*/ XRenderFindStandardFormat(int /*long*/ display,
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual);
public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, int /*long*/ visual) {
lock.lock();
@@ -1084,6 +1330,7 @@ public static final int /*long*/ XRenderFindVisualFormat(int /*long*/ display, i
/** Natives */
public static final native int Call (int /*long*/ func, int /*long*/ arg0, int arg1, int arg2);
+public static final native long Call (int /*long*/ func, int /*long*/ arg0, int arg1, long arg2);
public static final native int /*long*/ _GDK_DISPLAY();
public static final int /*long*/ GDK_DISPLAY() {
lock.lock();
@@ -1102,6 +1349,7 @@ public static final int /*long*/ GDK_ROOT_PARENT() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GDK_TYPE_COLOR();
public static final int /*long*/ GDK_TYPE_COLOR() {
lock.lock();
@@ -1111,6 +1359,7 @@ public static final int /*long*/ GDK_TYPE_COLOR() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GDK_TYPE_PIXBUF();
public static final int /*long*/ GDK_TYPE_PIXBUF() {
lock.lock();
@@ -1201,6 +1450,16 @@ public static final boolean GTK_IS_PLUG(int /*long*/ obj) {
lock.unlock();
}
}
+public static final native boolean _GTK_IS_SOCKET(int /*long*/ obj);
+public static final boolean GTK_IS_SOCKET(int /*long*/ obj) {
+ lock.lock();
+ try {
+ return _GTK_IS_SOCKET(obj);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=const */
public static final native int /*long*/ _GTK_STOCK_CANCEL();
public static final int /*long*/ GTK_STOCK_CANCEL() {
lock.lock();
@@ -1210,6 +1469,7 @@ public static final int /*long*/ GTK_STOCK_CANCEL() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_STOCK_OK();
public static final int /*long*/ GTK_STOCK_OK() {
lock.lock();
@@ -1219,6 +1479,7 @@ public static final int /*long*/ GTK_STOCK_OK() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TEXT();
public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
lock.lock();
@@ -1228,6 +1489,7 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TEXT() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_PIXBUF();
public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
lock.lock();
@@ -1237,6 +1499,7 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_PIXBUF() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_TYPE_CELL_RENDERER_TOGGLE();
public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
lock.lock();
@@ -1246,6 +1509,7 @@ public static final int /*long*/ GTK_TYPE_CELL_RENDERER_TOGGLE() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_TYPE_FIXED();
public static final int /*long*/ GTK_TYPE_FIXED() {
lock.lock();
@@ -1255,6 +1519,7 @@ public static final int /*long*/ GTK_TYPE_FIXED() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_TYPE_MENU();
public static final int /*long*/ GTK_TYPE_MENU() {
lock.lock();
@@ -1264,6 +1529,7 @@ public static final int /*long*/ GTK_TYPE_MENU() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _GTK_TYPE_WIDGET();
public static final int /*long*/ GTK_TYPE_WIDGET() {
lock.lock();
@@ -1390,6 +1656,7 @@ public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _G_TYPE_BOOLEAN();
public static final int /*long*/ G_TYPE_BOOLEAN() {
lock.lock();
@@ -1399,6 +1666,7 @@ public static final int /*long*/ G_TYPE_BOOLEAN() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _G_TYPE_INT();
public static final int /*long*/ G_TYPE_INT() {
lock.lock();
@@ -1417,6 +1685,7 @@ public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _G_TYPE_STRING();
public static final int /*long*/ G_TYPE_STRING() {
lock.lock();
@@ -1435,6 +1704,7 @@ public static final int PANGO_PIXELS(int dimension) {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int /*long*/ _PANGO_TYPE_FONT_DESCRIPTION();
public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
lock.lock();
@@ -1444,6 +1714,17 @@ public static final int /*long*/ PANGO_TYPE_FONT_DESCRIPTION() {
lock.unlock();
}
}
+/** @method flags=const */
+public static final native int /*long*/ _PANGO_TYPE_LAYOUT();
+public static final int /*long*/ PANGO_TYPE_LAYOUT() {
+ lock.lock();
+ try {
+ return _PANGO_TYPE_LAYOUT();
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param handle cast=(void *) */
public static final native int _dlclose(int /*long*/ handle);
public static final int dlclose(int /*long*/ handle) {
lock.lock();
@@ -1453,6 +1734,7 @@ public static final int dlclose(int /*long*/ handle) {
lock.unlock();
}
}
+/** @param filename cast=(const char *) */
public static final native int /*long*/ _dlopen(byte[] filename, int flag);
public static final int /*long*/ dlopen(byte[] filename, int flag) {
lock.lock();
@@ -1462,6 +1744,10 @@ public static final int /*long*/ dlopen(byte[] filename, int flag) {
lock.unlock();
}
}
+/**
+ * @param handle cast=(void *)
+ * @param symbol cast=(const char *)
+ */
public static final native int /*long*/ _dlsym(int /*long*/ handle, byte[] symbol);
public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
lock.lock();
@@ -1471,6 +1757,13 @@ public static final int /*long*/ dlsym(int /*long*/ handle, byte[] symbol) {
lock.unlock();
}
}
+/**
+ * @param signal_id cast=(guint)
+ * @param detail cast=(GQuark)
+ * @param hook_func cast=(GSignalEmissionHook)
+ * @param hook_data cast=(gpointer)
+ * @param data_destroy cast=(GDestroyNotify)
+ */
public static final native int /*long*/ _g_signal_add_emission_hook(int signal_id, int detail, int /*long*/ hook_func, int /*long*/ hook_data, int /*long*/ data_destroy);
public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int detail, int /*long*/ hook_func, int /*long*/ hook_data, int /*long*/ data_destroy) {
lock.lock();
@@ -1480,6 +1773,10 @@ public static final int /*long*/ g_signal_add_emission_hook(int signal_id, int d
lock.unlock();
}
}
+/**
+ * @param signal_id cast=(guint)
+ * @param hook_id cast=(gulong)
+ */
public static final native void _g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id);
public static final void g_signal_remove_emission_hook(int signal_id, int /*long*/ hook_id) {
lock.lock();
@@ -1489,6 +1786,11 @@ public static final void g_signal_remove_emission_hook(int signal_id, int /*long
lock.unlock();
}
}
+/**
+ * @param callback_func cast=(GCallback)
+ * @param user_data cast=(gpointer)
+ * @param destroy_data cast=(GClosureNotify)
+ */
public static final native int /*long*/ _g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data);
public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int /*long*/ user_data, int /*long*/ destroy_data) {
lock.lock();
@@ -1498,6 +1800,7 @@ public static final int /*long*/ g_cclosure_new(int /*long*/ callback_func, int
lock.unlock();
}
}
+/** @param closure cast=(GClosure *) */
public static final native int /*long*/ _g_closure_ref(int /*long*/ closure);
public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
lock.lock();
@@ -1507,6 +1810,7 @@ public static final int /*long*/ g_closure_ref(int /*long*/ closure) {
lock.unlock();
}
}
+/** @param closure cast=(GClosure *) */
public static final native void _g_closure_unref(int /*long*/ closure);
public static final void g_closure_unref(int /*long*/ closure) {
lock.lock();
@@ -1516,6 +1820,7 @@ public static final void g_closure_unref(int /*long*/ closure) {
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native boolean _g_main_context_acquire(int /*long*/ context);
public static final boolean g_main_context_acquire(int /*long*/ context) {
lock.lock();
@@ -1525,6 +1830,10 @@ public static final boolean g_main_context_acquire(int /*long*/ context) {
lock.unlock();
}
}
+/**
+ * @param context cast=(GMainContext *)
+ * @param fds cast=(GPollFD *)
+ */
public static final native int _g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds);
public static final int g_main_context_check(int /*long*/ context, int max_priority, int /*long*/ fds, int n_fds) {
lock.lock();
@@ -1543,6 +1852,7 @@ public static final int /*long*/ g_main_context_default() {
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native boolean _g_main_context_iteration(int /*long*/ context, boolean may_block);
public static final boolean g_main_context_iteration(int /*long*/ context, boolean may_block) {
lock.lock();
@@ -1552,6 +1862,7 @@ public static final boolean g_main_context_iteration(int /*long*/ context, boole
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native boolean _g_main_context_pending(int /*long*/ context);
public static final boolean g_main_context_pending(int /*long*/ context) {
lock.lock();
@@ -1561,6 +1872,7 @@ public static final boolean g_main_context_pending(int /*long*/ context) {
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native int /*long*/ _g_main_context_get_poll_func(int /*long*/ context);
public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ context) {
lock.lock();
@@ -1570,6 +1882,7 @@ public static final int /*long*/ g_main_context_get_poll_func(int /*long*/ conte
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native boolean _g_main_context_prepare(int /*long*/ context, int[] priority);
public static final boolean g_main_context_prepare(int /*long*/ context, int[] priority) {
lock.lock();
@@ -1579,6 +1892,10 @@ public static final boolean g_main_context_prepare(int /*long*/ context, int[] p
lock.unlock();
}
}
+/**
+ * @param context cast=(GMainContext *)
+ * @param fds cast=(GPollFD *)
+ */
public static final native int _g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds);
public static final int g_main_context_query(int /*long*/ context, int max_priority, int[] timeout_, int /*long*/ fds, int n_fds) {
lock.lock();
@@ -1588,6 +1905,7 @@ public static final int g_main_context_query(int /*long*/ context, int max_prior
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native void _g_main_context_release(int /*long*/ context);
public static final void g_main_context_release(int /*long*/ context) {
lock.lock();
@@ -1597,7 +1915,15 @@ public static final void g_main_context_release(int /*long*/ context) {
lock.unlock();
}
}
+/** @param context cast=(GMainContext *) */
public static final native void g_main_context_wakeup(int /*long*/ context);
+/**
+ * @param opsysstring cast=(const gchar *)
+ * @param len cast=(gssize)
+ * @param bytes_read cast=(gsize *)
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _g_filename_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
lock.lock();
@@ -1607,6 +1933,11 @@ public static final int /*long*/ g_filename_to_utf8(int /*long*/ opsysstring, in
lock.unlock();
}
}
+/**
+ * @param filename cast=(const char *)
+ * @param hostname cast=(const char *)
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error);
public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*long*/ hostname, int /*long*/[] error) {
lock.lock();
@@ -1616,6 +1947,13 @@ public static final int /*long*/ g_filename_to_uri(int /*long*/ filename, int /*
lock.unlock();
}
}
+/**
+ * @param opsysstring cast=(const gchar *)
+ * @param len cast=(gssize)
+ * @param bytes_read cast=(gsize *)
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _g_filename_from_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
lock.lock();
@@ -1625,6 +1963,11 @@ public static final int /*long*/ g_filename_from_utf8(int /*long*/ opsysstring,
lock.unlock();
}
}
+/**
+ * @param uri cast=(const char *)
+ * @param hostname cast=(char **)
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error);
public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*long*/[] hostname, int /*long*/[] error) {
lock.lock();
@@ -1634,6 +1977,7 @@ public static final int /*long*/ g_filename_from_uri(int /*long*/ uri, int /*lon
lock.unlock();
}
}
+/** @param mem cast=(gpointer) */
public static final native void _g_free(int /*long*/ mem);
public static final void g_free(int /*long*/ mem) {
lock.lock();
@@ -1643,6 +1987,10 @@ public static final void g_free(int /*long*/ mem) {
lock.unlock();
}
}
+/**
+ * @param function cast=(GSourceFunc)
+ * @param data cast=(gpointer)
+ */
public static final native int _g_idle_add(int /*long*/ function, int /*long*/ data);
public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
lock.lock();
@@ -1652,6 +2000,10 @@ public static final int g_idle_add(int /*long*/ function, int /*long*/ data) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param data cast=(gpointer)
+ */
public static final native int /*long*/ _g_list_append(int /*long*/ list, int /*long*/ data);
public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ data) {
lock.lock();
@@ -1661,6 +2013,7 @@ public static final int /*long*/ g_list_append(int /*long*/ list, int /*long*/ d
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native int /*long*/ _g_list_data(int /*long*/ list);
public static final int /*long*/ g_list_data(int /*long*/ list) {
lock.lock();
@@ -1670,6 +2023,7 @@ public static final int /*long*/ g_list_data(int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native void _g_list_free(int /*long*/ list);
public static final void g_list_free(int /*long*/ list) {
lock.lock();
@@ -1679,6 +2033,7 @@ public static final void g_list_free(int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native void _g_list_free_1(int /*long*/ list);
public static final void g_list_free_1(int /*long*/ list) {
lock.lock();
@@ -1688,6 +2043,7 @@ public static final void g_list_free_1(int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native int _g_list_length(int /*long*/ list);
public static final int g_list_length(int /*long*/ list) {
lock.lock();
@@ -1697,6 +2053,10 @@ public static final int g_list_length(int /*long*/ list) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param llist cast=(GList *)
+ */
public static final native void _g_list_set_next(int /*long*/ list, int /*long*/ llist);
public static final void g_list_set_next(int /*long*/ list, int /*long*/ llist) {
lock.lock();
@@ -1715,6 +2075,10 @@ public static final int /*long*/ g_list_next(int /*long*/ list) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param n cast=(guint)
+ */
public static final native int /*long*/ _g_list_nth(int /*long*/ list, int n);
public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
lock.lock();
@@ -1724,6 +2088,10 @@ public static final int /*long*/ g_list_nth(int /*long*/ list, int n) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param n cast=(guint)
+ */
public static final native int /*long*/ _g_list_nth_data(int /*long*/ list, int n);
public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
lock.lock();
@@ -1733,6 +2101,10 @@ public static final int /*long*/ g_list_nth_data(int /*long*/ list, int n) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param data cast=(gpointer)
+ */
public static final native int /*long*/ _g_list_prepend(int /*long*/ list, int /*long*/ data);
public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/ data) {
lock.lock();
@@ -1742,6 +2114,10 @@ public static final int /*long*/ g_list_prepend(int /*long*/ list, int /*long*/
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param llist cast=(GList *)
+ */
public static final native void _g_list_set_previous(int /*long*/ list, int /*long*/ llist);
public static final void g_list_set_previous(int /*long*/ list, int /*long*/ llist) {
lock.lock();
@@ -1760,6 +2136,10 @@ public static final int /*long*/ g_list_previous(int /*long*/ list) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GList *)
+ * @param link cast=(GList *)
+ */
public static final native int /*long*/ _g_list_remove_link(int /*long*/ list, int /*long*/ link);
public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*long*/ link) {
lock.lock();
@@ -1769,6 +2149,7 @@ public static final int /*long*/ g_list_remove_link(int /*long*/ list, int /*lon
lock.unlock();
}
}
+/** @param list cast=(GList *) */
public static final native int /*long*/ _g_list_reverse(int /*long*/ list);
public static final int /*long*/ g_list_reverse(int /*long*/ list) {
lock.lock();
@@ -1778,6 +2159,13 @@ public static final int /*long*/ g_list_reverse(int /*long*/ list) {
lock.unlock();
}
}
+/**
+ * @param utf8string cast=(const gchar *)
+ * @param len cast=(gssize)
+ * @param bytes_read cast=(gsize *)
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
lock.lock();
@@ -1787,6 +2175,13 @@ public static final int /*long*/ g_locale_from_utf8(int /*long*/ utf8string, int
lock.unlock();
}
}
+/**
+ * @param opsysstring cast=(const gchar *)
+ * @param len cast=(gssize)
+ * @param bytes_read cast=(gsize *)
+ * @param bytes_written cast=(gsize *)
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error);
public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int /*long*/ len, int /*long*/[] bytes_read, int /*long*/[] bytes_written, int /*long*/[] error) {
lock.lock();
@@ -1796,6 +2191,12 @@ public static final int /*long*/ g_locale_to_utf8(int /*long*/ opsysstring, int
lock.unlock();
}
}
+/**
+ * @param log_domain cast=(gchar *)
+ * @param log_levels cast=(GLogLevelFlags)
+ * @param message cast=(gchar *)
+ * @param unused_data cast=(gpointer)
+ */
public static final native void _g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data);
public static final void g_log_default_handler(int /*long*/ log_domain, int log_levels, int /*long*/ message, int /*long*/ unused_data) {
lock.lock();
@@ -1805,6 +2206,10 @@ public static final void g_log_default_handler(int /*long*/ log_domain, int log_
lock.unlock();
}
}
+/**
+ * @param log_domain cast=(gchar *),flags=no_out
+ * @param handler_id cast=(gint)
+ */
public static final native void _g_log_remove_handler(byte[] log_domain, int handler_id);
public static final void g_log_remove_handler(byte[] log_domain, int handler_id) {
lock.lock();
@@ -1814,6 +2219,12 @@ public static final void g_log_remove_handler(byte[] log_domain, int handler_id)
lock.unlock();
}
}
+/**
+ * @param log_domain cast=(gchar *),flags=no_out
+ * @param log_levels cast=(GLogLevelFlags)
+ * @param log_func cast=(GLogFunc)
+ * @param user_data cast=(gpointer)
+ */
public static final native int _g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data);
public static final int g_log_set_handler(byte[] log_domain, int log_levels, int /*long*/ log_func, int /*long*/ user_data) {
lock.lock();
@@ -1823,6 +2234,7 @@ public static final int g_log_set_handler(byte[] log_domain, int log_levels, int
lock.unlock();
}
}
+/** @param size cast=(gulong) */
public static final native int /*long*/ _g_malloc(int /*long*/ size);
public static final int /*long*/ g_malloc(int /*long*/ size) {
lock.lock();
@@ -1832,6 +2244,11 @@ public static final int /*long*/ g_malloc(int /*long*/ size) {
lock.unlock();
}
}
+/**
+ * @param object cast=(GObject *)
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator);
public static final void g_object_get(int /*long*/ object, byte[] first_property_name, int[] value, int /*long*/ terminator) {
lock.lock();
@@ -1841,6 +2258,10 @@ public static final void g_object_get(int /*long*/ object, byte[] first_property
lock.unlock();
}
}
+/**
+ * @param object cast=(GObject *)
+ * @param quark cast=(GQuark)
+ */
public static final native int /*long*/ _g_object_get_qdata(int /*long*/ object, int quark);
public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int quark) {
lock.lock();
@@ -1850,6 +2271,10 @@ public static final int /*long*/ g_object_get_qdata(int /*long*/ object, int qua
lock.unlock();
}
}
+/**
+ * @param type cast=(GType)
+ * @param first_property_name cast=(const gchar *)
+ */
public static final native int /*long*/ _g_object_new (int /*long*/ type, int /*long*/ first_property_name);
public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ first_property_name) {
lock.lock();
@@ -1859,6 +2284,20 @@ public static final int /*long*/ g_object_new (int /*long*/ type, int /*long*/ f
lock.unlock();
}
}
+/**
+ * @param object cast=(GObject *)
+ * @param property_name cast=(const gchar *)
+ */
+public static final native void _g_object_notify (int /*long*/ object, byte[] property_name);
+public static final void g_object_notify (int /*long*/ object, byte[] property_name) {
+ lock.lock();
+ try {
+ _g_object_notify(object, property_name);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param object cast=(gpointer) */
public static final native int /*long*/ _g_object_ref(int /*long*/ object);
public static final int /*long*/ g_object_ref(int /*long*/ object) {
lock.lock();
@@ -1868,6 +2307,11 @@ public static final int /*long*/ g_object_ref(int /*long*/ object) {
lock.unlock();
}
}
+/**
+ * @param object cast=(gpointer)
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator);
public static final void g_object_set(int /*long*/ object, byte[] first_property_name, boolean data, int /*long*/ terminator) {
lock.lock();
@@ -1877,6 +2321,11 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
lock.unlock();
}
}
+/**
+ * @param object cast=(gpointer)
+ * @param first_property_name cast=(const gchar *)
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator);
public static final void g_object_set(int /*long*/ object, byte[] first_property_name, GdkColor data, int /*long*/ terminator) {
lock.lock();
@@ -1886,6 +2335,11 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
lock.unlock();
}
}
+/**
+ * @param object cast=(gpointer)
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator);
public static final void g_object_set(int /*long*/ object, byte[] first_property_name, int data, int /*long*/ terminator) {
lock.lock();
@@ -1895,6 +2349,11 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
lock.unlock();
}
}
+/**
+ * @param object cast=(gpointer)
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator);
public static final void g_object_set(int /*long*/ object, byte[] first_property_name, float data, int /*long*/ terminator) {
lock.lock();
@@ -1904,6 +2363,11 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
lock.unlock();
}
}
+/**
+ * @param object cast=(gpointer)
+ * @param first_property_name cast=(const gchar *),flags=no_out
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator);
public static final void g_object_set(int /*long*/ object, byte[] first_property_name, long data, int /*long*/ terminator) {
lock.lock();
@@ -1913,6 +2377,11 @@ public static final void g_object_set(int /*long*/ object, byte[] first_property
lock.unlock();
}
}
+/**
+ * @param object cast=(GObject *)
+ * @param quark cast=(GQuark)
+ * @param data cast=(gpointer)
+ */
public static final native void _g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data);
public static final void g_object_set_qdata(int /*long*/ object, int quark, int /*long*/ data) {
lock.lock();
@@ -1922,6 +2391,7 @@ public static final void g_object_set_qdata(int /*long*/ object, int quark, int
lock.unlock();
}
}
+/** @param object cast=(gpointer) */
public static final native void _g_object_unref(int /*long*/ object);
public static final void g_object_unref(int /*long*/ object) {
lock.lock();
@@ -1931,6 +2401,7 @@ public static final void g_object_unref(int /*long*/ object) {
lock.unlock();
}
}
+/** @param string cast=(const gchar *),flags=no_out */
public static final native int _g_quark_from_string(byte[] string);
public static final int g_quark_from_string(byte[] string) {
lock.lock();
@@ -1940,6 +2411,7 @@ public static final int g_quark_from_string(byte[] string) {
lock.unlock();
}
}
+/** @param prgname cast=(const gchar *),flags=no_out */
public static final native void _g_set_prgname(byte[] prgname);
public static final void g_set_prgname(byte[] prgname) {
lock.lock();
@@ -1949,6 +2421,12 @@ public static final void g_set_prgname(byte[] prgname) {
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ * @param proc cast=(GCallback)
+ * @param data cast=(gpointer)
+ */
public static final native int _g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);
public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {
lock.lock();
@@ -1958,6 +2436,12 @@ public static final int g_signal_connect(int /*long*/ instance, byte[] detailed_
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *)
+ * @param closure cast=(GClosure *)
+ * @param after cast=(gboolean)
+ */
public static final native int _g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after);
public static final int g_signal_connect_closure(int /*long*/ instance, byte[] detailed_signal, int /*long*/ closure, boolean after) {
lock.lock();
@@ -1967,6 +2451,13 @@ public static final int g_signal_connect_closure(int /*long*/ instance, byte[] d
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param signal_id cast=(guint)
+ * @param detail cast=(GQuark)
+ * @param closure cast=(GClosure *)
+ * @param after cast=(gboolean)
+ */
public static final native int _g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after);
public static final int g_signal_connect_closure_by_id(int /*long*/ instance, int signal_id, int detail, int /*long*/ closure, boolean after) {
lock.lock();
@@ -1976,6 +2467,12 @@ public static final int g_signal_connect_closure_by_id(int /*long*/ instance, in
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ * @param proc cast=(GCallback)
+ * @param data cast=(gpointer)
+ */
public static final native int _g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data);
public static final int g_signal_connect_after(int /*long*/ instance, byte[] detailed_signal, int /*long*/ proc, int /*long*/ data) {
lock.lock();
@@ -1985,6 +2482,10 @@ public static final int g_signal_connect_after(int /*long*/ instance, byte[] det
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal);
public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal) {
lock.lock();
@@ -1994,6 +2495,10 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data);
public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data) {
lock.lock();
@@ -2003,6 +2508,10 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2);
public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, int /*long*/ data1, int /*long*/ data2) {
lock.lock();
@@ -2012,6 +2521,10 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
public static final native void _g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data);
public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] detailed_signal, byte [] data) {
lock.lock();
@@ -2021,6 +2534,10 @@ public static final void g_signal_emit_by_name(int /*long*/ instance, byte[] det
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param handler_id cast=(gulong)
+ */
public static final native void _g_signal_handler_disconnect(int /*long*/ instance, int handler_id);
public static final void g_signal_handler_disconnect(int /*long*/ instance, int handler_id) {
lock.lock();
@@ -2030,6 +2547,15 @@ public static final void g_signal_handler_disconnect(int /*long*/ instance, int
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param mask cast=(GSignalMatchType)
+ * @param signal_id cast=(guint)
+ * @param detail cast=(GQuark)
+ * @param closure cast=(GClosure *)
+ * @param func cast=(gpointer)
+ * @param data cast=(gpointer)
+ */
public static final native int _g_signal_handlers_block_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
public static final int g_signal_handlers_block_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
lock.lock();
@@ -2039,6 +2565,15 @@ public static final int g_signal_handlers_block_matched(int /*long*/ instance, i
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param mask cast=(GSignalMatchType)
+ * @param signal_id cast=(guint)
+ * @param detail cast=(GQuark)
+ * @param closure cast=(GClosure *)
+ * @param func cast=(gpointer)
+ * @param data cast=(gpointer)
+ */
public static final native int _g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
public static final int g_signal_handlers_disconnect_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
lock.lock();
@@ -2048,6 +2583,15 @@ public static final int g_signal_handlers_disconnect_matched(int /*long*/ instan
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param mask cast=(GSignalMatchType)
+ * @param signal_id cast=(guint)
+ * @param detail cast=(GQuark)
+ * @param closure cast=(GClosure *)
+ * @param func cast=(gpointer)
+ * @param data cast=(gpointer)
+ */
public static final native int _g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data);
public static final int g_signal_handlers_unblock_matched(int /*long*/ instance, int mask, int signal_id, int detail, int /*long*/ closure, int /*long*/ func, int /*long*/ data) {
lock.lock();
@@ -2057,6 +2601,7 @@ public static final int g_signal_handlers_unblock_matched(int /*long*/ instance,
lock.unlock();
}
}
+/** @param name cast=(const gchar *),flags=no_out */
public static final native int _g_signal_lookup (byte[] name, int /*long*/ itype);
public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
lock.lock();
@@ -2066,6 +2611,10 @@ public static final int g_signal_lookup (byte[] name, int /*long*/ itype) {
lock.unlock();
}
}
+/**
+ * @param instance cast=(gpointer)
+ * @param detailed_signal cast=(const gchar *),flags=no_out
+ */
public static final native void _g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal);
public static final void g_signal_stop_emission_by_name(int /*long*/ instance, byte[] detailed_signal) {
lock.lock();
@@ -2075,6 +2624,7 @@ public static final void g_signal_stop_emission_by_name(int /*long*/ instance, b
lock.unlock();
}
}
+/** @param tag cast=(guint) */
public static final native boolean /*long*/ _g_source_remove (int /*long*/ tag);
public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
lock.lock();
@@ -2084,6 +2634,7 @@ public static final boolean /*long*/ g_source_remove (int /*long*/ tag) {
lock.unlock();
}
}
+/** @param list cast=(GSList *) */
public static final native int /*long*/ _g_slist_data (int /*long*/ list);
public static final int /*long*/ g_slist_data (int /*long*/ list) {
lock.lock();
@@ -2093,6 +2644,7 @@ public static final int /*long*/ g_slist_data (int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GSList *) */
public static final native void _g_slist_free (int /*long*/ list);
public static final void g_slist_free (int /*long*/ list) {
lock.lock();
@@ -2102,6 +2654,7 @@ public static final void g_slist_free (int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GSList *) */
public static final native int /*long*/ _g_slist_next (int /*long*/ list);
public static final int /*long*/ g_slist_next (int /*long*/ list) {
lock.lock();
@@ -2111,6 +2664,7 @@ public static final int /*long*/ g_slist_next (int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GSList *) */
public static final native int _g_slist_length (int /*long*/ list);
public static final int g_slist_length (int /*long*/ list) {
lock.lock();
@@ -2120,6 +2674,7 @@ public static final int g_slist_length (int /*long*/ list) {
lock.unlock();
}
}
+/** @param string_array cast=(gchar **) */
public static final native void _g_strfreev(int /*long*/ string_array);
public static final void g_strfreev(int /*long*/ string_array) {
lock.lock();
@@ -2129,6 +2684,10 @@ public static final void g_strfreev(int /*long*/ string_array) {
lock.unlock();
}
}
+/**
+ * @param str cast=(const gchar *)
+ * @param endptr cast=(gchar **)
+ */
public static final native double _g_strtod(int /*long*/ str, int /*long*/[] endptr);
public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
lock.lock();
@@ -2138,6 +2697,11 @@ public static final double g_strtod(int /*long*/ str, int /*long*/[] endptr) {
lock.unlock();
}
}
+/**
+ * @param instance_type cast=(GType)
+ * @param interface_type cast=(GType)
+ * @param info cast=(const GInterfaceInfo *)
+ */
public static final native void _g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info);
public static final void g_type_add_interface_static (int /*long*/ instance_type, int /*long*/ interface_type, int /*long*/ info) {
lock.lock();
@@ -2147,6 +2711,7 @@ public static final void g_type_add_interface_static (int /*long*/ instance_type
lock.unlock();
}
}
+/** @param g_class cast=(GType) */
public static final native int /*long*/ _g_type_class_peek (int /*long*/ g_class);
public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
lock.lock();
@@ -2156,6 +2721,7 @@ public static final int /*long*/ g_type_class_peek (int /*long*/ g_class) {
lock.unlock();
}
}
+/** @param g_class cast=(gpointer) */
public static final native int /*long*/ _g_type_class_peek_parent (int /*long*/ g_class);
public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class) {
lock.lock();
@@ -2165,6 +2731,27 @@ public static final int /*long*/ g_type_class_peek_parent (int /*long*/ g_class)
lock.unlock();
}
}
+/** @param g_class cast=(GType) */
+public static final native int /*long*/ _g_type_class_ref (int /*long*/ g_class);
+public static final int /*long*/ g_type_class_ref (int /*long*/ g_class) {
+ lock.lock();
+ try {
+ return _g_type_class_ref(g_class);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param g_class cast=(gpointer) */
+public static final native void _g_type_class_unref (int /*long*/ g_class);
+public static final void g_type_class_unref (int /*long*/ g_class) {
+ lock.lock();
+ try {
+ _g_type_class_unref(g_class);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param name cast=(const gchar *) */
public static final native int /*long*/ _g_type_from_name (byte[] name);
public static final int /*long*/ g_type_from_name (byte[] name) {
lock.lock();
@@ -2174,6 +2761,7 @@ public static final int /*long*/ g_type_from_name (byte[] name) {
lock.unlock();
}
}
+/** @param iface cast=(gpointer) */
public static final native int /*long*/ _g_type_interface_peek_parent (int /*long*/ iface);
public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ iface) {
lock.lock();
@@ -2183,6 +2771,10 @@ public static final int /*long*/ g_type_interface_peek_parent (int /*long*/ ifac
lock.unlock();
}
}
+/**
+ * @param type cast=(GType)
+ * @param is_a_type cast=(GType)
+ */
public static final native boolean _g_type_is_a (int /*long*/ type, int /*long*/ is_a_type);
public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_type) {
lock.lock();
@@ -2192,6 +2784,7 @@ public static final boolean g_type_is_a (int /*long*/ type, int /*long*/ is_a_ty
lock.unlock();
}
}
+/** @param handle cast=(GType) */
public static final native int /*long*/ _g_type_name (int /*long*/ handle);
public static final int /*long*/ g_type_name (int /*long*/ handle) {
lock.lock();
@@ -2201,6 +2794,7 @@ public static final int /*long*/ g_type_name (int /*long*/ handle) {
lock.unlock();
}
}
+/** @param type cast=(GType) */
public static final native int /*long*/ _g_type_parent (int /*long*/ type);
public static final int /*long*/ g_type_parent (int /*long*/ type) {
lock.lock();
@@ -2210,6 +2804,10 @@ public static final int /*long*/ g_type_parent (int /*long*/ type) {
lock.unlock();
}
}
+/**
+ * @param type cast=(GType)
+ * @param query cast=(GTypeQuery *)
+ */
public static final native void _g_type_query (int /*long*/ type, int /*long*/ query);
public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
lock.lock();
@@ -2219,6 +2817,12 @@ public static final void g_type_query (int /*long*/ type, int /*long*/ query) {
lock.unlock();
}
}
+/**
+ * @param parent_type cast=(GType)
+ * @param type_name cast=(const gchar *)
+ * @param info cast=(const GTypeInfo *)
+ * @param flags cast=(GTypeFlags)
+ */
public static final native int /*long*/ _g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags);
public static final int /*long*/ g_type_register_static (int /*long*/ parent_type, byte[] type_name, int /*long*/ info, int flags) {
lock.lock();
@@ -2228,6 +2832,7 @@ public static final int /*long*/ g_type_register_static (int /*long*/ parent_typ
lock.unlock();
}
}
+/** @param vtable cast=(GThreadFunctions *) */
public static final native void _g_thread_init(int /*long*/ vtable);
public static final void g_thread_init(int /*long*/ vtable) {
lock.lock();
@@ -2246,6 +2851,13 @@ public static final boolean g_thread_supported() {
lock.unlock();
}
}
+/**
+ * @param str cast=(const gunichar2 *),flags=no_out critical
+ * @param len cast=(glong)
+ * @param items_read cast=(glong *),flags=critical
+ * @param items_written cast=(glong *),flags=critical
+ * @param error cast=(GError **),flags=critical
+ */
public static final native int /*long*/ _g_utf16_to_utf8(char[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
lock.lock();
@@ -2255,6 +2867,7 @@ public static final int /*long*/ g_utf16_to_utf8(char[] str, int /*long*/ len, i
lock.unlock();
}
}
+/** @param str cast=(const gchar *) */
public static final native int /*long*/ _g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset);
public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int /*long*/ offset) {
lock.lock();
@@ -2264,6 +2877,10 @@ public static final int /*long*/ g_utf8_offset_to_pointer(int /*long*/ str, int
lock.unlock();
}
}
+/**
+ * @param str cast=(const gchar *)
+ * @param pos cast=(const gchar *)
+ */
public static final native int /*long*/ _g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos);
public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int /*long*/ pos) {
lock.lock();
@@ -2273,6 +2890,7 @@ public static final int /*long*/ g_utf8_pointer_to_offset(int /*long*/ str, int
lock.unlock();
}
}
+/** @param str cast=(const gchar *) */
public static final native int /*long*/ _g_utf8_strlen(int /*long*/ str, int /*long*/ max);
public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ max) {
lock.lock();
@@ -2282,6 +2900,13 @@ public static final int /*long*/ g_utf8_strlen(int /*long*/ str, int /*long*/ ma
lock.unlock();
}
}
+/**
+ * @param str cast=(const gchar *),flags=no_out critical
+ * @param len cast=(glong)
+ * @param items_read cast=(glong *),flags=critical
+ * @param items_written cast=(glong *),flags=critical
+ * @param error cast=(GError **),flags=critical
+ */
public static final native int /*long*/ _g_utf8_to_utf16(byte[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
lock.lock();
@@ -2291,6 +2916,13 @@ public static final int /*long*/ g_utf8_to_utf16(byte[] str, int /*long*/ len, i
lock.unlock();
}
}
+/**
+ * @param str cast=(const gchar *)
+ * @param len cast=(glong)
+ * @param items_read cast=(glong *),flags=critical
+ * @param items_written cast=(glong *),flags=critical
+ * @param error cast=(GError **),flags=critical
+ */
public static final native int /*long*/ _g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error);
public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/ len, int /*long*/[] items_read, int /*long*/[] items_written, int /*long*/[] error) {
lock.lock();
@@ -2300,6 +2932,7 @@ public static final int /*long*/ g_utf8_to_utf16(int /*long*/ str, int /*long*/
lock.unlock();
}
}
+/** @param value cast=(const GValue *) */
public static final native int /*long*/ _g_value_peek_pointer (int /*long*/ value);
public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
lock.lock();
@@ -2309,6 +2942,7 @@ public static final int /*long*/ g_value_peek_pointer (int /*long*/ value) {
lock.unlock();
}
}
+/** @param atom_name cast=(const gchar *),flags=no_out critical */
public static final native int /*long*/ _gdk_atom_intern(byte[] atom_name, boolean only_if_exists);
public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) {
lock.lock();
@@ -2318,6 +2952,7 @@ public static final int /*long*/ gdk_atom_intern(byte[] atom_name, boolean only_
lock.unlock();
}
}
+/** @param atom cast=(GdkAtom) */
public static final native int /*long*/ _gdk_atom_name(int /*long*/ atom);
public static final int /*long*/ gdk_atom_name(int /*long*/ atom) {
lock.lock();
@@ -2336,6 +2971,12 @@ public static final void gdk_beep() {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param data cast=(const gchar *),flags=no_out critical
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
public static final native int /*long*/ _gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height);
public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window, byte[] data, int width, int height) {
lock.lock();
@@ -2345,6 +2986,17 @@ public static final int /*long*/ gdk_bitmap_create_from_data(int /*long*/ window
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native int /*long*/ _gdk_cairo_create(int /*long*/ drawable);
+public static final int /*long*/ gdk_cairo_create(int /*long*/ drawable) {
+ lock.lock();
+ try {
+ return _gdk_cairo_create(drawable);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
public static final native void _gdk_cairo_region(int /*long*/ cairo, int /*long*/ region);
public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ region) {
lock.lock();
@@ -2354,6 +3006,7 @@ public static final void gdk_cairo_region(int /*long*/ cairo, int /*long*/ regio
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color);
public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor color) {
lock.lock();
@@ -2363,6 +3016,10 @@ public static final void gdk_cairo_set_source_color(int /*long*/ cairo, GdkColor
lock.unlock();
}
}
+/**
+ * @param colormap cast=(GdkColormap *)
+ * @param color cast=(GdkColor *),flags=no_in
+ */
public static final native boolean _gdk_color_white(int /*long*/ colormap, GdkColor color);
public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor color) {
lock.lock();
@@ -2372,6 +3029,12 @@ public static final boolean gdk_color_white(int /*long*/ colormap, GdkColor colo
lock.unlock();
}
}
+/**
+ * @param colormap cast=(GdkColormap *)
+ * @param color cast=(GdkColor *)
+ * @param writeable cast=(gboolean)
+ * @param best_match cast=(gboolean)
+ */
public static final native boolean _gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match);
public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkColor color, boolean writeable, boolean best_match) {
lock.lock();
@@ -2381,6 +3044,11 @@ public static final boolean gdk_colormap_alloc_color(int /*long*/ colormap, GdkC
lock.unlock();
}
}
+/**
+ * @param colormap cast=(GdkColormap *)
+ * @param colors cast=(GdkColor *),flags=no_out
+ * @param ncolors cast=(gint)
+ */
public static final native void _gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors);
public static final void gdk_colormap_free_colors(int /*long*/ colormap, GdkColor colors, int ncolors) {
lock.lock();
@@ -2399,6 +3067,11 @@ public static final int /*long*/ gdk_colormap_get_system() {
lock.unlock();
}
}
+/**
+ * @param colormap cast=(GdkColormap *)
+ * @param pixel cast=(gulong)
+ * @param result cast=(GdkColor *)
+ */
public static final native void _gdk_colormap_query_color(int /*long*/ colormap, int /*long*/ pixel, GdkColor result);
public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*long*/ pixel, GdkColor result) {
lock.lock();
@@ -2408,6 +3081,7 @@ public static final void gdk_colormap_query_color(int /*long*/ colormap, int /*l
lock.unlock();
}
}
+/** @param cursor cast=(GdkCursor *) */
public static final native void _gdk_cursor_destroy(int /*long*/ cursor);
public static final void gdk_cursor_destroy(int /*long*/ cursor) {
lock.lock();
@@ -2417,6 +3091,7 @@ public static final void gdk_cursor_destroy(int /*long*/ cursor) {
lock.unlock();
}
}
+/** @param cursor_type cast=(GdkCursorType) */
public static final native int /*long*/ _gdk_cursor_new(int /*long*/ cursor_type);
public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
lock.lock();
@@ -2426,6 +3101,14 @@ public static final int /*long*/ gdk_cursor_new(int /*long*/ cursor_type) {
lock.unlock();
}
}
+/**
+ * @param source cast=(GdkPixmap *)
+ * @param mask cast=(GdkPixmap *)
+ * @param fg cast=(GdkColor *),flags=no_out
+ * @param bg cast=(GdkColor *),flags=no_out
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native int /*long*/ _gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y);
public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source, int /*long*/ mask, GdkColor fg, GdkColor bg, int x, int y) {
lock.lock();
@@ -2435,6 +3118,7 @@ public static final int /*long*/ gdk_cursor_new_from_pixmap(int /*long*/ source,
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y);
public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display, int /*long*/ pixbuf, int x, int y) {
lock.lock();
@@ -2444,6 +3128,7 @@ public static final int /*long*/ gdk_cursor_new_from_pixbuf(int /*long*/ display
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gdk_display_get_default();
public static final int /*long*/ gdk_display_get_default() {
lock.lock();
@@ -2453,6 +3138,7 @@ public static final int /*long*/ gdk_display_get_default() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native boolean _gdk_display_supports_cursor_color(int /*long*/ display);
public static final boolean gdk_display_supports_cursor_color(int /*long*/ display) {
lock.lock();
@@ -2462,6 +3148,11 @@ public static final boolean gdk_display_supports_cursor_color(int /*long*/ displ
lock.unlock();
}
}
+/**
+ * @param context cast=(GdkDragContext *)
+ * @param action cast=(GdkDragAction)
+ * @param time cast=(guint32)
+ */
public static final native void _gdk_drag_status(int /*long*/ context, int action, int time);
public static final void gdk_drag_status(int /*long*/ context, int action, int time) {
lock.lock();
@@ -2471,6 +3162,17 @@ public static final void gdk_drag_status(int /*long*/ context, int action, int t
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param filled cast=(gint)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ * @param angle1 cast=(gint)
+ * @param angle2 cast=(gint)
+ */
public static final native void _gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2);
public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2) {
lock.lock();
@@ -2480,6 +3182,17 @@ public static final void gdk_draw_arc(int /*long*/ drawable, int /*long*/ gc, in
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param src cast=(GdkDrawable *)
+ * @param xsrc cast=(gint)
+ * @param ysrc cast=(gint)
+ * @param xdest cast=(gint)
+ * @param ydest cast=(gint)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
public static final native void _gdk_draw_drawable(int /*long*/ drawable, int /*long*/ gc, int /*long*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ gc, int /*long*/ src, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
lock.lock();
@@ -2489,6 +3202,11 @@ public static final void gdk_draw_drawable(int /*long*/ drawable, int /*long*/ g
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param image cast=(GdkImage *)
+ */
public static final native void _gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc, int /*long*/ image, int xsrc, int ysrc, int xdest, int ydest, int width, int height) {
lock.lock();
@@ -2498,6 +3216,13 @@ public static final void gdk_draw_image(int /*long*/ drawable, int /*long*/ gc,
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ * @param layout cast=(PangoLayout *)
+ */
public static final native void _gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout);
public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout) {
lock.lock();
@@ -2507,6 +3232,15 @@ public static final void gdk_draw_layout(int /*long*/ drawable, int /*long*/ gc,
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ * @param layout cast=(PangoLayout *)
+ * @param foreground flags=no_out
+ * @param background flags=no_out
+ */
public static final native void _gdk_draw_layout_with_colors(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout, GdkColor foreground, GdkColor background);
public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int /*long*/ gc, int x, int y, int /*long*/ layout, GdkColor foreground, GdkColor background) {
lock.lock();
@@ -2516,6 +3250,14 @@ public static final void gdk_draw_layout_with_colors(int /*long*/ drawable, int
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param x1 cast=(gint)
+ * @param y1 cast=(gint)
+ * @param x2 cast=(gint)
+ * @param y2 cast=(gint)
+ */
public static final native void _gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2);
public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, int x1, int y1, int x2, int y2) {
lock.lock();
@@ -2525,6 +3267,12 @@ public static final void gdk_draw_line(int /*long*/ drawable, int /*long*/ gc, i
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param points cast=(GdkPoint *),flags=no_out critical
+ * @param npoints cast=(gint)
+ */
public static final native void _gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints);
public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc, int[] points, int npoints) {
lock.lock();
@@ -2534,6 +3282,21 @@ public static final void gdk_draw_lines(int /*long*/ drawable, int /*long*/ gc,
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ * @param xsrc cast=(gint)
+ * @param ysrc cast=(gint)
+ * @param xdest cast=(gint)
+ * @param ydest cast=(gint)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ * @param dither cast=(GdkRgbDither)
+ * @param x_dither cast=(gint)
+ * @param y_dither cast=(gint)
+ */
public static final native void _gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc, int /*long*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither);
public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc, int /*long*/ pixbuf, int xsrc, int ysrc, int xdest, int ydest, int width, int height, int dither, int x_dither, int y_dither) {
lock.lock();
@@ -2543,6 +3306,10 @@ public static final void gdk_draw_pixbuf(int /*long*/ drawable, int /*long*/ gc,
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ */
public static final native void _gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y);
public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc, int x, int y) {
lock.lock();
@@ -2552,6 +3319,13 @@ public static final void gdk_draw_point(int /*long*/ drawable, int /*long*/ gc,
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param filled cast=(gint)
+ * @param points cast=(GdkPoint *),flags=no_out critical
+ * @param npoints cast=(gint)
+ */
public static final native void _gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints);
public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc, int filled, int[] points, int npoints) {
lock.lock();
@@ -2561,6 +3335,15 @@ public static final void gdk_draw_polygon(int /*long*/ drawable, int /*long*/ gc
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param filled cast=(gint)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
public static final native void _gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height);
public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/ gc, int filled, int x, int y, int width, int height) {
lock.lock();
@@ -2570,6 +3353,7 @@ public static final void gdk_draw_rectangle(int /*long*/ drawable, int /*long*/
lock.unlock();
}
}
+/** @param drawable cast=(GdkDrawable *) */
public static final native int _gdk_drawable_get_depth(int /*long*/ drawable);
public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
lock.lock();
@@ -2580,6 +3364,13 @@ public static final int gdk_drawable_get_depth(int /*long*/ drawable) {
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
public static final native int /*long*/ _gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height);
public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, int x, int y, int width, int height) {
lock.lock();
@@ -2589,6 +3380,11 @@ public static final int /*long*/ gdk_drawable_get_image(int /*long*/ drawable, i
lock.unlock();
}
}
+/**
+ * @param drawable cast=(GdkDrawable *)
+ * @param width cast=(gint *),flags=no_in critical
+ * @param height cast=(gint *),flags=no_in critical
+ */
public static final native void _gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height);
public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] width, int[] height) {
lock.lock();
@@ -2598,6 +3394,7 @@ public static final void gdk_drawable_get_size(int /*long*/ drawable, int[] widt
lock.unlock();
}
}
+/** @param drawable cast=(GdkDrawable *) */
public static final native int /*long*/ _gdk_drawable_get_visible_region(int /*long*/ drawable);
public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ drawable) {
lock.lock();
@@ -2607,6 +3404,7 @@ public static final int /*long*/ gdk_drawable_get_visible_region(int /*long*/ dr
lock.unlock();
}
}
+/** @param event cast=(GdkEvent *) */
public static final native int /*long*/ _gdk_event_copy(int /*long*/ event);
public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
lock.lock();
@@ -2616,6 +3414,7 @@ public static final int /*long*/ gdk_event_copy(int /*long*/ event) {
lock.unlock();
}
}
+/** @param event cast=(GdkEvent *) */
public static final native void _gdk_event_free(int /*long*/ event);
public static final void gdk_event_free(int /*long*/ event) {
lock.lock();
@@ -2634,6 +3433,11 @@ public static final int /*long*/ gdk_event_get() {
lock.unlock();
}
}
+/**
+ * @param event cast=(GdkEvent *)
+ * @param px cast=(gdouble *)
+ * @param py cast=(gdouble *)
+ */
public static final native boolean _gdk_event_get_root_coords(int /*long*/ event, double[] px, double[] py);
public static final boolean gdk_event_get_root_coords(int /*long*/ event, double[] px, double[] py) {
lock.lock();
@@ -2643,6 +3447,11 @@ public static final boolean gdk_event_get_root_coords(int /*long*/ event, double
lock.unlock();
}
}
+/**
+ * @param event cast=(GdkEvent *)
+ * @param px cast=(gdouble *)
+ * @param py cast=(gdouble *)
+ */
public static final native boolean _gdk_event_get_coords(int /*long*/ event, double[] px, double[] py);
public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px, double[] py) {
lock.lock();
@@ -2652,6 +3461,7 @@ public static final boolean gdk_event_get_coords(int /*long*/ event, double[] px
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native int /*long*/ _gdk_event_get_graphics_expose(int /*long*/ window);
public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ window) {
lock.lock();
@@ -2661,6 +3471,10 @@ public static final int /*long*/ gdk_event_get_graphics_expose(int /*long*/ wind
lock.unlock();
}
}
+/**
+ * @param event cast=(GdkEvent *)
+ * @param pmod cast=(GdkModifierType *)
+ */
public static final native boolean _gdk_event_get_state(int /*long*/ event, int[] pmod);
public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod) {
lock.lock();
@@ -2670,6 +3484,7 @@ public static final boolean gdk_event_get_state(int /*long*/ event, int[] pmod)
lock.unlock();
}
}
+/** @param event cast=(GdkEvent *) */
public static final native int _gdk_event_get_time(int /*long*/ event);
public static final int gdk_event_get_time(int /*long*/ event) {
lock.lock();
@@ -2679,6 +3494,11 @@ public static final int gdk_event_get_time(int /*long*/ event) {
lock.unlock();
}
}
+/**
+ * @param func cast=(GdkEventFunc)
+ * @param data cast=(gpointer)
+ * @param notify cast=(GDestroyNotify)
+ */
public static final native void _gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify);
public static final void gdk_event_handler_set(int /*long*/ func, int /*long*/ data, int /*long*/ notify) {
lock.lock();
@@ -2706,6 +3526,7 @@ public static final int /*long*/ gdk_event_peek() {
lock.unlock();
}
}
+/** @param event cast=(GdkEvent *) */
public static final native void _gdk_event_put(int /*long*/ event);
public static final void gdk_event_put(int /*long*/ event) {
lock.lock();
@@ -2742,6 +3563,7 @@ public static final void gdk_flush() {
lock.unlock();
}
}
+/** @param list cast=(gchar **) */
public static final native void _gdk_free_text_list(int /*long*/ list);
public static final void gdk_free_text_list(int /*long*/ list) {
lock.lock();
@@ -2751,6 +3573,10 @@ public static final void gdk_free_text_list(int /*long*/ list) {
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param values cast=(GdkGCValues *),flags=no_in
+ */
public static final native void _gdk_gc_get_values(int /*long*/ gc, GdkGCValues values);
public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values) {
lock.lock();
@@ -2760,6 +3586,7 @@ public static final void gdk_gc_get_values(int /*long*/ gc, GdkGCValues values)
lock.unlock();
}
}
+/** @param window cast=(GdkDrawable *) */
public static final native int /*long*/ _gdk_gc_new(int /*long*/ window);
public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
lock.lock();
@@ -2769,6 +3596,10 @@ public static final int /*long*/ gdk_gc_new(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gdk_gc_set_background(int /*long*/ gc, GdkColor color);
public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color) {
lock.lock();
@@ -2778,6 +3609,10 @@ public static final void gdk_gc_set_background(int /*long*/ gc, GdkColor color)
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param mask cast=(GdkBitmap *)
+ */
public static final native void _gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask);
public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask) {
lock.lock();
@@ -2787,6 +3622,11 @@ public static final void gdk_gc_set_clip_mask(int /*long*/ gc, int /*long*/ mask
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native void _gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y);
public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
lock.lock();
@@ -2796,6 +3636,10 @@ public static final void gdk_gc_set_clip_origin(int /*long*/ gc, int x, int y) {
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_out
+ */
public static final native void _gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle);
public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle rectangle) {
lock.lock();
@@ -2805,6 +3649,10 @@ public static final void gdk_gc_set_clip_rectangle(int /*long*/ gc, GdkRectangle
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param region cast=(GdkRegion *)
+ */
public static final native void _gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region);
public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ region) {
lock.lock();
@@ -2814,6 +3662,12 @@ public static final void gdk_gc_set_clip_region(int /*long*/ gc, int /*long*/ re
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param dash_offset cast=(gint)
+ * @param dash_list cast=(gint8 *),flags=no_out critical
+ * @param n cast=(gint)
+ */
public static final native void _gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n);
public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byte[] dash_list, int n) {
lock.lock();
@@ -2823,6 +3677,10 @@ public static final void gdk_gc_set_dashes(int /*long*/ gc, int dash_offset, byt
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param exposures cast=(gboolean)
+ */
public static final native void _gdk_gc_set_exposures(int /*long*/ gc, boolean exposures);
public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures) {
lock.lock();
@@ -2832,6 +3690,10 @@ public static final void gdk_gc_set_exposures(int /*long*/ gc, boolean exposures
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param fill cast=(GdkFill)
+ */
public static final native void _gdk_gc_set_fill(int /*long*/ gc, int fill);
public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
lock.lock();
@@ -2841,6 +3703,10 @@ public static final void gdk_gc_set_fill(int /*long*/ gc, int fill) {
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gdk_gc_set_foreground(int /*long*/ gc, GdkColor color);
public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color) {
lock.lock();
@@ -2850,6 +3716,10 @@ public static final void gdk_gc_set_foreground(int /*long*/ gc, GdkColor color)
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param function cast=(GdkFunction)
+ */
public static final native void _gdk_gc_set_function(int /*long*/ gc, int /*long*/ function);
public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ function) {
lock.lock();
@@ -2859,6 +3729,13 @@ public static final void gdk_gc_set_function(int /*long*/ gc, int /*long*/ funct
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param line_width cast=(gint)
+ * @param line_style cast=(GdkLineStyle)
+ * @param cap_style cast=(GdkCapStyle)
+ * @param join_style cast=(GdkJoinStyle)
+ */
public static final native void _gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style);
public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_width, int line_style, int cap_style, int join_style) {
lock.lock();
@@ -2868,6 +3745,10 @@ public static final void gdk_gc_set_line_attributes(int /*long*/ gc, int line_wi
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param stipple cast=(GdkPixmap *)
+ */
public static final native void _gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple);
public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stipple) {
lock.lock();
@@ -2877,6 +3758,10 @@ public static final void gdk_gc_set_stipple(int /*long*/ gc, int /*long*/ stippl
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param mode cast=(GdkSubwindowMode)
+ */
public static final native void _gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode);
public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode) {
lock.lock();
@@ -2886,6 +3771,10 @@ public static final void gdk_gc_set_subwindow(int /*long*/ gc, int /*long*/ mode
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param tile cast=(GdkPixmap *)
+ */
public static final native void _gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile);
public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
lock.lock();
@@ -2895,6 +3784,7 @@ public static final void gdk_gc_set_tile(int /*long*/ gc, int /*long*/ tile) {
lock.unlock();
}
}
+/** @param gc cast=(GdkGC *) */
public static final native void _gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y);
public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
lock.lock();
@@ -2904,6 +3794,11 @@ public static final void gdk_gc_set_ts_origin(int /*long*/ gc, int x, int y) {
lock.unlock();
}
}
+/**
+ * @param gc cast=(GdkGC *)
+ * @param values cast=(GdkGCValues *),flags=no_out
+ * @param values_mask cast=(GdkGCValuesMask)
+ */
public static final native void _gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask);
public static final void gdk_gc_set_values(int /*long*/ gc, GdkGCValues values, int values_mask) {
lock.lock();
@@ -2931,6 +3826,14 @@ public static final int /*long*/ gdk_keymap_get_default() {
lock.unlock();
}
}
+/**
+ * @param keymap cast=(GdkKeymap*)
+ * @param state cast=(GdkModifierType)
+ * @param keyval cast=(guint*)
+ * @param effective_group cast=(gint*)
+ * @param level cast=(gint*)
+ * @param consumed_modifiers cast=(GdkModifierType *)
+ */
public static final native boolean _gdk_keymap_translate_keyboard_state (int /*long*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers);
public static final boolean gdk_keymap_translate_keyboard_state (int /*long*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) {
lock.lock();
@@ -2967,6 +3870,10 @@ public static final int /*long*/ gdk_pango_context_get() {
lock.unlock();
}
}
+/**
+ * @param context cast=(PangoContext *)
+ * @param colormap cast=(GdkColormap *)
+ */
public static final native void _gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap);
public static final void gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap) {
lock.lock();
@@ -2976,6 +3883,7 @@ public static final void gdk_pango_context_set_colormap(int /*long*/ context, in
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native int /*long*/ _gdk_pango_layout_get_clip_region(int /*long*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges);
public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) {
lock.lock();
@@ -2985,6 +3893,10 @@ public static final int /*long*/ gdk_pango_layout_get_clip_region(int /*long*/ l
lock.unlock();
}
}
+/**
+ * @param src_pixbuf cast=(GdkPixbuf *)
+ * @param dest_pixbuf cast=(GdkPixbuf *)
+ */
public static final native void _gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x, int src_y, int width, int height, int /*long*/ dest_pixbuf, int dest_x, int dest_y);
public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x, int src_y, int width, int height, int /*long*/ dest_pixbuf, int dest_x, int dest_y) {
lock.lock();
@@ -2994,6 +3906,11 @@ public static final void gdk_pixbuf_copy_area(int /*long*/ src_pixbuf, int src_x
lock.unlock();
}
}
+/**
+ * @param dest cast=(GdkPixbuf *)
+ * @param src cast=(GdkDrawable *)
+ * @param cmap cast=(GdkColormap *)
+ */
public static final native int /*long*/ _gdk_pixbuf_get_from_drawable(int /*long*/ dest, int /*long*/ src, int /*long*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest, int /*long*/ src, int /*long*/ cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
lock.lock();
@@ -3003,6 +3920,7 @@ public static final int /*long*/ gdk_pixbuf_get_from_drawable(int /*long*/ dest,
lock.unlock();
}
}
+/** @param pixbuf cast=(const GdkPixbuf *) */
public static final native boolean _gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf);
public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
lock.lock();
@@ -3012,6 +3930,7 @@ public static final boolean gdk_pixbuf_get_has_alpha(int /*long*/ pixbuf) {
lock.unlock();
}
}
+/** @param pixbuf cast=(const GdkPixbuf *) */
public static final native int _gdk_pixbuf_get_height(int /*long*/ pixbuf);
public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
lock.lock();
@@ -3021,6 +3940,7 @@ public static final int gdk_pixbuf_get_height(int /*long*/ pixbuf) {
lock.unlock();
}
}
+/** @param pixbuf cast=(const GdkPixbuf *) */
public static final native int /*long*/ _gdk_pixbuf_get_pixels(int /*long*/ pixbuf);
public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
lock.lock();
@@ -3030,6 +3950,7 @@ public static final int /*long*/ gdk_pixbuf_get_pixels(int /*long*/ pixbuf) {
lock.unlock();
}
}
+/** @param pixbuf cast=(const GdkPixbuf *) */
public static final native int _gdk_pixbuf_get_rowstride(int /*long*/ pixbuf);
public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
lock.lock();
@@ -3039,6 +3960,7 @@ public static final int gdk_pixbuf_get_rowstride(int /*long*/ pixbuf) {
lock.unlock();
}
}
+/** @param pixbuf cast=(const GdkPixbuf *) */
public static final native int _gdk_pixbuf_get_width(int /*long*/ pixbuf);
public static final int gdk_pixbuf_get_width(int /*long*/ pixbuf) {
lock.lock();
@@ -3057,6 +3979,10 @@ public static final int /*long*/ gdk_pixbuf_loader_new() {
lock.unlock();
}
}
+/**
+ * @param loader cast=(GdkPixbufLoader *)
+ * @param error cast=(GError **)
+ */
public static final native boolean _gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error);
public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*long*/ [] error) {
lock.lock();
@@ -3066,6 +3992,7 @@ public static final boolean gdk_pixbuf_loader_close(int /*long*/ loader, int /*l
lock.unlock();
}
}
+/** @param loader cast=(GdkPixbufLoader *) */
public static final native int /*long*/ _gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader);
public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loader) {
lock.lock();
@@ -3075,6 +4002,12 @@ public static final int /*long*/ gdk_pixbuf_loader_get_pixbuf(int /*long*/ loade
lock.unlock();
}
}
+/**
+ * @param loader cast=(GdkPixbufLoader *)
+ * @param buffer cast=(const guchar *)
+ * @param count cast=(gsize)
+ * @param error cast=(GError **)
+ */
public static final native boolean _gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error);
public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*long*/ buffer, int count, int /*long*/ [] error) {
lock.lock();
@@ -3084,6 +4017,10 @@ public static final boolean gdk_pixbuf_loader_write(int /*long*/ loader, int /*l
lock.unlock();
}
}
+/**
+ * @param colorspace cast=(GdkColorspace)
+ * @param has_alpha cast=(gboolean)
+ */
public static final native int /*long*/ _gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height);
public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) {
lock.lock();
@@ -3093,6 +4030,10 @@ public static final int /*long*/ gdk_pixbuf_new(int colorspace, boolean has_alph
lock.unlock();
}
}
+/**
+ * @param filename cast=(const char *)
+ * @param error cast=(GError**)
+ */
public static final native int /*long*/ _gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error);
public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /*long*/ [] error) {
lock.lock();
@@ -3102,6 +4043,12 @@ public static final int /*long*/ gdk_pixbuf_new_from_file(byte[] filename, int /
lock.unlock();
}
}
+/**
+ * @param pixbuf cast=(GdkPixbuf *)
+ * @param drawable cast=(GdkDrawable *)
+ * @param gc cast=(GdkGC *)
+ * @param dither cast=(GdkRgbDither)
+ */
public static final native void _gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int /*long*/ drawable, int /*long*/ gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither) {
lock.lock();
@@ -3111,6 +4058,12 @@ public static final void gdk_pixbuf_render_to_drawable(int /*long*/ pixbuf, int
lock.unlock();
}
}
+/**
+ * @param pixbuf cast=(GdkPixbuf *)
+ * @param drawable cast=(GdkDrawable *)
+ * @param alpha_mode cast=(GdkPixbufAlphaMode)
+ * @param dither cast=(GdkRgbDither)
+ */
public static final native void _gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);
public static final void gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf, int /*long*/ drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither) {
lock.lock();
@@ -3120,6 +4073,11 @@ public static final void gdk_pixbuf_render_to_drawable_alpha(int /*long*/ pixbuf
lock.unlock();
}
}
+/**
+ * @param pixbuf cast=(GdkPixbuf *)
+ * @param pixmap_return cast=(GdkDrawable **)
+ * @param mask_return cast=(GdkBitmap **)
+ */
public static final native void _gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold);
public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf, int /*long*/[] pixmap_return, int /*long*/[] mask_return, int alpha_threshold) {
lock.lock();
@@ -3129,15 +4087,33 @@ public static final void gdk_pixbuf_render_pixmap_and_mask(int /*long*/ pixbuf,
lock.unlock();
}
}
-public static final native boolean _gdk_pixbuf_save_to_buffer(int /*long*/ pixbuf, int /*long*/ [] buffer, int [] buffer_size, byte [] type, int /*long*/ [] error, byte [] terminate);
-public static final boolean gdk_pixbuf_save_to_buffer(int /*long*/ pixbuf, int /*long*/ [] buffer, int [] buffer_size, byte [] type, int /*long*/ [] error, byte [] terminate) {
+/**
+ * @method flags=dynamic
+ * @param pixbuf cast=(GdkPixbuf *)
+ * @param buffer cast=(gchar **)
+ * @param buffer_size cast=(gsize *)
+ * @param type cast=(const char *)
+ * @param option_keys=(char **)
+ * @param option_values=(char **)
+ * @param error cast=(GError **)
+ */
+public static final native boolean _gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error);
+public static final boolean gdk_pixbuf_save_to_bufferv(int /*long*/ pixbuf, int /*long*/ [] buffer, int /*long*/ [] buffer_size, byte [] type, int /*long*/ [] option_keys, int /*long*/ [] option_values, int /*long*/ [] error) {
lock.lock();
try {
- return _gdk_pixbuf_save_to_buffer(pixbuf, buffer, buffer_size, type, error, terminate);
+ return _gdk_pixbuf_save_to_bufferv(pixbuf, buffer, buffer_size, type, option_keys, option_values, error);
} finally {
lock.unlock();
}
}
+/**
+ * @param src cast=(const GdkPixbuf *)
+ * @param dest cast=(GdkPixbuf *)
+ * @param offset_x cast=(double)
+ * @param offset_y cast=(double)
+ * @param scale_x cast=(double)
+ * @param scale_y cast=(double)
+ */
public static final native void _gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type);
public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, int interp_type) {
lock.lock();
@@ -3147,6 +4123,10 @@ public static final void gdk_pixbuf_scale(int /*long*/ src, int /*long*/ dest, i
lock.unlock();
}
}
+/**
+ * @param src cast=(const GdkPixbuf *)
+ * @param interp_type cast=(GdkInterpType)
+ */
public static final native int /*long*/ _gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type);
public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int dest_width, int dest_height, int interp_type) {
lock.lock();
@@ -3156,6 +4136,12 @@ public static final int /*long*/ gdk_pixbuf_scale_simple(int /*long*/ src, int d
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ * @param depth cast=(gint)
+ */
public static final native int /*long*/ _gdk_pixmap_new(int /*long*/ window, int width, int height, int depth);
public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width, int height, int depth) {
lock.lock();
@@ -3165,6 +4151,14 @@ public static final int /*long*/ gdk_pixmap_new(int /*long*/ window, int width,
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param owner_events cast=(gboolean)
+ * @param event_mask cast=(GdkEventMask)
+ * @param confine_to cast=(GdkWindow *)
+ * @param cursor cast=(GdkCursor *)
+ * @param time cast=(guint32)
+ */
public static final native int _gdk_pointer_grab(int /*long*/ window, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time);
public static final int gdk_pointer_grab(int /*long*/ window, boolean owner_events, int event_mask, int /*long*/ confine_to, int /*long*/ cursor, int time) {
lock.lock();
@@ -3183,6 +4177,7 @@ public static final boolean gdk_pointer_is_grabbed() {
lock.unlock();
}
}
+/** @param time cast=(guint32) */
public static final native void _gdk_pointer_ungrab(int time);
public static final void gdk_pointer_ungrab(int time) {
lock.lock();
@@ -3192,6 +4187,15 @@ public static final void gdk_pointer_ungrab(int time) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param property cast=(GdkAtom)
+ * @param type cast=(GdkAtom)
+ * @param actual_property_type cast=(GdkAtom *)
+ * @param actual_format cast=(gint *)
+ * @param actual_length cast=(gint *)
+ * @param data cast=(guchar **)
+ */
public static final native boolean _gdk_property_get(int /*long*/ window, int /*long*/ property, int /*long*/ type, int /*long*/ offset, int /*long*/ length, int pdelete, int /*long*/[] actual_property_type, int[] actual_format, int[] actual_length, int /*long*/[] data);
public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ property, int /*long*/ type, int /*long*/ offset, int /*long*/ length, int pdelete, int /*long*/[] actual_property_type, int[] actual_format, int[] actual_length, int /*long*/[] data) {
lock.lock();
@@ -3201,6 +4205,7 @@ public static final boolean gdk_property_get(int /*long*/ window, int /*long*/ p
lock.unlock();
}
}
+/** @param region cast=(GdkRegion *) */
public static final native void _gdk_region_destroy(int /*long*/ region);
public static final void gdk_region_destroy(int /*long*/ region) {
lock.lock();
@@ -3210,6 +4215,7 @@ public static final void gdk_region_destroy(int /*long*/ region) {
lock.unlock();
}
}
+/** @param region cast=(GdkRegion *) */
public static final native boolean _gdk_region_empty(int /*long*/ region);
public static final boolean gdk_region_empty(int /*long*/ region) {
lock.lock();
@@ -3219,6 +4225,10 @@ public static final boolean gdk_region_empty(int /*long*/ region) {
lock.unlock();
}
}
+/**
+ * @param region cast=(GdkRegion *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_in
+ */
public static final native void _gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle);
public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangle rectangle) {
lock.lock();
@@ -3228,6 +4238,11 @@ public static final void gdk_region_get_clipbox(int /*long*/ region, GdkRectangl
lock.unlock();
}
}
+/**
+ * @param region cast=(GdkRegion *)
+ * @param rectangles cast=(GdkRectangle **)
+ * @param n_rectangles cast=(gint *)
+ */
public static final native void _gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles);
public static final void gdk_region_get_rectangles(int /*long*/ region, int /*long*/[] rectangles, int[] n_rectangles) {
lock.lock();
@@ -3237,6 +4252,10 @@ public static final void gdk_region_get_rectangles(int /*long*/ region, int /*lo
lock.unlock();
}
}
+/**
+ * @param source1 cast=(GdkRegion *)
+ * @param source2 cast=(GdkRegion *)
+ */
public static final native void _gdk_region_intersect(int /*long*/ source1, int /*long*/ source2);
public static final void gdk_region_intersect(int /*long*/ source1, int /*long*/ source2) {
lock.lock();
@@ -3255,6 +4274,11 @@ public static final int /*long*/ gdk_region_new() {
lock.unlock();
}
}
+/**
+ * @param region cast=(GdkRegion *)
+ * @param dx cast=(gint)
+ * @param dy cast=(gint)
+ */
public static final native void _gdk_region_offset(int /*long*/ region, int dx, int dy);
public static final void gdk_region_offset(int /*long*/ region, int dx, int dy) {
lock.lock();
@@ -3264,6 +4288,11 @@ public static final void gdk_region_offset(int /*long*/ region, int dx, int dy)
lock.unlock();
}
}
+/**
+ * @param region cast=(GdkRegion *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native boolean _gdk_region_point_in(int /*long*/ region, int x, int y);
public static final boolean gdk_region_point_in(int /*long*/ region, int x, int y) {
lock.lock();
@@ -3273,6 +4302,10 @@ public static final boolean gdk_region_point_in(int /*long*/ region, int x, int
lock.unlock();
}
}
+/**
+ * @param points cast=(GdkPoint *)
+ * @param fill_rule cast=(GdkFillRule)
+ */
public static final native int /*long*/ _gdk_region_polygon(int[] points, int npoints, int fill_rule);
public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) {
lock.lock();
@@ -3282,6 +4315,7 @@ public static final int /*long*/ gdk_region_polygon(int[] points, int npoints, i
lock.unlock();
}
}
+/** @param rectangle flags=no_out */
public static final native int /*long*/ _gdk_region_rectangle(GdkRectangle rectangle);
public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
lock.lock();
@@ -3291,6 +4325,10 @@ public static final int /*long*/ gdk_region_rectangle(GdkRectangle rectangle) {
lock.unlock();
}
}
+/**
+ * @param region cast=(GdkRegion *)
+ * @param rect cast=(GdkRectangle *),flags=no_out
+ */
public static final native int /*long*/ _gdk_region_rect_in(int /*long*/ region, GdkRectangle rect);
public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRectangle rect) {
lock.lock();
@@ -3300,6 +4338,10 @@ public static final int /*long*/ gdk_region_rect_in(int /*long*/ region, GdkRect
lock.unlock();
}
}
+/**
+ * @param source1 cast=(GdkRegion *)
+ * @param source2 cast=(GdkRegion *)
+ */
public static final native void _gdk_region_subtract(int /*long*/ source1, int /*long*/ source2);
public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/ source2) {
lock.lock();
@@ -3309,6 +4351,10 @@ public static final void gdk_region_subtract(int /*long*/ source1, int /*long*/
lock.unlock();
}
}
+/**
+ * @param source1 cast=(GdkRegion *)
+ * @param source2 cast=(GdkRegion *)
+ */
public static final native void _gdk_region_union(int /*long*/ source1, int /*long*/ source2);
public static final void gdk_region_union(int /*long*/ source1, int /*long*/ source2) {
lock.lock();
@@ -3318,6 +4364,10 @@ public static final void gdk_region_union(int /*long*/ source1, int /*long*/ sou
lock.unlock();
}
}
+/**
+ * @param region cast=(GdkRegion *)
+ * @param rect cast=(GdkRectangle *),flags=no_out
+ */
public static final native void _gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect);
public static final void gdk_region_union_with_rect(int /*long*/ region, GdkRectangle rect) {
lock.lock();
@@ -3336,6 +4386,7 @@ public static final void gdk_rgb_init() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gdk_screen_get_default();
public static final int /*long*/ gdk_screen_get_default() {
lock.lock();
@@ -3345,6 +4396,12 @@ public static final int /*long*/ gdk_screen_get_default() {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native int _gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y);
public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, int x, int y) {
lock.lock();
@@ -3354,6 +4411,11 @@ public static final int gdk_screen_get_monitor_at_point (int /*long*/ screen, in
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ * @param window cast=(GdkWindow *)
+ */
public static final native int _gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window);
public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, int /*long*/ window) {
lock.lock();
@@ -3363,6 +4425,11 @@ public static final int gdk_screen_get_monitor_at_window(int /*long*/ screen, in
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ * @param dest flags=no_in
+ */
public static final native void _gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest);
public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, int monitor_num, GdkRectangle dest) {
lock.lock();
@@ -3372,6 +4439,10 @@ public static final void gdk_screen_get_monitor_geometry (int /*long*/ screen, i
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ */
public static final native int _gdk_screen_get_n_monitors(int /*long*/ screen);
public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
lock.lock();
@@ -3381,6 +4452,10 @@ public static final int gdk_screen_get_n_monitors(int /*long*/ screen) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param screen cast=(GdkScreen *)
+ */
public static final native int _gdk_screen_get_number(int /*long*/ screen);
public static final int gdk_screen_get_number(int /*long*/ screen) {
lock.lock();
@@ -3417,6 +4492,7 @@ public static final int gdk_screen_width_mm() {
lock.unlock();
}
}
+/** @param program_class cast=(const char *) */
public static final native void _gdk_set_program_class(byte[] program_class);
public static final void gdk_set_program_class(byte[] program_class) {
lock.lock();
@@ -3426,6 +4502,13 @@ public static final void gdk_set_program_class(byte[] program_class) {
lock.unlock();
}
}
+/**
+ * @param str cast=(const gchar *)
+ * @param encoding cast=(GdkAtom *)
+ * @param format cast=(gint *)
+ * @param ctext cast=(guchar **)
+ * @param length cast=(gint *)
+ */
public static final native boolean _gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length);
public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[] encoding, int[] format, int /*long*/[] ctext, int[] length) {
lock.lock();
@@ -3435,6 +4518,7 @@ public static final boolean gdk_utf8_to_compound_text(byte[] str, int /*long*/[]
lock.unlock();
}
}
+/** @param str cast=(const gchar *) */
public static final native int /*long*/ _gdk_utf8_to_string_target(byte[] str);
public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
lock.lock();
@@ -3444,6 +4528,11 @@ public static final int /*long*/ gdk_utf8_to_string_target(byte[] str) {
lock.unlock();
}
}
+/**
+ * @param encoding cast=(GdkAtom)
+ * @param text cast=(guchar *)
+ * @param list cast=(gchar ***)
+ */
public static final native int _gdk_text_property_to_utf8_list (int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list);
public static final int gdk_text_property_to_utf8_list (int /*long*/ encoding, int format, int /*long*/ text, int length, int /*long*/[] list) {
lock.lock();
@@ -3453,6 +4542,10 @@ public static final int gdk_text_property_to_utf8_list (int /*long*/ encoding,
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param display cast=(GdkDisplay*)
+ */
public static final native void _gtk_tooltip_trigger_tooltip_query (int /*long*/ display);
public static final void gtk_tooltip_trigger_tooltip_query (int /*long*/ display){
lock.lock();
@@ -3481,6 +4574,10 @@ public static final int /*long*/ gdk_visual_get_system() {
lock.unlock();
}
}
+/**
+ * @param win_x cast=(gint *)
+ * @param win_y cast=(gint *)
+ */
public static final native int /*long*/ _gdk_window_at_pointer(int[] win_x, int[] win_y);
public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y) {
lock.lock();
@@ -3490,6 +4587,10 @@ public static final int /*long*/ gdk_window_at_pointer(int[] win_x, int[] win_y)
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_out
+ */
public static final native void _gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle);
public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRectangle rectangle) {
lock.lock();
@@ -3499,6 +4600,7 @@ public static final void gdk_window_begin_paint_rect(int /*long*/ window, GdkRec
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_clear_area(int /*long*/ window, int x, int y, int width, int height);
public static final void gdk_window_clear_area(int /*long*/ window, int x, int y, int width, int height) {
lock.lock();
@@ -3508,6 +4610,7 @@ public static final void gdk_window_clear_area(int /*long*/ window, int x, int y
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_destroy(int /*long*/ window);
public static final void gdk_window_destroy(int /*long*/ window) {
lock.lock();
@@ -3517,6 +4620,7 @@ public static final void gdk_window_destroy(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_end_paint(int /*long*/ window);
public static final void gdk_window_end_paint(int /*long*/ window) {
lock.lock();
@@ -3526,6 +4630,7 @@ public static final void gdk_window_end_paint(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native int /*long*/ _gdk_window_get_children(int /*long*/ window);
public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
lock.lock();
@@ -3535,6 +4640,7 @@ public static final int /*long*/ gdk_window_get_children(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native int _gdk_window_get_events(int /*long*/ window);
public static final int gdk_window_get_events(int /*long*/ window) {
lock.lock();
@@ -3544,6 +4650,7 @@ public static final int gdk_window_get_events(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_focus(int /*long*/ window, int timestamp);
public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
lock.lock();
@@ -3553,6 +4660,7 @@ public static final void gdk_window_focus(int /*long*/ window, int timestamp) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_freeze_updates(int /*long*/ window);
public static final void gdk_window_freeze_updates(int /*long*/ window) {
lock.lock();
@@ -3562,6 +4670,10 @@ public static final void gdk_window_freeze_updates(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param rect cast=(GdkRectangle *),flags=no_in
+ */
public static final native void _gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect);
public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRectangle rect) {
lock.lock();
@@ -3571,6 +4683,12 @@ public static final void gdk_window_get_frame_extents(int /*long*/ window, GdkRe
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param real_drawable cast=(GdkDrawable **)
+ * @param x_offset cast=(gint *)
+ * @param y_offset cast=(gint *)
+ */
public static final native void _gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset);
public static final void gdk_window_get_internal_paint_info(int /*long*/ window, int /*long*/ [] real_drawable, int[] x_offset, int[] y_offset) {
lock.lock();
@@ -3580,6 +4698,11 @@ public static final void gdk_window_get_internal_paint_info(int /*long*/ window,
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
public static final native int _gdk_window_get_origin(int /*long*/ window, int[] x, int[] y);
public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[] y) {
lock.lock();
@@ -3589,6 +4712,7 @@ public static final int gdk_window_get_origin(int /*long*/ window, int[] x, int[
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native int /*long*/ _gdk_window_get_parent(int /*long*/ window);
public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
lock.lock();
@@ -3598,6 +4722,12 @@ public static final int /*long*/ gdk_window_get_parent(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ * @param mask cast=(GdkModifierType *)
+ */
public static final native int /*long*/ _gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask);
public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int[] x, int[] y, int[] mask) {
lock.lock();
@@ -3607,6 +4737,11 @@ public static final int /*long*/ gdk_window_get_pointer(int /*long*/ window, int
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
public static final native void _gdk_window_get_position(int /*long*/ window, int[] x, int[] y);
public static final void gdk_window_get_position(int /*long*/ window, int[] x, int[] y) {
lock.lock();
@@ -3616,6 +4751,10 @@ public static final void gdk_window_get_position(int /*long*/ window, int[] x, i
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param data cast=(gpointer *)
+ */
public static final native void _gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data);
public static final void gdk_window_get_user_data(int /*long*/ window, int /*long*/[] data) {
lock.lock();
@@ -3625,6 +4764,7 @@ public static final void gdk_window_get_user_data(int /*long*/ window, int /*lon
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_hide(int /*long*/ window);
public static final void gdk_window_hide(int /*long*/ window) {
lock.lock();
@@ -3634,6 +4774,11 @@ public static final void gdk_window_hide(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param rectangle cast=(GdkRectangle *),flags=no_out
+ * @param invalidate_children cast=(gboolean)
+ */
public static final native void _gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children);
public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRectangle rectangle, boolean invalidate_children) {
lock.lock();
@@ -3643,6 +4788,11 @@ public static final void gdk_window_invalidate_rect(int /*long*/ window, GdkRect
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param region cast=(GdkRegion *)
+ * @param invalidate_children cast=(gboolean)
+ */
public static final native void _gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children);
public static final void gdk_window_invalidate_region(int /*long*/ window, int /*long*/ region, boolean invalidate_children) {
lock.lock();
@@ -3652,6 +4802,7 @@ public static final void gdk_window_invalidate_region(int /*long*/ window, int /
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native boolean _gdk_window_is_visible(int /*long*/ window);
public static final boolean gdk_window_is_visible(int /*long*/ window) {
lock.lock();
@@ -3661,6 +4812,7 @@ public static final boolean gdk_window_is_visible(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_move(int /*long*/ window, int x, int y);
public static final void gdk_window_move(int /*long*/ window, int x, int y) {
lock.lock();
@@ -3670,6 +4822,10 @@ public static final void gdk_window_move(int /*long*/ window, int x, int y) {
lock.unlock();
}
}
+/**
+ * @param parent cast=(GdkWindow *)
+ * @param attributes flags=no_out
+ */
public static final native int /*long*/ _gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask);
public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAttr attributes, int attributes_mask) {
lock.lock();
@@ -3679,6 +4835,7 @@ public static final int /*long*/ gdk_window_new(int /*long*/ parent, GdkWindowAt
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_lower(int /*long*/ window);
public static final void gdk_window_lower(int /*long*/ window) {
lock.lock();
@@ -3697,6 +4854,10 @@ public static final void gdk_window_process_all_updates() {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param update_children cast=(gboolean)
+ */
public static final native void _gdk_window_process_updates(int /*long*/ window, boolean update_children);
public static final void gdk_window_process_updates(int /*long*/ window, boolean update_children) {
lock.lock();
@@ -3706,6 +4867,7 @@ public static final void gdk_window_process_updates(int /*long*/ window, boolean
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_raise(int /*long*/ window);
public static final void gdk_window_raise(int /*long*/ window) {
lock.lock();
@@ -3715,6 +4877,7 @@ public static final void gdk_window_raise(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_resize(int /*long*/ window, int width, int height);
public static final void gdk_window_resize(int /*long*/ window, int width, int height) {
lock.lock();
@@ -3724,6 +4887,7 @@ public static final void gdk_window_resize(int /*long*/ window, int width, int h
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_scroll(int /*long*/ window, int dx, int dy);
public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy) {
lock.lock();
@@ -3733,6 +4897,11 @@ public static final void gdk_window_scroll(int /*long*/ window, int dx, int dy)
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GdkWindow *)
+ * @param accept_focus cast=(gboolean)
+ */
public static final native void _gdk_window_set_accept_focus(int /*long*/ window, boolean accept_focus);
public static final void gdk_window_set_accept_focus(int /*long*/ window, boolean accept_focus) {
lock.lock();
@@ -3742,6 +4911,11 @@ public static final void gdk_window_set_accept_focus(int /*long*/ window, boolea
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param pixmap cast=(GdkPixmap *)
+ * @param parent_relative cast=(gboolean)
+ */
public static final native void _gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative);
public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*long*/ pixmap, boolean parent_relative) {
lock.lock();
@@ -3751,6 +4925,10 @@ public static final void gdk_window_set_back_pixmap(int /*long*/ window, int /*l
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param cursor cast=(GdkCursor *)
+ */
public static final native void _gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor);
public static final void gdk_window_set_cursor(int /*long*/ window, int /*long*/ cursor) {
lock.lock();
@@ -3760,6 +4938,7 @@ public static final void gdk_window_set_cursor(int /*long*/ window, int /*long*/
lock.unlock();
}
}
+/** @param setting cast=(gboolean) */
public static final native void _gdk_window_set_debug_updates(boolean setting);
public static final void gdk_window_set_debug_updates(boolean setting) {
lock.lock();
@@ -3769,6 +4948,10 @@ public static final void gdk_window_set_debug_updates(boolean setting) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param decorations cast=(GdkWMDecoration)
+ */
public static final native void _gdk_window_set_decorations(int /*long*/ window, int decorations);
public static final void gdk_window_set_decorations(int /*long*/ window, int decorations) {
lock.lock();
@@ -3778,6 +4961,7 @@ public static final void gdk_window_set_decorations(int /*long*/ window, int dec
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_set_events(int /*long*/ window, int event_mask);
public static final void gdk_window_set_events(int /*long*/ window, int event_mask) {
lock.lock();
@@ -3787,6 +4971,12 @@ public static final void gdk_window_set_events(int /*long*/ window, int event_ma
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param icon_window cast=(GdkWindow *)
+ * @param pixmap cast=(GdkPixmap *)
+ * @param mask cast=(GdkBitmap *)
+ */
public static final native void _gdk_window_set_icon(int /*long*/ window, int /*long*/ icon_window, int /*long*/ pixmap, int /*long*/ mask);
public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ icon_window, int /*long*/ pixmap, int /*long*/ mask) {
lock.lock();
@@ -3796,6 +4986,10 @@ public static final void gdk_window_set_icon(int /*long*/ window, int /*long*/ i
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param pixbufs cast=(GList *)
+ */
public static final native void _gdk_window_set_icon_list(int /*long*/ window, int /*long*/ pixbufs);
public static final void gdk_window_set_icon_list(int /*long*/ window, int /*long*/ pixbufs) {
lock.lock();
@@ -3805,6 +4999,11 @@ public static final void gdk_window_set_icon_list(int /*long*/ window, int /*lon
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GdkWindow *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gdk_window_set_keep_above(int /*long*/ window, boolean setting);
public static final void gdk_window_set_keep_above(int /*long*/ window, boolean setting) {
lock.lock();
@@ -3814,6 +5013,10 @@ public static final void gdk_window_set_keep_above(int /*long*/ window, boolean
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param override_redirect cast=(gboolean)
+ */
public static final native void _gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect);
public static final void gdk_window_set_override_redirect(int /*long*/ window, boolean override_redirect) {
lock.lock();
@@ -3823,6 +5026,10 @@ public static final void gdk_window_set_override_redirect(int /*long*/ window, b
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param user_data cast=(gpointer)
+ */
public static final native void _gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data);
public static final void gdk_window_set_user_data(int /*long*/ window, int /*long*/ user_data) {
lock.lock();
@@ -3832,6 +5039,10 @@ public static final void gdk_window_set_user_data(int /*long*/ window, int /*lon
lock.unlock();
}
}
+/**
+ * @param window cast=(GdkWindow *)
+ * @param shape_region cast=(GdkRegion *)
+ */
public static final native void _gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y);
public static final void gdk_window_shape_combine_region (int /*long*/ window, int /*long*/ shape_region, int offset_x, int offset_y) {
lock.lock();
@@ -3841,6 +5052,7 @@ public static final void gdk_window_shape_combine_region (int /*long*/ window, i
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_show(int /*long*/ window);
public static final void gdk_window_show(int /*long*/ window) {
lock.lock();
@@ -3850,6 +5062,7 @@ public static final void gdk_window_show(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_show_unraised(int /*long*/ window);
public static final void gdk_window_show_unraised(int /*long*/ window) {
lock.lock();
@@ -3859,6 +5072,7 @@ public static final void gdk_window_show_unraised(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GdkWindow *) */
public static final native void _gdk_window_thaw_updates(int /*long*/ window);
public static final void gdk_window_thaw_updates(int /*long*/ window) {
lock.lock();
@@ -3877,6 +5091,11 @@ public static final int /*long*/ gtk_accel_group_new() {
lock.unlock();
}
}
+/**
+ * @param accelGroup cast=(GObject *)
+ * @param accelKey cast=(guint)
+ * @param accelMods cast=(GdkModifierType)
+ */
public static final native boolean _gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods);
public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, int accelKey, int accelMods) {
lock.lock();
@@ -3886,6 +5105,10 @@ public static final boolean gtk_accel_groups_activate(int /*long*/ accelGroup, i
lock.unlock();
}
}
+/**
+ * @param accel_label cast=(GtkAccelLabel *)
+ * @param accel_widget cast=(GtkWidget *)
+ */
public static final native void _gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget);
public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_label, int /*long*/ accel_widget) {
lock.lock();
@@ -3895,6 +5118,7 @@ public static final void gtk_accel_label_set_accel_widget(int /*long*/ accel_lab
lock.unlock();
}
}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native void _gtk_adjustment_changed(int /*long*/ adjustment);
public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
lock.lock();
@@ -3904,6 +5128,13 @@ public static final void gtk_adjustment_changed(int /*long*/ adjustment) {
lock.unlock();
}
}
+/**
+ * @param value cast=(gdouble)
+ * @param lower cast=(gdouble)
+ * @param upper cast=(gdouble)
+ * @param step_increment cast=(gdouble)
+ * @param page_increment cast=(gdouble)
+ */
public static final native int /*long*/ _gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
public static final int /*long*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) {
lock.lock();
@@ -3913,6 +5144,10 @@ public static final int /*long*/ gtk_adjustment_new(double value, double lower,
lock.unlock();
}
}
+/**
+ * @param adjustment cast=(GtkAdjustment *)
+ * @param value cast=(gdouble)
+ */
public static final native void _gtk_adjustment_set_value(int /*long*/ adjustment, double value);
public static final void gtk_adjustment_set_value(int /*long*/ adjustment, double value) {
lock.lock();
@@ -3922,6 +5157,7 @@ public static final void gtk_adjustment_set_value(int /*long*/ adjustment, doubl
lock.unlock();
}
}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native void _gtk_adjustment_value_changed(int /*long*/ adjustment);
public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
lock.lock();
@@ -3931,6 +5167,10 @@ public static final void gtk_adjustment_value_changed(int /*long*/ adjustment) {
lock.unlock();
}
}
+/**
+ * @param arrow_type cast=(GtkArrowType)
+ * @param shadow_type cast=(GtkShadowType)
+ */
public static final native int /*long*/ _gtk_arrow_new(int arrow_type, int shadow_type);
public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type) {
lock.lock();
@@ -3940,6 +5180,11 @@ public static final int /*long*/ gtk_arrow_new(int arrow_type, int shadow_type)
lock.unlock();
}
}
+/**
+ * @param arrow cast=(GtkArrow *)
+ * @param arrow_type cast=(GtkArrowType)
+ * @param shadow_type cast=(GtkShadowType)
+ */
public static final native void _gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type);
public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int shadow_type) {
lock.lock();
@@ -3949,6 +5194,7 @@ public static final void gtk_arrow_set(int /*long*/ arrow, int arrow_type, int s
lock.unlock();
}
}
+/** @param bin cast=(GtkBin *) */
public static final native int /*long*/ _gtk_bin_get_child(int /*long*/ bin);
public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
lock.lock();
@@ -3958,6 +5204,17 @@ public static final int /*long*/ gtk_bin_get_child(int /*long*/ bin) {
lock.unlock();
}
}
+/** @param border cast=(GtkBorder *) */
+public static final native void _gtk_border_free(int /*long*/ border);
+public static final void gtk_border_free(int /*long*/ border) {
+ lock.lock();
+ try {
+ _gtk_border_free(border);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param box cast=(GtkBox *) */
public static final native void _gtk_box_set_spacing(int /*long*/ box, int spacing);
public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
lock.lock();
@@ -3967,6 +5224,10 @@ public static final void gtk_box_set_spacing(int /*long*/ box, int spacing) {
lock.unlock();
}
}
+/**
+ * @param box cast=(GtkBox *)
+ * @param child cast=(GtkWidget *)
+ */
public static final native void _gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type);
public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*/ child, boolean expand, boolean fill, int padding, int pack_type) {
lock.lock();
@@ -3976,6 +5237,7 @@ public static final void gtk_box_set_child_packing(int /*long*/ box, int /*long*
lock.unlock();
}
}
+/** @param button cast=(GtkButton *) */
public static final native void _gtk_button_clicked(int /*long*/ button);
public static final void gtk_button_clicked(int /*long*/ button) {
lock.lock();
@@ -3985,6 +5247,7 @@ public static final void gtk_button_clicked(int /*long*/ button) {
lock.unlock();
}
}
+/** @param button cast=(GtkButton *) */
public static final native int _gtk_button_get_relief(int /*long*/ button);
public static final int gtk_button_get_relief(int /*long*/ button) {
lock.lock();
@@ -4003,6 +5266,10 @@ public static final int /*long*/ gtk_button_new() {
lock.unlock();
}
}
+/**
+ * @param button cast=(GtkButton *)
+ * @param newstyle cast=(GtkReliefStyle)
+ */
public static final native void _gtk_button_set_relief(int /*long*/ button, int newstyle);
public static final void gtk_button_set_relief(int /*long*/ button, int newstyle) {
lock.lock();
@@ -4012,6 +5279,7 @@ public static final void gtk_button_set_relief(int /*long*/ button, int newstyle
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_calendar_new();
public static final int /*long*/ gtk_calendar_new() {
lock.lock();
@@ -4021,6 +5289,12 @@ public static final int /*long*/ gtk_calendar_new() {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param calendar cast=(GtkCalendar *)
+ * @param month cast=(guint)
+ * @param year cast=(guint)
+ */
public static final native boolean /*long*/ _gtk_calendar_select_month(int /*long*/ calendar, int month, int year);
public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ calendar, int month, int year) {
lock.lock();
@@ -4030,6 +5304,11 @@ public static final boolean /*long*/ gtk_calendar_select_month(int /*long*/ cale
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param calendar cast=(GtkCalendar *)
+ * @param day cast=(guint)
+ */
public static final native void _gtk_calendar_select_day(int /*long*/ calendar, int day);
public static final void gtk_calendar_select_day(int /*long*/ calendar, int day) {
lock.lock();
@@ -4039,6 +5318,11 @@ public static final void gtk_calendar_select_day(int /*long*/ calendar, int day)
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param calendar cast=(GtkCalendar *)
+ * @param flags cast=(GtkCalendarDisplayOptions)
+ */
public static final native void _gtk_calendar_set_display_options(int /*long*/ calendar, int flags);
public static final void gtk_calendar_set_display_options(int /*long*/ calendar, int flags) {
lock.lock();
@@ -4048,6 +5332,11 @@ public static final void gtk_calendar_set_display_options(int /*long*/ calendar,
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param calendar cast=(GtkCalendar *)
+ * @param flags cast=(GtkCalendarDisplayOptions)
+ */
public static final native void _gtk_calendar_display_options(int /*long*/ calendar, int flags);
public static final void gtk_calendar_display_options(int /*long*/ calendar, int flags) {
lock.lock();
@@ -4057,6 +5346,13 @@ public static final void gtk_calendar_display_options(int /*long*/ calendar, int
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param calendar cast=(GtkCalendar *)
+ * @param year cast=(guint *)
+ * @param month cast=(guint *)
+ * @param day cast=(guint *)
+ */
public static final native void _gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day);
public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year, int[] month, int[] day) {
lock.lock();
@@ -4066,6 +5362,7 @@ public static final void gtk_calendar_get_date(int /*long*/ calendar, int[] year
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_cell_layout_clear(int /*long*/ cell_layout);
public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
lock.lock();
@@ -4075,6 +5372,7 @@ public static final void gtk_cell_layout_clear(int /*long*/ cell_layout) {
lock.unlock();
}
}
+/** @method flags=no_gen */
public static final native void _gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel);
public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout, int /*long*/ cell, byte[] attribute, int column, int /*long*/ sentinel) {
lock.lock();
@@ -4084,6 +5382,7 @@ public static final void gtk_cell_layout_set_attributes(int /*long*/ cell_layout
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand);
public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, int /*long*/ cell, boolean expand) {
lock.lock();
@@ -4093,6 +5392,15 @@ public static final void gtk_cell_layout_pack_start(int /*long*/ cell_layout, in
lock.unlock();
}
}
+/**
+ * @param cell cast=(GtkCellRenderer *)
+ * @param widget cast=(GtkWidget *)
+ * @param area cast=(GdkRectangle *),flags=no_in
+ * @param x_offset cast=(gint *)
+ * @param y_offset cast=(gint *)
+ * @param width cast=(gint *)
+ * @param height cast=(gint *)
+ */
public static final native void _gtk_cell_renderer_get_size(int /*long*/ cell, int /*long*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height);
public static final void gtk_cell_renderer_get_size(int /*long*/ cell, int /*long*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
lock.lock();
@@ -4138,6 +5446,7 @@ public static final int /*long*/ gtk_check_button_new() {
lock.unlock();
}
}
+/** @param check_menu_item cast=(GtkCheckMenuItem *) */
public static final native boolean _gtk_check_menu_item_get_active(int /*long*/ check_menu_item);
public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_menu_item) {
lock.lock();
@@ -4147,6 +5456,7 @@ public static final boolean gtk_check_menu_item_get_active(int /*long*/ check_me
lock.unlock();
}
}
+/** @param label cast=(const gchar *) */
public static final native int /*long*/ _gtk_check_menu_item_new_with_label(byte[] label);
public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label) {
lock.lock();
@@ -4156,6 +5466,10 @@ public static final int /*long*/ gtk_check_menu_item_new_with_label(byte[] label
lock.unlock();
}
}
+/**
+ * @param wid cast=(GtkCheckMenuItem *)
+ * @param active cast=(gboolean)
+ */
public static final native void _gtk_check_menu_item_set_active(int /*long*/ wid, boolean active);
public static final void gtk_check_menu_item_set_active(int /*long*/ wid, boolean active) {
lock.lock();
@@ -4174,6 +5488,7 @@ public static final int /*long*/ gtk_check_version(int required_major, int requi
lock.unlock();
}
}
+/** @param clipboard cast=(GtkClipboard *) */
public static final native void _gtk_clipboard_clear(int /*long*/ clipboard);
public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
lock.lock();
@@ -4183,6 +5498,7 @@ public static final void gtk_clipboard_clear(int /*long*/ clipboard) {
lock.unlock();
}
}
+/** @param selection cast=(GdkAtom) */
public static final native int /*long*/ _gtk_clipboard_get(int /*long*/ selection);
public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
lock.lock();
@@ -4192,6 +5508,14 @@ public static final int /*long*/ gtk_clipboard_get(int /*long*/ selection) {
lock.unlock();
}
}
+/**
+ * @param clipboard cast=(GtkClipboard *)
+ * @param target cast=(const GtkTargetEntry *)
+ * @param n_targets cast=(guint)
+ * @param get_func cast=(GtkClipboardGetFunc)
+ * @param clear_func cast=(GtkClipboardClearFunc)
+ * @param user_data cast=(GObject *)
+ */
public static final native boolean _gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data);
public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard, int /*long*/ target, int n_targets, int /*long*/ get_func, int /*long*/ clear_func, int /*long*/ user_data) {
lock.lock();
@@ -4201,6 +5525,10 @@ public static final boolean gtk_clipboard_set_with_data(int /*long*/ clipboard,
lock.unlock();
}
}
+/**
+ * @param clipboard cast=(GtkClipboard *)
+ * @param target cast=(GdkAtom)
+ */
public static final native int /*long*/ _gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target);
public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) {
lock.lock();
@@ -4210,6 +5538,7 @@ public static final int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ cl
lock.unlock();
}
}
+/** @param title cast=(const gchar *) */
public static final native int /*long*/ _gtk_color_selection_dialog_new(byte[] title);
public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
lock.lock();
@@ -4219,6 +5548,10 @@ public static final int /*long*/ gtk_color_selection_dialog_new(byte[] title) {
lock.unlock();
}
}
+/**
+ * @param colorsel cast=(GtkColorSelection *)
+ * @param color cast=(GdkColor *),flags=no_in
+ */
public static final native void _gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color);
public static final void gtk_color_selection_get_current_color(int /*long*/ colorsel, GdkColor color) {
lock.lock();
@@ -4228,6 +5561,10 @@ public static final void gtk_color_selection_get_current_color(int /*long*/ colo
lock.unlock();
}
}
+/**
+ * @param colorsel cast=(GtkColorSelection *)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color);
public static final void gtk_color_selection_set_current_color(int /*long*/ colorsel, GdkColor color) {
lock.lock();
@@ -4237,6 +5574,7 @@ public static final void gtk_color_selection_set_current_color(int /*long*/ colo
lock.unlock();
}
}
+/** @param colorsel cast=(GtkColorSelection *) */
public static final native void _gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette);
public static final void gtk_color_selection_set_has_palette(int /*long*/ colorsel, boolean has_palette) {
lock.lock();
@@ -4246,6 +5584,7 @@ public static final void gtk_color_selection_set_has_palette(int /*long*/ colors
lock.unlock();
}
}
+/** @param combo cast=(GtkCombo *) */
public static final native void _gtk_combo_disable_activate(int /*long*/ combo);
public static final void gtk_combo_disable_activate(int /*long*/ combo) {
lock.lock();
@@ -4264,6 +5603,10 @@ public static final int /*long*/ gtk_combo_new() {
lock.unlock();
}
}
+/**
+ * @param combo cast=(GtkCombo *)
+ * @param val cast=(gboolean)
+ */
public static final native void _gtk_combo_set_case_sensitive(int /*long*/ combo, boolean val);
public static final void gtk_combo_set_case_sensitive(int /*long*/ combo, boolean val) {
lock.lock();
@@ -4273,6 +5616,7 @@ public static final void gtk_combo_set_case_sensitive(int /*long*/ combo, boolea
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val);
public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, boolean val) {
lock.lock();
@@ -4282,6 +5626,10 @@ public static final void gtk_combo_box_set_focus_on_click(int /*long*/ combo, bo
lock.unlock();
}
}
+/**
+ * @param combo cast=(GtkCombo *)
+ * @param strings cast=(GList *)
+ */
public static final native void _gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings);
public static final void gtk_combo_set_popdown_strings(int /*long*/ combo, int /*long*/ strings) {
lock.lock();
@@ -4291,6 +5639,7 @@ public static final void gtk_combo_set_popdown_strings(int /*long*/ combo, int /
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_combo_box_entry_new_text();
public static final int /*long*/ gtk_combo_box_entry_new_text() {
lock.lock();
@@ -4300,6 +5649,7 @@ public static final int /*long*/ gtk_combo_box_entry_new_text() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_combo_box_new_text();
public static final int /*long*/ gtk_combo_box_new_text() {
lock.lock();
@@ -4309,6 +5659,7 @@ public static final int /*long*/ gtk_combo_box_new_text() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text);
public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int position, byte[] text) {
lock.lock();
@@ -4318,6 +5669,7 @@ public static final void gtk_combo_box_insert_text(int /*long*/ combo_box, int p
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_combo_box_remove_text(int /*long*/ combo_box, int position);
public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int position) {
lock.lock();
@@ -4327,6 +5679,7 @@ public static final void gtk_combo_box_remove_text(int /*long*/ combo_box, int p
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_combo_box_get_active(int /*long*/ combo_box);
public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
lock.lock();
@@ -4336,6 +5689,7 @@ public static final int gtk_combo_box_get_active(int /*long*/ combo_box) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_combo_box_get_model(int /*long*/ combo_box);
public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box) {
lock.lock();
@@ -4345,6 +5699,7 @@ public static final int /*long*/ gtk_combo_box_get_model(int /*long*/ combo_box)
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_combo_box_set_active(int /*long*/ combo_box, int index);
public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int index) {
lock.lock();
@@ -4354,6 +5709,7 @@ public static final void gtk_combo_box_set_active(int /*long*/ combo_box, int in
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_combo_box_popup(int /*long*/ combo_box);
public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
lock.lock();
@@ -4363,6 +5719,7 @@ public static final void gtk_combo_box_popup(int /*long*/ combo_box) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_combo_box_popdown(int /*long*/ combo_box);
public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
lock.lock();
@@ -4372,6 +5729,10 @@ public static final void gtk_combo_box_popdown(int /*long*/ combo_box) {
lock.unlock();
}
}
+/**
+ * @param container cast=(GtkContainer *)
+ * @param widget cast=(GtkWidget *)
+ */
public static final native void _gtk_container_add(int /*long*/ container, int /*long*/ widget);
public static final void gtk_container_add(int /*long*/ container, int /*long*/ widget) {
lock.lock();
@@ -4381,6 +5742,11 @@ public static final void gtk_container_add(int /*long*/ container, int /*long*/
lock.unlock();
}
}
+/**
+ * @param container cast=(GtkContainer *)
+ * @param callback cast=(GtkCallback)
+ * @param callback_data cast=(gpointer)
+ */
public static final native void _gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data);
public static final void gtk_container_forall(int /*long*/ container, int /*long*/ callback, int /*long*/ callback_data) {
lock.lock();
@@ -4390,6 +5756,7 @@ public static final void gtk_container_forall(int /*long*/ container, int /*long
lock.unlock();
}
}
+/** @param container cast=(GtkContainer *) */
public static final native int _gtk_container_get_border_width(int /*long*/ container);
public static final int gtk_container_get_border_width(int /*long*/ container) {
lock.lock();
@@ -4399,6 +5766,7 @@ public static final int gtk_container_get_border_width(int /*long*/ container) {
lock.unlock();
}
}
+/** @param container cast=(GtkContainer *) */
public static final native int /*long*/ _gtk_container_get_children(int /*long*/ container);
public static final int /*long*/ gtk_container_get_children(int /*long*/ container) {
lock.lock();
@@ -4408,6 +5776,10 @@ public static final int /*long*/ gtk_container_get_children(int /*long*/ contain
lock.unlock();
}
}
+/**
+ * @param container cast=(GtkContainer *)
+ * @param widget cast=(GtkWidget *)
+ */
public static final native void _gtk_container_remove(int /*long*/ container, int /*long*/ widget);
public static final void gtk_container_remove(int /*long*/ container, int /*long*/ widget) {
lock.lock();
@@ -4417,6 +5789,7 @@ public static final void gtk_container_remove(int /*long*/ container, int /*long
lock.unlock();
}
}
+/** @param container cast=(GtkContainer *) */
public static final native void _gtk_container_resize_children(int /*long*/ container);
public static final void gtk_container_resize_children(int /*long*/ container) {
lock.lock();
@@ -4426,6 +5799,10 @@ public static final void gtk_container_resize_children(int /*long*/ container) {
lock.unlock();
}
}
+/**
+ * @param container cast=(GtkContainer *)
+ * @param border_width cast=(guint)
+ */
public static final native void _gtk_container_set_border_width(int /*long*/ container, int border_width);
public static final void gtk_container_set_border_width(int /*long*/ container, int border_width) {
lock.lock();
@@ -4435,6 +5812,11 @@ public static final void gtk_container_set_border_width(int /*long*/ container,
lock.unlock();
}
}
+/**
+ * @param dialog cast=(GtkDialog *)
+ * @param button_text cast=(const gchar *)
+ * @param response_id cast=(gint)
+ */
public static final native int /*long*/ _gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id);
public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte[] button_text, int response_id) {
lock.lock();
@@ -4444,6 +5826,7 @@ public static final int /*long*/ gtk_dialog_add_button(int /*long*/ dialog, byte
lock.unlock();
}
}
+/** @param dialog cast=(GtkDialog *) */
public static final native int _gtk_dialog_run(int /*long*/ dialog);
public static final int gtk_dialog_run(int /*long*/ dialog) {
lock.lock();
@@ -4453,6 +5836,13 @@ public static final int gtk_dialog_run(int /*long*/ dialog) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param targets cast=(GtkTargetList *)
+ * @param actions cast=(GdkDragAction)
+ * @param button cast=(gint)
+ * @param event cast=(GdkEvent *)
+ */
public static final native int /*long*/ _gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event);
public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*/ targets, int actions, int button, int /*long*/ event) {
lock.lock();
@@ -4462,6 +5852,13 @@ public static final int /*long*/ gtk_drag_begin(int /*long*/ widget, int /*long*
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param start_x cast=(gint)
+ * @param start_y cast=(gint)
+ * @param current_x cast=(gint)
+ * @param current_y cast=(gint)
+ */
public static final native boolean _gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y);
public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int start_x, int start_y, int current_x, int current_y) {
lock.lock();
@@ -4471,6 +5868,11 @@ public static final boolean gtk_drag_check_threshold(int /*long*/ widget, int st
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param context cast=(GdkDragContext *)
+ * @param target_list cast=(GtkTargetList *)
+ */
public static final native int /*long*/ _gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list);
public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget, int /*long*/ context, int /*long*/ target_list) {
lock.lock();
@@ -4480,6 +5882,13 @@ public static final int /*long*/ gtk_drag_dest_find_target(int /*long*/ widget,
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param flags cast=(GtkDestDefaults)
+ * @param targets cast=(const GtkTargetEntry *)
+ * @param n_targets cast=(gint)
+ * @param actions cast=(GdkDragAction)
+ */
public static final native void _gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions);
public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /*long*/ targets, int n_targets, int actions) {
lock.lock();
@@ -4489,6 +5898,7 @@ public static final void gtk_drag_dest_set(int /*long*/ widget, int flags, int /
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_drag_dest_unset(int /*long*/ widget);
public static final void gtk_drag_dest_unset(int /*long*/ widget) {
lock.lock();
@@ -4498,6 +5908,12 @@ public static final void gtk_drag_dest_unset(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param context cast=(GdkDragContext *)
+ * @param success cast=(gboolean)
+ * @param delete cast=(gboolean)
+ * @param time cast=(guint32)
+ */
public static final native void _gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time);
public static final void gtk_drag_finish(int /*long*/ context, boolean success, boolean delete, int time) {
lock.lock();
@@ -4507,6 +5923,12 @@ public static final void gtk_drag_finish(int /*long*/ context, boolean success,
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param context cast=(GdkDragContext *)
+ * @param target cast=(GdkAtom)
+ * @param time cast=(guint32)
+ */
public static final native void _gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time);
public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ context, int /*long*/ target, int time) {
lock.lock();
@@ -4516,6 +5938,10 @@ public static final void gtk_drag_get_data(int /*long*/ widget, int /*long*/ con
lock.unlock();
}
}
+/**
+ * @param context cast=(GdkDragContext *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ */
public static final native void _gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y);
public static final void gtk_drag_set_icon_pixbuf(int /*long*/ context, int /*long*/ pixbuf, int hot_x, int hot_y) {
lock.lock();
@@ -4534,6 +5960,7 @@ public static final int /*long*/ gtk_drawing_area_new() {
lock.unlock();
}
}
+/** @param editable cast=(GtkEditable *) */
public static final native void _gtk_editable_copy_clipboard(int /*long*/ editable);
public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
lock.lock();
@@ -4543,6 +5970,7 @@ public static final void gtk_editable_copy_clipboard(int /*long*/ editable) {
lock.unlock();
}
}
+/** @param editable cast=(GtkEditable *) */
public static final native void _gtk_editable_cut_clipboard(int /*long*/ editable);
public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
lock.lock();
@@ -4552,6 +5980,7 @@ public static final void gtk_editable_cut_clipboard(int /*long*/ editable) {
lock.unlock();
}
}
+/** @param editable cast=(GtkEditable *) */
public static final native void _gtk_editable_delete_selection(int /*long*/ editable);
public static final void gtk_editable_delete_selection(int /*long*/ editable) {
lock.lock();
@@ -4561,6 +5990,11 @@ public static final void gtk_editable_delete_selection(int /*long*/ editable) {
lock.unlock();
}
}
+/**
+ * @param editable cast=(GtkEditable *)
+ * @param start_pos cast=(gint)
+ * @param end_pos cast=(gint)
+ */
public static final native void _gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos);
public static final void gtk_editable_delete_text(int /*long*/ editable, int start_pos, int end_pos) {
lock.lock();
@@ -4570,6 +6004,11 @@ public static final void gtk_editable_delete_text(int /*long*/ editable, int sta
lock.unlock();
}
}
+/**
+ * @param editable cast=(GtkEditable *)
+ * @param start_pos cast=(gint)
+ * @param end_pos cast=(gint)
+ */
public static final native int /*long*/ _gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos);
public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, int start_pos, int end_pos) {
lock.lock();
@@ -4579,6 +6018,7 @@ public static final int /*long*/ gtk_editable_get_chars(int /*long*/ editable, i
lock.unlock();
}
}
+/** @param editable cast=(GtkEditable *) */
public static final native boolean _gtk_editable_get_editable(int /*long*/ editable);
public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
lock.lock();
@@ -4588,6 +6028,7 @@ public static final boolean gtk_editable_get_editable(int /*long*/ editable) {
lock.unlock();
}
}
+/** @param editable cast=(GtkEditable *) */
public static final native int _gtk_editable_get_position(int /*long*/ editable);
public static final int gtk_editable_get_position(int /*long*/ editable) {
lock.lock();
@@ -4597,6 +6038,11 @@ public static final int gtk_editable_get_position(int /*long*/ editable) {
lock.unlock();
}
}
+/**
+ * @param editable cast=(GtkEditable *)
+ * @param start cast=(gint *)
+ * @param end cast=(gint *)
+ */
public static final native boolean _gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end);
public static final boolean gtk_editable_get_selection_bounds(int /*long*/ editable, int[] start, int[] end) {
lock.lock();
@@ -4606,6 +6052,12 @@ public static final boolean gtk_editable_get_selection_bounds(int /*long*/ edita
lock.unlock();
}
}
+/**
+ * @param editable cast=(GtkEditable *)
+ * @param new_text cast=(gchar *)
+ * @param new_text_length cast=(gint)
+ * @param position cast=(gint *)
+ */
public static final native void _gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position);
public static final void gtk_editable_insert_text(int /*long*/ editable, byte[] new_text, int new_text_length, int[] position) {
lock.lock();
@@ -4615,6 +6067,7 @@ public static final void gtk_editable_insert_text(int /*long*/ editable, byte[]
lock.unlock();
}
}
+/** @param editable cast=(GtkEditable *) */
public static final native void _gtk_editable_paste_clipboard(int /*long*/ editable);
public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
lock.lock();
@@ -4624,6 +6077,11 @@ public static final void gtk_editable_paste_clipboard(int /*long*/ editable) {
lock.unlock();
}
}
+/**
+ * @param editable cast=(GtkEditable *)
+ * @param start cast=(gint)
+ * @param end cast=(gint)
+ */
public static final native void _gtk_editable_select_region(int /*long*/ editable, int start, int end);
public static final void gtk_editable_select_region(int /*long*/ editable, int start, int end) {
lock.lock();
@@ -4633,6 +6091,10 @@ public static final void gtk_editable_select_region(int /*long*/ editable, int s
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEditable *)
+ * @param editable cast=(gboolean)
+ */
public static final native void _gtk_editable_set_editable(int /*long*/ entry, boolean editable);
public static final void gtk_editable_set_editable(int /*long*/ entry, boolean editable) {
lock.lock();
@@ -4642,6 +6104,10 @@ public static final void gtk_editable_set_editable(int /*long*/ entry, boolean e
lock.unlock();
}
}
+/**
+ * @param editable cast=(GtkEditable *)
+ * @param position cast=(gint)
+ */
public static final native void _gtk_editable_set_position(int /*long*/ editable, int position);
public static final void gtk_editable_set_position(int /*long*/ editable, int position) {
lock.lock();
@@ -4651,6 +6117,17 @@ public static final void gtk_editable_set_position(int /*long*/ editable, int po
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native int /*long*/ _gtk_entry_get_inner_border (int /*long*/ entry);
+public static final int /*long*/ gtk_entry_get_inner_border (int /*long*/ entry) {
+ lock.lock();
+ try {
+ return _gtk_entry_get_inner_border(entry);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param entry cast=(GtkEntry *) */
public static final native char _gtk_entry_get_invisible_char(int /*long*/ entry);
public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
lock.lock();
@@ -4660,6 +6137,7 @@ public static final char gtk_entry_get_invisible_char(int /*long*/ entry) {
lock.unlock();
}
}
+/** @param entry cast=(GtkEntry *) */
public static final native int /*long*/ _gtk_entry_get_layout (int /*long*/ entry);
public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
lock.lock();
@@ -4669,15 +6147,17 @@ public static final int /*long*/ gtk_entry_get_layout (int /*long*/ entry) {
lock.unlock();
}
}
-public static final native void _gtk_entry_get_layout_offsets (int /*long*/ layout, int[] x, int[] y);
-public static final void gtk_entry_get_layout_offsets (int /*long*/ layout, int[] x, int[] y) {
+/** @param entry cast=(GtkEntry *) */
+public static final native void _gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y);
+public static final void gtk_entry_get_layout_offsets (int /*long*/ entry, int[] x, int[] y) {
lock.lock();
try {
- _gtk_entry_get_layout_offsets(layout, x, y);
+ _gtk_entry_get_layout_offsets(entry, x, y);
} finally {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index);
public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry, int index) {
lock.lock();
@@ -4687,6 +6167,7 @@ public static final int gtk_entry_text_index_to_layout_index (int /*long*/ entry
lock.unlock();
}
}
+/** @param entry cast=(GtkEntry *) */
public static final native int _gtk_entry_get_max_length(int /*long*/ entry);
public static final int gtk_entry_get_max_length(int /*long*/ entry) {
lock.lock();
@@ -4696,6 +6177,7 @@ public static final int gtk_entry_get_max_length(int /*long*/ entry) {
lock.unlock();
}
}
+/** @param entry cast=(GtkEntry *) */
public static final native int /*long*/ _gtk_entry_get_text(int /*long*/ entry);
public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
lock.lock();
@@ -4705,6 +6187,7 @@ public static final int /*long*/ gtk_entry_get_text(int /*long*/ entry) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native boolean _FcConfigAppFontAddFile(int /*long*/ config, byte[] file);
public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] file) {
lock.lock();
@@ -4714,6 +6197,7 @@ public static final boolean FcConfigAppFontAddFile(int /*long*/ config, byte[] f
lock.unlock();
}
}
+/** @param entry cast=(GtkEntry *) */
public static final native boolean _gtk_entry_get_visibility(int /*long*/ entry);
public static final boolean gtk_entry_get_visibility(int /*long*/ entry) {
lock.lock();
@@ -4732,6 +6216,10 @@ public static final int /*long*/ gtk_entry_new() {
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEntry *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_entry_set_activates_default(int /*long*/ entry, boolean setting);
public static final void gtk_entry_set_activates_default(int /*long*/ entry, boolean setting) {
lock.lock();
@@ -4741,6 +6229,11 @@ public static final void gtk_entry_set_activates_default(int /*long*/ entry, boo
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param entry cast=(GtkEntry *)
+ * @param xalign cast=(gfloat)
+ */
public static final native void _gtk_entry_set_alignment(int /*long*/ entry, float xalign);
public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalign) {
lock.lock();
@@ -4750,6 +6243,10 @@ public static final void gtk_entry_set_alignment(int /*long*/ entry, float xalig
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEntry *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_entry_set_has_frame(int /*long*/ entry, boolean setting);
public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean setting) {
lock.lock();
@@ -4759,6 +6256,10 @@ public static final void gtk_entry_set_has_frame(int /*long*/ entry, boolean set
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEntry *)
+ * @param ch cast=(gint)
+ */
public static final native void _gtk_entry_set_invisible_char(int /*long*/ entry, char ch);
public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char ch) {
lock.lock();
@@ -4768,6 +6269,10 @@ public static final void gtk_entry_set_invisible_char(int /*long*/ entry, char c
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEntry *)
+ * @param max cast=(gint)
+ */
public static final native void _gtk_entry_set_max_length(int /*long*/ entry, int max);
public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
lock.lock();
@@ -4777,6 +6282,10 @@ public static final void gtk_entry_set_max_length(int /*long*/ entry, int max) {
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEntry *)
+ * @param text cast=(const gchar *)
+ */
public static final native void _gtk_entry_set_text(int /*long*/ entry, byte[] text);
public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
lock.lock();
@@ -4786,6 +6295,10 @@ public static final void gtk_entry_set_text(int /*long*/ entry, byte[] text) {
lock.unlock();
}
}
+/**
+ * @param entry cast=(GtkEntry *)
+ * @param visible cast=(gboolean)
+ */
public static final native void _gtk_entry_set_visibility(int /*long*/ entry, boolean visible);
public static final void gtk_entry_set_visibility(int /*long*/ entry, boolean visible) {
lock.lock();
@@ -4804,6 +6317,7 @@ public static final int gtk_events_pending() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native boolean _gtk_expander_get_expanded(int /*long*/ expander);
public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
lock.lock();
@@ -4813,6 +6327,7 @@ public static final boolean gtk_expander_get_expanded(int /*long*/ expander) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_expander_get_label_widget(int /*long*/ expander);
public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expander) {
lock.lock();
@@ -4822,6 +6337,10 @@ public static final int /*long*/ gtk_expander_get_label_widget(int /*long*/ expa
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param label cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_expander_new(byte[] label);
public static final int /*long*/ gtk_expander_new(byte[] label) {
lock.lock();
@@ -4831,6 +6350,7 @@ public static final int /*long*/ gtk_expander_new(byte[] label) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_expander_set_expanded(int /*long*/ expander, boolean expanded);
public static final void gtk_expander_set_expanded(int /*long*/ expander, boolean expanded) {
lock.lock();
@@ -4840,6 +6360,10 @@ public static final void gtk_expander_set_expanded(int /*long*/ expander, boolea
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param label cast=(const gchar *)
+ */
public static final native void _gtk_expander_set_label(int /*long*/ expander, byte[] label);
public static final void gtk_expander_set_label(int /*long*/ expander, byte[] label) {
lock.lock();
@@ -4849,6 +6373,7 @@ public static final void gtk_expander_set_label(int /*long*/ expander, byte[] la
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget);
public static final void gtk_expander_set_label_widget(int /*long*/ expander, int /*long*/ label_widget) {
lock.lock();
@@ -4858,6 +6383,7 @@ public static final void gtk_expander_set_label_widget(int /*long*/ expander, i
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter);
public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /*long*/ filter) {
lock.lock();
@@ -4867,6 +6393,7 @@ public static final void gtk_file_chooser_add_filter(int /*long*/ chooser, int /
lock.unlock();
}
}
+/** @method flags=no_gen */
public static final native int /*long*/ _gtk_file_chooser_dialog_new(byte[] title, int /*long*/ parent, int action, int /*long*/ first_button_text, int first_button_id, int /*long*/ second_button_text, int second_button_id, int /*long*/ terminator);
public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /*long*/ parent, int action, int /*long*/ first_button_text, int first_button_id, int /*long*/ second_button_text, int second_button_id, int /*long*/ terminator) {
lock.lock();
@@ -4876,6 +6403,7 @@ public static final int /*long*/ gtk_file_chooser_dialog_new(byte[] title, int /
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_file_chooser_get_current_folder(int /*long*/ chooser);
public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*/ chooser) {
lock.lock();
@@ -4885,6 +6413,7 @@ public static final int /*long*/ gtk_file_chooser_get_current_folder(int /*long*
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_file_chooser_get_filename(int /*long*/ chooser);
public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ chooser) {
lock.lock();
@@ -4894,6 +6423,7 @@ public static final int /*long*/ gtk_file_chooser_get_filename(int /*long*/ choo
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_file_chooser_get_filenames(int /*long*/ chooser);
public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ chooser) {
lock.lock();
@@ -4903,6 +6433,27 @@ public static final int /*long*/ gtk_file_chooser_get_filenames(int /*long*/ cho
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native int /*long*/ _gtk_file_chooser_get_uri(int /*long*/ chooser);
+public static final int /*long*/ gtk_file_chooser_get_uri(int /*long*/ chooser) {
+ lock.lock();
+ try {
+ return _gtk_file_chooser_get_uri(chooser);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
+public static final native int /*long*/ _gtk_file_chooser_get_uris(int /*long*/ chooser);
+public static final int /*long*/ gtk_file_chooser_get_uris(int /*long*/ chooser) {
+ lock.lock();
+ try {
+ return _gtk_file_chooser_get_uris(chooser);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_file_chooser_get_filter(int /*long*/ chooser);
public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ chooser) {
lock.lock();
@@ -4912,6 +6463,7 @@ public static final int /*long*/ gtk_file_chooser_get_filter(int /*long*/ choose
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename);
public static final void gtk_file_chooser_set_current_folder(int /*long*/ chooser, int /*long*/ filename) {
lock.lock();
@@ -4921,6 +6473,17 @@ public static final void gtk_file_chooser_set_current_folder(int /*long*/ choose
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native void _gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri);
+public static final void gtk_file_chooser_set_current_folder_uri(int /*long*/ chooser, byte [] uri) {
+ lock.lock();
+ try {
+ _gtk_file_chooser_set_current_folder_uri(chooser, uri);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name);
public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser, byte[] name) {
lock.lock();
@@ -4930,6 +6493,17 @@ public static final void gtk_file_chooser_set_current_name(int /*long*/ chooser,
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native void _gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only);
+public static final void gtk_file_chooser_set_local_only(int /*long*/ chooser, boolean local_only) {
+ lock.lock();
+ try {
+ _gtk_file_chooser_set_local_only(chooser, local_only);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation);
public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*long*/ chooser, boolean do_overwrite_confirmation) {
lock.lock();
@@ -4939,6 +6513,7 @@ public static final void gtk_file_chooser_set_do_overwrite_confirmation(int /*lo
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget);
public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser, int /*long*/ extra_widget) {
lock.lock();
@@ -4948,6 +6523,7 @@ public static final void gtk_file_chooser_set_extra_widget(int /*long*/ chooser,
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name);
public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int /*long*/ name) {
lock.lock();
@@ -4957,6 +6533,7 @@ public static final void gtk_file_chooser_set_filename(int /*long*/ chooser, int
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter);
public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /*long*/ filter) {
lock.lock();
@@ -4966,6 +6543,17 @@ public static final void gtk_file_chooser_set_filter(int /*long*/ chooser, int /
lock.unlock();
}
}
+/** @method flags=dynamic */
+public static final native void _gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri);
+public static final void gtk_file_chooser_set_uri(int /*long*/ chooser, byte [] uri) {
+ lock.lock();
+ try {
+ _gtk_file_chooser_set_uri(chooser, uri);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
public static final native void _gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple);
public static final void gtk_file_chooser_set_select_multiple(int /*long*/ chooser, boolean select_multiple) {
lock.lock();
@@ -4975,6 +6563,7 @@ public static final void gtk_file_chooser_set_select_multiple(int /*long*/ choos
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern);
public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[] pattern) {
lock.lock();
@@ -4984,6 +6573,7 @@ public static final void gtk_file_filter_add_pattern(int /*long*/ filter, byte[]
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_file_filter_new();
public static final int /*long*/ gtk_file_filter_new() {
lock.lock();
@@ -4993,6 +6583,7 @@ public static final int /*long*/ gtk_file_filter_new() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_file_filter_get_name(int /*long*/ filter);
public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
lock.lock();
@@ -5002,6 +6593,7 @@ public static final int /*long*/ gtk_file_filter_get_name(int /*long*/ filter) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_file_filter_set_name(int /*long*/ filter, byte[] name);
public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] name) {
lock.lock();
@@ -5011,6 +6603,7 @@ public static final void gtk_file_filter_set_name(int /*long*/ filter, byte[] na
lock.unlock();
}
}
+/** @param filesel cast=(GtkFileSelection *) */
public static final native int /*long*/ _gtk_file_selection_get_filename(int /*long*/ filesel);
public static final int /*long*/ gtk_file_selection_get_filename(int /*long*/ filesel) {
lock.lock();
@@ -5020,6 +6613,7 @@ public static final int /*long*/ gtk_file_selection_get_filename(int /*long*/ fi
lock.unlock();
}
}
+/** @param filesel cast=(GtkFileSelection *) */
public static final native int /*long*/ _gtk_file_selection_get_selections(int /*long*/ filesel);
public static final int /*long*/ gtk_file_selection_get_selections(int /*long*/ filesel) {
lock.lock();
@@ -5029,6 +6623,7 @@ public static final int /*long*/ gtk_file_selection_get_selections(int /*long*/
lock.unlock();
}
}
+/** @param filesel cast=(GtkFileSelection *) */
public static final native void _gtk_file_selection_hide_fileop_buttons(int /*long*/ filesel);
public static final void gtk_file_selection_hide_fileop_buttons(int /*long*/ filesel) {
lock.lock();
@@ -5038,6 +6633,7 @@ public static final void gtk_file_selection_hide_fileop_buttons(int /*long*/ fil
lock.unlock();
}
}
+/** @param title cast=(const gchar *) */
public static final native int /*long*/ _gtk_file_selection_new(byte[] title);
public static final int /*long*/ gtk_file_selection_new(byte[] title) {
lock.lock();
@@ -5047,6 +6643,10 @@ public static final int /*long*/ gtk_file_selection_new(byte[] title) {
lock.unlock();
}
}
+/**
+ * @param filesel cast=(GtkFileSelection *)
+ * @param filename cast=(const gchar *)
+ */
public static final native void _gtk_file_selection_set_filename(int /*long*/ filesel, int /*long*/ filename);
public static final void gtk_file_selection_set_filename(int /*long*/ filesel, int /*long*/ filename) {
lock.lock();
@@ -5056,6 +6656,10 @@ public static final void gtk_file_selection_set_filename(int /*long*/ filesel, i
lock.unlock();
}
}
+/**
+ * @param filesel cast=(GtkFileSelection *)
+ * @param select_multiple cast=(gboolean)
+ */
public static final native void _gtk_file_selection_set_select_multiple(int /*long*/ filesel, boolean select_multiple);
public static final void gtk_file_selection_set_select_multiple(int /*long*/ filesel, boolean select_multiple) {
lock.lock();
@@ -5065,6 +6669,12 @@ public static final void gtk_file_selection_set_select_multiple(int /*long*/ fil
lock.unlock();
}
}
+/**
+ * @param fixed cast=(GtkFixed *)
+ * @param widget cast=(GtkWidget *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native void _gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y);
public static final void gtk_fixed_move(int /*long*/ fixed, int /*long*/ widget, int x, int y) {
lock.lock();
@@ -5083,6 +6693,10 @@ public static final int /*long*/ gtk_fixed_new() {
lock.unlock();
}
}
+/**
+ * @param fixed cast=(GtkFixed *)
+ * @param has_window cast=(gboolean)
+ */
public static final native void _gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window);
public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean has_window) {
lock.lock();
@@ -5092,6 +6706,7 @@ public static final void gtk_fixed_set_has_window(int /*long*/ fixed, boolean ha
lock.unlock();
}
}
+/** @param fsd cast=(GtkFontSelectionDialog *) */
public static final native int /*long*/ _gtk_font_selection_dialog_get_font_name(int /*long*/ fsd);
public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*long*/ fsd) {
lock.lock();
@@ -5101,6 +6716,7 @@ public static final int /*long*/ gtk_font_selection_dialog_get_font_name(int /*l
lock.unlock();
}
}
+/** @param title cast=(const gchar *) */
public static final native int /*long*/ _gtk_font_selection_dialog_new(byte[] title);
public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
lock.lock();
@@ -5110,6 +6726,10 @@ public static final int /*long*/ gtk_font_selection_dialog_new(byte[] title) {
lock.unlock();
}
}
+/**
+ * @param fsd cast=(GtkFontSelectionDialog *)
+ * @param fontname cast=(const gchar *)
+ */
public static final native boolean _gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname);
public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/ fsd, byte[] fontname) {
lock.lock();
@@ -5119,6 +6739,7 @@ public static final boolean gtk_font_selection_dialog_set_font_name(int /*long*/
lock.unlock();
}
}
+/** @param label cast=(const gchar *) */
public static final native int /*long*/ _gtk_frame_new(byte[] label);
public static final int /*long*/ gtk_frame_new(byte[] label) {
lock.lock();
@@ -5128,6 +6749,7 @@ public static final int /*long*/ gtk_frame_new(byte[] label) {
lock.unlock();
}
}
+/** @param frame cast=(GtkFrame *) */
public static final native int /*long*/ _gtk_frame_get_label_widget(int /*long*/ frame);
public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame) {
lock.lock();
@@ -5137,6 +6759,10 @@ public static final int /*long*/ gtk_frame_get_label_widget(int /*long*/ frame)
lock.unlock();
}
}
+/**
+ * @param frame cast=(GtkFrame *)
+ * @param label cast=(const gchar *)
+ */
public static final native void _gtk_frame_set_label(int /*long*/ frame, byte[] label);
public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
lock.lock();
@@ -5146,6 +6772,10 @@ public static final void gtk_frame_set_label(int /*long*/ frame, byte[] label) {
lock.unlock();
}
}
+/**
+ * @param frame cast=(GtkFrame *)
+ * @param label_widget cast=(GtkWidget *)
+ */
public static final native void _gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget);
public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*long*/ label_widget) {
lock.lock();
@@ -5155,6 +6785,10 @@ public static final void gtk_frame_set_label_widget(int /*long*/ frame, int /*lo
lock.unlock();
}
}
+/**
+ * @param frame cast=(GtkFrame *)
+ * @param type cast=(GtkShadowType)
+ */
public static final native void _gtk_frame_set_shadow_type(int /*long*/ frame, int type);
public static final void gtk_frame_set_shadow_type(int /*long*/ frame, int type) {
lock.lock();
@@ -5173,6 +6807,7 @@ public static final int /*long*/ gtk_get_current_event() {
lock.unlock();
}
}
+/** @param state cast=(GdkModifierType*) */
public static final native boolean _gtk_get_current_event_state (int[] state);
public static final boolean gtk_get_current_event_state (int[] state) {
lock.lock();
@@ -5200,6 +6835,7 @@ public static final int /*long*/ gtk_get_default_language() {
lock.unlock();
}
}
+/** @param event cast=(GdkEvent *) */
public static final native int /*long*/ _gtk_get_event_widget(int /*long*/ event);
public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
lock.lock();
@@ -5209,6 +6845,7 @@ public static final int /*long*/ gtk_get_event_widget(int /*long*/ event) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_grab_add(int /*long*/ widget);
public static final void gtk_grab_add(int /*long*/ widget) {
lock.lock();
@@ -5227,6 +6864,7 @@ public static final int /*long*/ gtk_grab_get_current() {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_grab_remove(int /*long*/ widget);
public static final void gtk_grab_remove(int /*long*/ widget) {
lock.lock();
@@ -5236,6 +6874,10 @@ public static final void gtk_grab_remove(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param homogeneous cast=(gboolean)
+ * @param spacing cast=(gint)
+ */
public static final native int /*long*/ _gtk_hbox_new(boolean homogeneous, int spacing);
public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing) {
lock.lock();
@@ -5245,6 +6887,7 @@ public static final int /*long*/ gtk_hbox_new(boolean homogeneous, int spacing)
lock.unlock();
}
}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native int /*long*/ _gtk_hscale_new(int /*long*/ adjustment);
public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
lock.lock();
@@ -5254,6 +6897,7 @@ public static final int /*long*/ gtk_hscale_new(int /*long*/ adjustment) {
lock.unlock();
}
}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native int /*long*/ _gtk_hscrollbar_new(int /*long*/ adjustment);
public static final int /*long*/ gtk_hscrollbar_new(int /*long*/ adjustment) {
lock.lock();
@@ -5272,6 +6916,7 @@ public static final int /*long*/ gtk_hseparator_new() {
lock.unlock();
}
}
+/** @param stock_id cast=(const gchar *) */
public static final native int /*long*/ _gtk_icon_factory_lookup_default(byte[] stock_id);
public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id) {
lock.lock();
@@ -5281,6 +6926,7 @@ public static final int /*long*/ gtk_icon_factory_lookup_default(byte[] stock_id
lock.unlock();
}
}
+/** @param source cast=(GtkIconSource *) */
public static final native void _gtk_icon_source_free(int /*long*/ source);
public static final void gtk_icon_source_free(int /*long*/ source) {
lock.lock();
@@ -5299,6 +6945,10 @@ public static final int /*long*/ gtk_icon_source_new() {
lock.unlock();
}
}
+/**
+ * @param source cast=(GtkIconSource *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ */
public static final native void _gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf);
public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*long*/ pixbuf) {
lock.lock();
@@ -5308,6 +6958,15 @@ public static final void gtk_icon_source_set_pixbuf(int /*long*/ source, int /*l
lock.unlock();
}
}
+/**
+ * @param icon_set cast=(GtkIconSet *)
+ * @param style cast=(GtkStyle *)
+ * @param direction cast=(GtkTextDirection)
+ * @param state cast=(GtkStateType)
+ * @param size cast=(GtkIconSize)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const char *)
+ */
public static final native int /*long*/ _gtk_icon_set_render_icon(int /*long*/ icon_set, int /*long*/ style, int direction, int state, int size, int /*long*/ widget, int /*long*/ detail);
public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set, int /*long*/ style, int direction, int state, int size, int /*long*/ widget, int /*long*/ detail) {
lock.lock();
@@ -5317,6 +6976,10 @@ public static final int /*long*/ gtk_icon_set_render_icon(int /*long*/ icon_set,
lock.unlock();
}
}
+/**
+ * @param context cast=(GtkIMContext *)
+ * @param event cast=(GdkEventKey *)
+ */
public static final native boolean _gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event);
public static final boolean gtk_im_context_filter_keypress(int /*long*/ context, int /*long*/ event) {
lock.lock();
@@ -5326,6 +6989,7 @@ public static final boolean gtk_im_context_filter_keypress(int /*long*/ context,
lock.unlock();
}
}
+/** @param context cast=(GtkIMContext *) */
public static final native void _gtk_im_context_focus_in(int /*long*/ context);
public static final void gtk_im_context_focus_in(int /*long*/ context) {
lock.lock();
@@ -5335,6 +6999,7 @@ public static final void gtk_im_context_focus_in(int /*long*/ context) {
lock.unlock();
}
}
+/** @param context cast=(GtkIMContext *) */
public static final native void _gtk_im_context_focus_out(int /*long*/ context);
public static final void gtk_im_context_focus_out(int /*long*/ context) {
lock.lock();
@@ -5344,6 +7009,12 @@ public static final void gtk_im_context_focus_out(int /*long*/ context) {
lock.unlock();
}
}
+/**
+ * @param context cast=(GtkIMContext *)
+ * @param str cast=(gchar **)
+ * @param attrs cast=(PangoAttrList **)
+ * @param cursor_pos cast=(gint *)
+ */
public static final native void _gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos);
public static final void gtk_im_context_get_preedit_string(int /*long*/ context, int /*long*/[] str, int /*long*/[] attrs, int[] cursor_pos) {
lock.lock();
@@ -5362,6 +7033,7 @@ public static final int /*long*/ gtk_im_context_get_type() {
lock.unlock();
}
}
+/** @param context cast=(GtkIMContext *) */
public static final native void _gtk_im_context_reset(int /*long*/ context);
public static final void gtk_im_context_reset(int /*long*/ context) {
lock.lock();
@@ -5371,6 +7043,10 @@ public static final void gtk_im_context_reset(int /*long*/ context) {
lock.unlock();
}
}
+/**
+ * @param context cast=(GtkIMContext *)
+ * @param window cast=(GdkWindow *)
+ */
public static final native void _gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window);
public static final void gtk_im_context_set_client_window(int /*long*/ context, int /*long*/ window) {
lock.lock();
@@ -5380,6 +7056,10 @@ public static final void gtk_im_context_set_client_window(int /*long*/ context,
lock.unlock();
}
}
+/**
+ * @param context cast=(GtkIMContext *)
+ * @param area cast=(GdkRectangle *),flags=no_out
+ */
public static final native void _gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area);
public static final void gtk_im_context_set_cursor_location(int /*long*/ context, GdkRectangle area) {
lock.lock();
@@ -5389,6 +7069,10 @@ public static final void gtk_im_context_set_cursor_location(int /*long*/ context
lock.unlock();
}
}
+/**
+ * @param context cast=(GtkIMMulticontext *)
+ * @param menushell cast=(GtkMenuShell *)
+ */
public static final native void _gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell);
public static final void gtk_im_multicontext_append_menuitems (int /*long*/ context, int /*long*/ menushell) {
lock.lock();
@@ -5407,6 +7091,7 @@ public static final int /*long*/ gtk_im_multicontext_new() {
lock.unlock();
}
}
+/** @param label cast=(const gchar *) */
public static final native int /*long*/ _gtk_image_menu_item_new_with_label(byte[] label);
public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label) {
lock.lock();
@@ -5416,6 +7101,10 @@ public static final int /*long*/ gtk_image_menu_item_new_with_label(byte[] label
lock.unlock();
}
}
+/**
+ * @param menu_item cast=(GtkImageMenuItem *)
+ * @param image cast=(GtkWidget *)
+ */
public static final native void _gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image);
public static final void gtk_image_menu_item_set_image(int /*long*/ menu_item, int /*long*/ image) {
lock.lock();
@@ -5434,6 +7123,7 @@ public static final int /*long*/ gtk_image_new() {
lock.unlock();
}
}
+/** @param pixbuf cast=(GdkPixbuf *) */
public static final native int /*long*/ _gtk_image_new_from_pixbuf(int /*long*/ pixbuf);
public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf) {
lock.lock();
@@ -5443,6 +7133,10 @@ public static final int /*long*/ gtk_image_new_from_pixbuf(int /*long*/ pixbuf)
lock.unlock();
}
}
+/**
+ * @param pixmap cast=(GdkPixmap *)
+ * @param mask cast=(GdkBitmap *)
+ */
public static final native int /*long*/ _gtk_image_new_from_pixmap(int /*long*/ pixmap, int /*long*/ mask);
public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap, int /*long*/ mask) {
lock.lock();
@@ -5452,6 +7146,10 @@ public static final int /*long*/ gtk_image_new_from_pixmap(int /*long*/ pixmap,
lock.unlock();
}
}
+/**
+ * @param image cast=(GtkImage *)
+ * @param pixbuf cast=(GdkPixbuf *)
+ */
public static final native void _gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf);
public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*long*/ pixbuf) {
lock.lock();
@@ -5461,6 +7159,11 @@ public static final void gtk_image_set_from_pixbuf(int /*long*/ image, int /*lon
lock.unlock();
}
}
+/**
+ * @param image cast=(GtkImage *)
+ * @param pixmap cast=(GdkBitmap *)
+ * @param mask cast=(GdkBitmap *)
+ */
public static final native void _gtk_image_set_from_pixmap(int /*long*/ image, int /*long*/ pixmap, int /*long*/ mask);
public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*long*/ pixmap, int /*long*/ mask) {
lock.lock();
@@ -5470,6 +7173,10 @@ public static final void gtk_image_set_from_pixmap(int /*long*/ image, int /*lon
lock.unlock();
}
}
+/**
+ * @param argc cast=(int *)
+ * @param argv cast=(char ***)
+ */
public static final native boolean _gtk_init_check(int /*long*/[] argc, int /*long*/[] argv);
public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] argv) {
lock.lock();
@@ -5479,6 +7186,7 @@ public static final boolean gtk_init_check(int /*long*/[] argc, int /*long*/[] a
lock.unlock();
}
}
+/** @param label cast=(GtkLabel *) */
public static final native int /*long*/ _gtk_label_get_layout(int /*long*/ label);
public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
lock.lock();
@@ -5488,6 +7196,7 @@ public static final int /*long*/ gtk_label_get_layout(int /*long*/ label) {
lock.unlock();
}
}
+/** @param label cast=(GtkLabel *) */
public static final native int _gtk_label_get_mnemonic_keyval(int /*long*/ label);
public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
lock.lock();
@@ -5497,6 +7206,7 @@ public static final int gtk_label_get_mnemonic_keyval(int /*long*/ label) {
lock.unlock();
}
}
+/** @param label cast=(const gchar *) */
public static final native int /*long*/ _gtk_label_new(byte[] label);
public static final int /*long*/ gtk_label_new(byte[] label) {
lock.lock();
@@ -5506,6 +7216,7 @@ public static final int /*long*/ gtk_label_new(byte[] label) {
lock.unlock();
}
}
+/** @param str cast=(const gchar *) */
public static final native int /*long*/ _gtk_label_new_with_mnemonic(byte[] str);
public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
lock.lock();
@@ -5515,6 +7226,10 @@ public static final int /*long*/ gtk_label_new_with_mnemonic(byte[] str) {
lock.unlock();
}
}
+/**
+ * @param label cast=(GtkLabel *)
+ * @param attrs cast=(PangoAttrList *)
+ */
public static final native void _gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs);
public static final void gtk_label_set_attributes(int /*long*/ label, int /*long*/ attrs) {
lock.lock();
@@ -5524,6 +7239,10 @@ public static final void gtk_label_set_attributes(int /*long*/ label, int /*long
lock.unlock();
}
}
+/**
+ * @param label cast=(GtkLabel *)
+ * @param jtype cast=(GtkJustification)
+ */
public static final native void _gtk_label_set_justify(int /*long*/ label, int jtype);
public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
lock.lock();
@@ -5533,6 +7252,10 @@ public static final void gtk_label_set_justify(int /*long*/ label, int jtype) {
lock.unlock();
}
}
+/**
+ * @param label cast=(GtkLabel *)
+ * @param wrap cast=(gboolean)
+ */
public static final native void _gtk_label_set_line_wrap(int /*long*/ label, boolean wrap);
public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wrap) {
lock.lock();
@@ -5542,6 +7265,7 @@ public static final void gtk_label_set_line_wrap(int /*long*/ label, boolean wra
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode);
public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wrap_mode) {
lock.lock();
@@ -5551,6 +7275,10 @@ public static final void gtk_label_set_line_wrap_mode(int /*long*/ label, int wr
lock.unlock();
}
}
+/**
+ * @param label cast=(GtkLabel *)
+ * @param str cast=(const gchar *)
+ */
public static final native void _gtk_label_set_text(int /*long*/ label, int /*long*/ str);
public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str) {
lock.lock();
@@ -5560,6 +7288,10 @@ public static final void gtk_label_set_text(int /*long*/ label, int /*long*/ str
lock.unlock();
}
}
+/**
+ * @param label cast=(GtkLabel *)
+ * @param str cast=(const gchar *)
+ */
public static final native void _gtk_label_set_text(int /*long*/ label, byte[] str);
public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
lock.lock();
@@ -5569,6 +7301,10 @@ public static final void gtk_label_set_text(int /*long*/ label, byte[] str) {
lock.unlock();
}
}
+/**
+ * @param label cast=(GtkLabel *)
+ * @param str cast=(const gchar *)
+ */
public static final native void _gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str);
public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, byte[] str) {
lock.lock();
@@ -5578,6 +7314,10 @@ public static final void gtk_label_set_text_with_mnemonic(int /*long*/ label, by
lock.unlock();
}
}
+/**
+ * @param list cast=(GtkList *)
+ * @param items cast=(GList *)
+ */
public static final native void _gtk_list_append_items(int /*long*/ list, int /*long*/ items);
public static final void gtk_list_append_items(int /*long*/ list, int /*long*/ items) {
lock.lock();
@@ -5587,6 +7327,7 @@ public static final void gtk_list_append_items(int /*long*/ list, int /*long*/ i
lock.unlock();
}
}
+/** @param list cast=(GtkList *) */
public static final native void _gtk_list_clear_items(int /*long*/ list, int start, int end);
public static final void gtk_list_clear_items(int /*long*/ list, int start, int end) {
lock.lock();
@@ -5596,6 +7337,10 @@ public static final void gtk_list_clear_items(int /*long*/ list, int start, int
lock.unlock();
}
}
+/**
+ * @param list cast=(GtkList *)
+ * @param items cast=(GList *)
+ */
public static final native void _gtk_list_insert_items(int /*long*/ list, int /*long*/ items, int position);
public static final void gtk_list_insert_items(int /*long*/ list, int /*long*/ items, int position) {
lock.lock();
@@ -5605,6 +7350,7 @@ public static final void gtk_list_insert_items(int /*long*/ list, int /*long*/ i
lock.unlock();
}
}
+/** @param label cast=(const gchar *) */
public static final native int /*long*/ _gtk_list_item_new_with_label(byte[] label);
public static final int /*long*/ gtk_list_item_new_with_label(byte[] label) {
lock.lock();
@@ -5614,6 +7360,10 @@ public static final int /*long*/ gtk_list_item_new_with_label(byte[] label) {
lock.unlock();
}
}
+/**
+ * @param list cast=(GtkList *)
+ * @param items cast=(GList *)
+ */
public static final native void _gtk_list_remove_items(int /*long*/ list, int /*long*/ items);
public static final void gtk_list_remove_items(int /*long*/ list, int /*long*/ items) {
lock.lock();
@@ -5623,6 +7373,7 @@ public static final void gtk_list_remove_items(int /*long*/ list, int /*long*/ i
lock.unlock();
}
}
+/** @param list cast=(GtkList *) */
public static final native void _gtk_list_select_item(int /*long*/ list, int item);
public static final void gtk_list_select_item(int /*long*/ list, int item) {
lock.lock();
@@ -5632,6 +7383,7 @@ public static final void gtk_list_select_item(int /*long*/ list, int item) {
lock.unlock();
}
}
+/** @param list cast=(GtkList *) */
public static final native void _gtk_list_unselect_all(int /*long*/ list);
public static final void gtk_list_unselect_all(int /*long*/ list) {
lock.lock();
@@ -5641,6 +7393,7 @@ public static final void gtk_list_unselect_all(int /*long*/ list) {
lock.unlock();
}
}
+/** @param list cast=(GtkList *) */
public static final native void _gtk_list_unselect_item(int /*long*/ list, int item);
public static final void gtk_list_unselect_item(int /*long*/ list, int item) {
lock.lock();
@@ -5650,6 +7403,10 @@ public static final void gtk_list_unselect_item(int /*long*/ list, int item) {
lock.unlock();
}
}
+/**
+ * @param list_store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter);
public static final void gtk_list_store_append(int /*long*/ list_store, int /*long*/ iter) {
lock.lock();
@@ -5659,6 +7416,7 @@ public static final void gtk_list_store_append(int /*long*/ list_store, int /*lo
lock.unlock();
}
}
+/** @param store cast=(GtkListStore *) */
public static final native void _gtk_list_store_clear(int /*long*/ store);
public static final void gtk_list_store_clear(int /*long*/ store) {
lock.lock();
@@ -5668,6 +7426,11 @@ public static final void gtk_list_store_clear(int /*long*/ store) {
lock.unlock();
}
}
+/**
+ * @param list_store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param position cast=(gint)
+ */
public static final native void _gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position);
public static final void gtk_list_store_insert(int /*long*/ list_store, int /*long*/ iter, int position) {
lock.lock();
@@ -5677,6 +7440,10 @@ public static final void gtk_list_store_insert(int /*long*/ list_store, int /*lo
lock.unlock();
}
}
+/**
+ * @param numColumns cast=(gint)
+ * @param types cast=(GType *)
+ */
public static final native int /*long*/ _gtk_list_store_newv(int numColumns, int /*long*/[] types);
public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*/[] types) {
lock.lock();
@@ -5686,6 +7453,10 @@ public static final int /*long*/ gtk_list_store_newv(int numColumns, int /*long*
lock.unlock();
}
}
+/**
+ * @param list_store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter);
public static final void gtk_list_store_remove(int /*long*/ list_store, int /*long*/ iter) {
lock.lock();
@@ -5695,6 +7466,10 @@ public static final void gtk_list_store_remove(int /*long*/ list_store, int /*lo
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator);
public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) {
lock.lock();
@@ -5704,6 +7479,10 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator);
public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) {
lock.lock();
@@ -5713,6 +7492,10 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator);
public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) {
lock.lock();
@@ -5722,6 +7505,11 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param value flags=no_out
+ */
public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator);
public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) {
lock.lock();
@@ -5731,6 +7519,10 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkListStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator);
public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) {
lock.lock();
@@ -5740,6 +7532,7 @@ public static final void gtk_list_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/** @method flags=const */
public static final native int _gtk_major_version();
public static final int gtk_major_version() {
lock.lock();
@@ -5749,6 +7542,7 @@ public static final int gtk_major_version() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int _gtk_minor_version();
public static final int gtk_minor_version() {
lock.lock();
@@ -5758,6 +7552,7 @@ public static final int gtk_minor_version() {
lock.unlock();
}
}
+/** @method flags=const */
public static final native int _gtk_micro_version();
public static final int gtk_micro_version() {
lock.lock();
@@ -5785,6 +7580,7 @@ public static final int gtk_main_iteration() {
lock.unlock();
}
}
+/** @param event cast=(GdkEvent *) */
public static final native void _gtk_main_do_event(int /*long*/ event);
public static final void gtk_main_do_event(int /*long*/ event) {
lock.lock();
@@ -5803,6 +7599,17 @@ public static final int /*long*/ gtk_menu_bar_new() {
lock.unlock();
}
}
+/** @param menu cast=(GtkMenu *) */
+public static final native int /*long*/ _gtk_menu_get_attach_widget(int /*long*/ menu);
+public static final int /*long*/ gtk_menu_get_attach_widget(int /*long*/ menu) {
+ lock.lock();
+ try {
+ return _gtk_menu_get_attach_widget(menu);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param menu_item cast=(GtkMenuItem *) */
public static final native void _gtk_menu_item_remove_submenu(int /*long*/ menu_item);
public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
lock.lock();
@@ -5812,6 +7619,7 @@ public static final void gtk_menu_item_remove_submenu(int /*long*/ menu_item) {
lock.unlock();
}
}
+/** @param menu_item cast=(GtkMenuItem *) */
public static final native int /*long*/ _gtk_menu_item_get_submenu(int /*long*/ menu_item);
public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_item) {
lock.lock();
@@ -5821,6 +7629,10 @@ public static final int /*long*/ gtk_menu_item_get_submenu(int /*long*/ menu_ite
lock.unlock();
}
}
+/**
+ * @param menu_item cast=(GtkMenuItem *)
+ * @param submenu cast=(GtkWidget *)
+ */
public static final native void _gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu);
public static final void gtk_menu_item_set_submenu(int /*long*/ menu_item, int /*long*/ submenu) {
lock.lock();
@@ -5839,6 +7651,7 @@ public static final int /*long*/ gtk_menu_new() {
lock.unlock();
}
}
+/** @param menu cast=(GtkMenu *) */
public static final native void _gtk_menu_popdown(int /*long*/ menu);
public static final void gtk_menu_popdown(int /*long*/ menu) {
lock.lock();
@@ -5848,6 +7661,15 @@ public static final void gtk_menu_popdown(int /*long*/ menu) {
lock.unlock();
}
}
+/**
+ * @param menu cast=(GtkMenu *)
+ * @param parent_menu_shell cast=(GtkWidget *)
+ * @param parent_menu_item cast=(GtkWidget *)
+ * @param func cast=(GtkMenuPositionFunc)
+ * @param data cast=(gpointer)
+ * @param button cast=(guint)
+ * @param activate_time cast=(guint32)
+ */
public static final native void _gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_menu_shell, int /*long*/ parent_menu_item, int /*long*/ func, int /*long*/ data, int button, int activate_time);
public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_menu_shell, int /*long*/ parent_menu_item, int /*long*/ func, int /*long*/ data, int button, int activate_time) {
lock.lock();
@@ -5857,6 +7679,7 @@ public static final void gtk_menu_popup(int /*long*/ menu, int /*long*/ parent_m
lock.unlock();
}
}
+/** @param menu_shell cast=(GtkMenuShell *) */
public static final native void _gtk_menu_shell_deactivate(int /*long*/ menu_shell);
public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
lock.lock();
@@ -5866,6 +7689,11 @@ public static final void gtk_menu_shell_deactivate(int /*long*/ menu_shell) {
lock.unlock();
}
}
+/**
+ * @param menu_shell cast=(GtkMenuShell *)
+ * @param child cast=(GtkWidget *)
+ * @param position cast=(gint)
+ */
public static final native void _gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position);
public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*long*/ child, int position) {
lock.lock();
@@ -5875,6 +7703,10 @@ public static final void gtk_menu_shell_insert(int /*long*/ menu_shell, int /*lo
lock.unlock();
}
}
+/**
+ * @param menu_shell cast=(GtkMenuShell *)
+ * @param menu_item cast=(GtkWidget *)
+ */
public static final native void _gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item);
public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int /*long*/ menu_item) {
lock.lock();
@@ -5884,6 +7716,11 @@ public static final void gtk_menu_shell_select_item(int /*long*/ menu_shell, int
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param menu_shell cast=(GtkMenuShell *)
+ * @param take_focus cast=(gboolean)
+ */
public static final native void _gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus);
public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell, boolean take_focus) {
lock.lock();
@@ -5893,6 +7730,13 @@ public static final void gtk_menu_shell_set_take_focus(int /*long*/ menu_shell,
lock.unlock();
}
}
+/**
+ * @param parent cast=(GtkWindow *)
+ * @param flags cast=(GtkDialogFlags)
+ * @param type cast=(GtkMessageType)
+ * @param buttons cast=(GtkButtonsType)
+ * @param message_format cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format);
public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int flags, int type, int buttons, byte[] message_format) {
lock.lock();
@@ -5902,6 +7746,11 @@ public static final int /*long*/ gtk_message_dialog_new(int /*long*/ parent, int
lock.unlock();
}
}
+/**
+ * @param misc cast=(GtkMisc *)
+ * @param xalign cast=(gfloat)
+ * @param yalign cast=(gfloat)
+ */
public static final native void _gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign);
public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign, float yalign) {
lock.lock();
@@ -5911,6 +7760,7 @@ public static final void gtk_misc_set_alignment(int /*long*/ misc, float xalign,
lock.unlock();
}
}
+/** @param notebook cast=(GtkNotebook *) */
public static final native int _gtk_notebook_get_current_page(int /*long*/ notebook);
public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
lock.lock();
@@ -5920,6 +7770,7 @@ public static final int gtk_notebook_get_current_page(int /*long*/ notebook) {
lock.unlock();
}
}
+/** @param notebook cast=(GtkNotebook *) */
public static final native boolean _gtk_notebook_get_scrollable(int /*long*/ notebook);
public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
lock.lock();
@@ -5929,6 +7780,12 @@ public static final boolean gtk_notebook_get_scrollable(int /*long*/ notebook) {
lock.unlock();
}
}
+/**
+ * @param notebook cast=(GtkNotebook *)
+ * @param child cast=(GtkWidget *)
+ * @param tab_label cast=(GtkWidget *)
+ * @param position cast=(gint)
+ */
public static final native void _gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position);
public static final void gtk_notebook_insert_page(int /*long*/ notebook, int /*long*/ child, int /*long*/ tab_label, int position) {
lock.lock();
@@ -5947,6 +7804,7 @@ public static final int /*long*/ gtk_notebook_new() {
lock.unlock();
}
}
+/** @param notebook cast=(GtkNotebook *) */
public static final native void _gtk_notebook_next_page(int /*long*/ notebook);
public static final void gtk_notebook_next_page(int /*long*/ notebook) {
lock.lock();
@@ -5956,6 +7814,7 @@ public static final void gtk_notebook_next_page(int /*long*/ notebook) {
lock.unlock();
}
}
+/** @param notebook cast=(GtkNotebook *) */
public static final native void _gtk_notebook_prev_page(int /*long*/ notebook);
public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
lock.lock();
@@ -5965,6 +7824,10 @@ public static final void gtk_notebook_prev_page(int /*long*/ notebook) {
lock.unlock();
}
}
+/**
+ * @param notebook cast=(GtkNotebook *)
+ * @param page_num cast=(gint)
+ */
public static final native void _gtk_notebook_remove_page(int /*long*/ notebook, int page_num);
public static final void gtk_notebook_remove_page(int /*long*/ notebook, int page_num) {
lock.lock();
@@ -5974,6 +7837,10 @@ public static final void gtk_notebook_remove_page(int /*long*/ notebook, int pag
lock.unlock();
}
}
+/**
+ * @param notebook cast=(GtkNotebook *)
+ * @param page_num cast=(gint)
+ */
public static final native void _gtk_notebook_set_current_page(int /*long*/ notebook, int page_num);
public static final void gtk_notebook_set_current_page(int /*long*/ notebook, int page_num) {
lock.lock();
@@ -5983,6 +7850,10 @@ public static final void gtk_notebook_set_current_page(int /*long*/ notebook, in
lock.unlock();
}
}
+/**
+ * @param notebook cast=(GtkNotebook *)
+ * @param scrollable cast=(gboolean)
+ */
public static final native void _gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable);
public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, boolean scrollable) {
lock.lock();
@@ -5992,6 +7863,10 @@ public static final void gtk_notebook_set_scrollable(int /*long*/ notebook, bool
lock.unlock();
}
}
+/**
+ * @param notebook cast=(GtkNotebook *)
+ * @param show_tabs cast=(gboolean)
+ */
public static final native void _gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs);
public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boolean show_tabs) {
lock.lock();
@@ -6001,6 +7876,10 @@ public static final void gtk_notebook_set_show_tabs(int /*long*/ notebook, boole
lock.unlock();
}
}
+/**
+ * @param notebook cast=(GtkNotebook *)
+ * @param pos cast=(GtkPositionType)
+ */
public static final native void _gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos);
public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos) {
lock.lock();
@@ -6010,6 +7889,7 @@ public static final void gtk_notebook_set_tab_pos(int /*long*/ notebook, int pos
lock.unlock();
}
}
+/** @param object cast=(GtkObject *) */
public static final native void _gtk_object_sink(int /*long*/ object);
public static final void gtk_object_sink(int /*long*/ object) {
lock.lock();
@@ -6019,6 +7899,7 @@ public static final void gtk_object_sink(int /*long*/ object) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_page_setup_new ();
public static final int /*long*/ gtk_page_setup_new () {
lock.lock();
@@ -6028,6 +7909,7 @@ public static final int /*long*/ gtk_page_setup_new () {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_page_setup_get_orientation(int /*long*/ setup);
public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
lock.lock();
@@ -6037,6 +7919,7 @@ public static final int gtk_page_setup_get_orientation(int /*long*/ setup) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_page_setup_set_orientation(int /*long*/ setup, int orientation);
public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int orientation) {
lock.lock();
@@ -6046,6 +7929,7 @@ public static final void gtk_page_setup_set_orientation(int /*long*/ setup, int
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_page_setup_get_paper_size(int /*long*/ setup);
public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setup) {
lock.lock();
@@ -6055,6 +7939,7 @@ public static final int /*long*/ gtk_page_setup_get_paper_size(int /*long*/ setu
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size);
public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /*long*/ size) {
lock.lock();
@@ -6064,6 +7949,7 @@ public static final void gtk_page_setup_set_paper_size(int /*long*/ setup, int /
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_top_margin(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int unit) {
lock.lock();
@@ -6073,6 +7959,7 @@ public static final double gtk_page_setup_get_top_margin(int /*long*/ setup, int
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit);
public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, double margin, int unit) {
lock.lock();
@@ -6082,6 +7969,7 @@ public static final void gtk_page_setup_set_top_margin(int /*long*/ setup, doubl
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup, int unit) {
lock.lock();
@@ -6091,6 +7979,7 @@ public static final double gtk_page_setup_get_bottom_margin(int /*long*/ setup,
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit);
public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, double margin, int unit) {
lock.lock();
@@ -6100,6 +7989,7 @@ public static final void gtk_page_setup_set_bottom_margin(int /*long*/ setup, do
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_left_margin(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, int unit) {
lock.lock();
@@ -6109,6 +7999,7 @@ public static final double gtk_page_setup_get_left_margin(int /*long*/ setup, in
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit);
public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, double margin, int unit) {
lock.lock();
@@ -6118,6 +8009,7 @@ public static final void gtk_page_setup_set_left_margin(int /*long*/ setup, doub
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_right_margin(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, int unit) {
lock.lock();
@@ -6127,6 +8019,7 @@ public static final double gtk_page_setup_get_right_margin(int /*long*/ setup, i
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit);
public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, double margin, int unit) {
lock.lock();
@@ -6136,6 +8029,7 @@ public static final void gtk_page_setup_set_right_margin(int /*long*/ setup, dou
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_paper_width(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, int unit) {
lock.lock();
@@ -6145,6 +8039,7 @@ public static final double gtk_page_setup_get_paper_width(int /*long*/ setup, in
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_paper_height(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, int unit) {
lock.lock();
@@ -6154,6 +8049,7 @@ public static final double gtk_page_setup_get_paper_height(int /*long*/ setup, i
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_page_width(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int unit) {
lock.lock();
@@ -6163,6 +8059,7 @@ public static final double gtk_page_setup_get_page_width(int /*long*/ setup, int
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_page_setup_get_page_height(int /*long*/ setup, int unit);
public static final double gtk_page_setup_get_page_height(int /*long*/ setup, int unit) {
lock.lock();
@@ -6172,6 +8069,13 @@ public static final double gtk_page_setup_get_page_height(int /*long*/ setup, in
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param area flags=no_out
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_handle(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
lock.lock();
@@ -6181,6 +8085,12 @@ public static final void gtk_paint_handle(int /*long*/ style, int /*long*/ windo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_flat_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6190,6 +8100,13 @@ public static final void gtk_paint_flat_box(int /*long*/ style, int /*long*/ win
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param area flags=no_out
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_focus(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6199,6 +8116,12 @@ public static final void gtk_paint_focus(int /*long*/ style, int /*long*/ window
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_option(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_option(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6208,6 +8131,12 @@ public static final void gtk_paint_option(int /*long*/ style, int /*long*/ windo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_slider(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation);
public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int orientation) {
lock.lock();
@@ -6217,6 +8146,12 @@ public static final void gtk_paint_slider(int /*long*/ style, int /*long*/ windo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_tab(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6226,6 +8161,12 @@ public static final void gtk_paint_tab(int /*long*/ style, int /*long*/ window,
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_arrow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height);
public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int arrow_type, boolean fill, int x, int y, int width, int height) {
lock.lock();
@@ -6236,6 +8177,12 @@ public static final void gtk_paint_arrow(int /*long*/ style, int /*long*/ window
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6245,6 +8192,12 @@ public static final void gtk_paint_box(int /*long*/ style, int /*long*/ window,
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
public static final native void _gtk_paint_box_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
lock.lock();
@@ -6254,6 +8207,12 @@ public static final void gtk_paint_box_gap(int /*long*/ style, int /*long*/ wind
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_check(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6263,6 +8222,12 @@ public static final void gtk_paint_check(int /*long*/ style, int /*long*/ window
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_expander(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int expander_style);
public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int expander_style) {
lock.lock();
@@ -6272,6 +8237,12 @@ public static final void gtk_paint_expander(int /*long*/ style, int /*long*/ win
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
public static final native void _gtk_paint_extension(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side);
public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side) {
lock.lock();
@@ -6281,6 +8252,12 @@ public static final void gtk_paint_extension(int /*long*/ style, int /*long*/ wi
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_hline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x1 , int x2, int y);
public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x1 , int x2, int y) {
lock.lock();
@@ -6290,6 +8267,13 @@ public static final void gtk_paint_hline(int /*long*/ style, int /*long*/ window
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ * @param layout cast=(PangoLayout *)
+ */
public static final native void _gtk_paint_layout(int /*long*/ style, int /*long*/ window, int state_type, boolean use_text, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int /*long*/ layout);
public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ window, int state_type, boolean use_text, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int /*long*/ layout) {
lock.lock();
@@ -6299,6 +8283,12 @@ public static final void gtk_paint_layout(int /*long*/ style, int /*long*/ windo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
public static final native void _gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width);
public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height, int gap_side, int gap_x, int gap_width) {
lock.lock();
@@ -6308,6 +8298,12 @@ public static final void gtk_paint_shadow_gap(int /*long*/ style, int /*long*/ w
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(gchar *)
+ */
public static final native void _gtk_paint_shadow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height);
public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ window, int state_type, int shadow_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int x , int y, int width, int height) {
lock.lock();
@@ -6317,6 +8313,12 @@ public static final void gtk_paint_shadow(int /*long*/ style, int /*long*/ windo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param window cast=(GdkWindow *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native void _gtk_paint_vline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int y1 , int y2, int x);
public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window, int state_type, GdkRectangle area, int /*long*/ widget, byte[] detail, int y1 , int y2, int x) {
lock.lock();
@@ -6326,6 +8328,7 @@ public static final void gtk_paint_vline(int /*long*/ style, int /*long*/ window
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_paper_size_free(int /*long*/ size);
public static final void gtk_paper_size_free(int /*long*/ size) {
lock.lock();
@@ -6335,6 +8338,7 @@ public static final void gtk_paper_size_free(int /*long*/ size) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_paper_size_new(byte [] name);
public static final int /*long*/ gtk_paper_size_new(byte [] name) {
lock.lock();
@@ -6344,6 +8348,7 @@ public static final int /*long*/ gtk_paper_size_new(byte [] name) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height);
public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) {
lock.lock();
@@ -6353,6 +8358,7 @@ public static final int /*long*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, b
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit);
public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) {
lock.lock();
@@ -6362,6 +8368,7 @@ public static final int /*long*/ gtk_paper_size_new_custom(byte [] name, byte []
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_paper_size_get_name(int /*long*/ size);
public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
lock.lock();
@@ -6371,6 +8378,7 @@ public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_paper_size_get_display_name(int /*long*/ size);
public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ size) {
lock.lock();
@@ -6380,6 +8388,7 @@ public static final int /*long*/ gtk_paper_size_get_display_name(int /*long*/ si
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_paper_size_get_ppd_name(int /*long*/ size);
public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size) {
lock.lock();
@@ -6389,6 +8398,7 @@ public static final int /*long*/ gtk_paper_size_get_ppd_name(int /*long*/ size)
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_paper_size_get_width(int /*long*/ size, int unit);
public static final double gtk_paper_size_get_width(int /*long*/ size, int unit) {
lock.lock();
@@ -6398,6 +8408,7 @@ public static final double gtk_paper_size_get_width(int /*long*/ size, int unit)
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_paper_size_get_height(int /*long*/ size, int unit);
public static final double gtk_paper_size_get_height(int /*long*/ size, int unit) {
lock.lock();
@@ -6407,6 +8418,7 @@ public static final double gtk_paper_size_get_height(int /*long*/ size, int unit
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native boolean _gtk_paper_size_is_custom(int /*long*/ size);
public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
lock.lock();
@@ -6416,6 +8428,7 @@ public static final boolean gtk_paper_size_is_custom(int /*long*/ size) {
lock.unlock();
}
}
+/** @param plug cast=(GtkPlug *) */
public static final native int /*long*/ _gtk_plug_get_id(int /*long*/ plug);
public static final int /*long*/ gtk_plug_get_id(int /*long*/ plug) {
lock.lock();
@@ -6434,6 +8447,7 @@ public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_printer_get_backend(int /*long*/ printer);
public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
lock.lock();
@@ -6443,6 +8457,7 @@ public static final int /*long*/ gtk_printer_get_backend(int /*long*/ printer) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_printer_get_name(int /*long*/ printer);
public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
lock.lock();
@@ -6452,6 +8467,7 @@ public static final int /*long*/ gtk_printer_get_name(int /*long*/ printer) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native boolean _gtk_printer_is_default(int /*long*/ printer);
public static final boolean gtk_printer_is_default(int /*long*/ printer) {
lock.lock();
@@ -6461,6 +8477,12 @@ public static final boolean gtk_printer_is_default(int /*long*/ printer) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param data cast=(gpointer)
+ * @param destroy cast=(GDestroyNotify)
+ * @param wait cast=(gboolean)
+ */
public static final native void _gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait);
public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/data, int /*long*/ destroy, boolean wait) {
lock.lock();
@@ -6470,6 +8492,10 @@ public static final void gtk_enumerate_printers(int /*long*/ func, int /*long*/d
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param title cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup);
public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ printer, int /*long*/ settings, int /*long*/ page_setup) {
lock.lock();
@@ -6479,6 +8505,7 @@ public static final int /*long*/ gtk_print_job_new(byte[] title, int /*long*/ pr
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_job_get_settings(int /*long*/ job);
public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
lock.lock();
@@ -6488,6 +8515,7 @@ public static final int /*long*/ gtk_print_job_get_settings(int /*long*/ job) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_job_get_printer(int /*long*/ job);
public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
lock.lock();
@@ -6497,6 +8525,7 @@ public static final int /*long*/ gtk_print_job_get_printer(int /*long*/ job) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_job_get_title(int /*long*/ job);
public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
lock.lock();
@@ -6506,6 +8535,7 @@ public static final int /*long*/ gtk_print_job_get_title(int /*long*/ job) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_print_job_get_status(int /*long*/ job);
public static final int gtk_print_job_get_status(int /*long*/ job) {
lock.lock();
@@ -6515,6 +8545,11 @@ public static final int gtk_print_job_get_status(int /*long*/ job) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param filename cast=(const gchar *)
+ * @param error cast=(GError **)
+ */
public static final native boolean _gtk_print_job_set_source_file(int /*long*/ job, byte[] filename, int /*long*/ error[]);
public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte[] filename, int /*long*/ error[]) {
lock.lock();
@@ -6524,6 +8559,10 @@ public static final boolean gtk_print_job_set_source_file(int /*long*/ job, byte
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param error cast=(GError **)
+ */
public static final native int /*long*/ _gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]);
public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int /*long*/ error[]) {
lock.lock();
@@ -6533,6 +8572,11 @@ public static final int /*long*/ gtk_print_job_get_surface(int /*long*/ job, int
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param user_data cast=(gpointer)
+ * @param dnotify cast=(GDestroyNotify)
+ */
public static final native void _gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify);
public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callback, int /*long*/ user_data, int /*long*/ dnotify) {
lock.lock();
@@ -6542,6 +8586,7 @@ public static final void gtk_print_job_send(int /*long*/ job, int /*long*/ callb
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_settings_new();
public static final int /*long*/ gtk_print_settings_new() {
lock.lock();
@@ -6551,6 +8596,10 @@ public static final int /*long*/ gtk_print_settings_new() {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param data cast=(gpointer)
+ */
public static final native void _gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data);
public static final void gtk_print_settings_foreach(int /*long*/ settings, int /*long*/ func, int /*long*/ data) {
lock.lock();
@@ -6560,6 +8609,10 @@ public static final void gtk_print_settings_foreach(int /*long*/ settings, int /
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param key cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_print_settings_get(int /*long*/ settings, byte [] key);
public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, byte [] key) {
lock.lock();
@@ -6569,6 +8622,11 @@ public static final int /*long*/ gtk_print_settings_get(int /*long*/ settings, b
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param key cast=(const gchar *)
+ * @param value cast=(const gchar *)
+ */
public static final native void _gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value);
public static final void gtk_print_settings_set(int /*long*/ settings, byte [] key, byte [] value) {
lock.lock();
@@ -6578,6 +8636,7 @@ public static final void gtk_print_settings_set(int /*long*/ settings, byte [] k
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_settings_get_printer(int /*long*/ settings);
public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ settings) {
lock.lock();
@@ -6587,6 +8646,7 @@ public static final int /*long*/ gtk_print_settings_get_printer(int /*long*/ set
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer);
public static final void gtk_print_settings_set_printer(int /*long*/ settings, byte[] printer) {
lock.lock();
@@ -6596,6 +8656,7 @@ public static final void gtk_print_settings_set_printer(int /*long*/ settings, b
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_print_settings_get_orientation(int /*long*/ settings);
public static final int gtk_print_settings_get_orientation(int /*long*/ settings) {
lock.lock();
@@ -6605,6 +8666,7 @@ public static final int gtk_print_settings_get_orientation(int /*long*/ settings
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_print_settings_set_orientation(int /*long*/ settings, int orientation);
public static final void gtk_print_settings_set_orientation(int /*long*/ settings, int orientation) {
lock.lock();
@@ -6614,6 +8676,7 @@ public static final void gtk_print_settings_set_orientation(int /*long*/ setting
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native boolean _gtk_print_settings_get_collate(int /*long*/ settings);
public static final boolean gtk_print_settings_get_collate(int /*long*/ settings) {
lock.lock();
@@ -6623,6 +8686,10 @@ public static final boolean gtk_print_settings_get_collate(int /*long*/ settings
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param collate cast=(gboolean)
+ */
public static final native void _gtk_print_settings_set_collate(int /*long*/ settings, boolean collate);
public static final void gtk_print_settings_set_collate(int /*long*/ settings, boolean collate) {
lock.lock();
@@ -6632,6 +8699,7 @@ public static final void gtk_print_settings_set_collate(int /*long*/ settings, b
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_print_settings_get_n_copies(int /*long*/ settings);
public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
lock.lock();
@@ -6641,6 +8709,10 @@ public static final int gtk_print_settings_get_n_copies(int /*long*/ settings) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param num_copies cast=(gint)
+ */
public static final native void _gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies);
public static final void gtk_print_settings_set_n_copies(int /*long*/ settings, int num_copies) {
lock.lock();
@@ -6650,6 +8722,7 @@ public static final void gtk_print_settings_set_n_copies(int /*long*/ settings,
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_print_settings_get_print_pages(int /*long*/ settings);
public static final int gtk_print_settings_get_print_pages(int /*long*/ settings) {
lock.lock();
@@ -6659,6 +8732,7 @@ public static final int gtk_print_settings_get_print_pages(int /*long*/ settings
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_print_settings_set_print_pages(int /*long*/ settings, int pages);
public static final void gtk_print_settings_set_print_pages(int /*long*/ settings, int pages) {
lock.lock();
@@ -6668,6 +8742,10 @@ public static final void gtk_print_settings_set_print_pages(int /*long*/ setting
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param num_ranges cast=(gint *)
+ */
public static final native int /*long*/ _gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges);
public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/ settings, int[] num_ranges) {
lock.lock();
@@ -6677,6 +8755,10 @@ public static final int /*long*/ gtk_print_settings_get_page_ranges(int /*long*/
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param num_ranges cast=(gint)
+ */
public static final native void _gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges);
public static final void gtk_print_settings_set_page_ranges(int /*long*/ settings, int[] page_ranges, int num_ranges) {
lock.lock();
@@ -6686,6 +8768,7 @@ public static final void gtk_print_settings_set_page_ranges(int /*long*/ setting
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_print_settings_get_paper_width(int /*long*/ settings, int unit);
public static final double gtk_print_settings_get_paper_width(int /*long*/ settings, int unit) {
lock.lock();
@@ -6695,6 +8778,7 @@ public static final double gtk_print_settings_get_paper_width(int /*long*/ setti
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native double _gtk_print_settings_get_paper_height(int /*long*/ settings, int unit);
public static final double gtk_print_settings_get_paper_height(int /*long*/ settings, int unit) {
lock.lock();
@@ -6704,6 +8788,7 @@ public static final double gtk_print_settings_get_paper_height(int /*long*/ sett
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_print_settings_get_resolution(int /*long*/ settings);
public static final int gtk_print_settings_get_resolution(int /*long*/ settings) {
lock.lock();
@@ -6713,6 +8798,11 @@ public static final int gtk_print_settings_get_resolution(int /*long*/ settings)
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param title cast=(const gchar *)
+ * @param parent cast=(GtkWindow *)
+ */
public static final native int /*long*/ _gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent);
public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*long*/ parent) {
lock.lock();
@@ -6722,6 +8812,7 @@ public static final int /*long*/ gtk_print_unix_dialog_new(byte[] title, int /*l
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup);
public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialog, int /*long*/ page_setup) {
lock.lock();
@@ -6731,6 +8822,7 @@ public static final void gtk_print_unix_dialog_set_page_setup(int /*long*/ dialo
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog);
public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long*/ dialog) {
lock.lock();
@@ -6740,6 +8832,10 @@ public static final int /*long*/ gtk_print_unix_dialog_get_page_setup(int /*long
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param current_page cast=(gint)
+ */
public static final native void _gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page);
public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dialog, int current_page) {
lock.lock();
@@ -6749,6 +8845,7 @@ public static final void gtk_print_unix_dialog_set_current_page(int /*long*/ dia
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _gtk_print_unix_dialog_get_current_page(int /*long*/ dialog);
public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dialog) {
lock.lock();
@@ -6758,6 +8855,7 @@ public static final int gtk_print_unix_dialog_get_current_page(int /*long*/ dial
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings);
public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog, int /*long*/ settings) {
lock.lock();
@@ -6767,6 +8865,7 @@ public static final void gtk_print_unix_dialog_set_settings(int /*long*/ dialog,
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_unix_dialog_get_settings(int /*long*/ dialog);
public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/ dialog) {
lock.lock();
@@ -6776,6 +8875,7 @@ public static final int /*long*/ gtk_print_unix_dialog_get_settings(int /*long*/
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog);
public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int /*long*/ dialog) {
lock.lock();
@@ -6785,6 +8885,7 @@ public static final int /*long*/ gtk_print_unix_dialog_get_selected_printer(int
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities);
public static final void gtk_print_unix_dialog_set_manual_capabilities(int /*long*/ dialog, int /*long*/ capabilities) {
lock.lock();
@@ -6803,6 +8904,7 @@ public static final int /*long*/ gtk_progress_bar_new() {
lock.unlock();
}
}
+/** @param pbar cast=(GtkProgressBar *) */
public static final native void _gtk_progress_bar_pulse(int /*long*/ pbar);
public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
lock.lock();
@@ -6812,6 +8914,10 @@ public static final void gtk_progress_bar_pulse(int /*long*/ pbar) {
lock.unlock();
}
}
+/**
+ * @param pbar cast=(GtkProgressBar *)
+ * @param fraction cast=(gdouble)
+ */
public static final native void _gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction);
public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double fraction) {
lock.lock();
@@ -6821,6 +8927,10 @@ public static final void gtk_progress_bar_set_fraction(int /*long*/ pbar, double
lock.unlock();
}
}
+/**
+ * @param pbar cast=(GtkProgressBar *)
+ * @param orientation cast=(GtkProgressBarOrientation)
+ */
public static final native void _gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation);
public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int orientation) {
lock.lock();
@@ -6830,6 +8940,7 @@ public static final void gtk_progress_bar_set_orientation(int /*long*/ pbar, int
lock.unlock();
}
}
+/** @param radio_button cast=(GtkRadioButton *) */
public static final native int /*long*/ _gtk_radio_button_get_group(int /*long*/ radio_button);
public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_button) {
lock.lock();
@@ -6839,6 +8950,7 @@ public static final int /*long*/ gtk_radio_button_get_group(int /*long*/ radio_b
lock.unlock();
}
}
+/** @param group cast=(GSList *) */
public static final native int /*long*/ _gtk_radio_button_new(int /*long*/ group);
public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
lock.lock();
@@ -6848,6 +8960,7 @@ public static final int /*long*/ gtk_radio_button_new(int /*long*/ group) {
lock.unlock();
}
}
+/** @param radio_menu_item cast=(GtkRadioMenuItem *) */
public static final native int /*long*/ _gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item);
public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radio_menu_item) {
lock.lock();
@@ -6857,6 +8970,7 @@ public static final int /*long*/ gtk_radio_menu_item_get_group(int /*long*/ radi
lock.unlock();
}
}
+/** @param group cast=(GSList *) */
public static final native int /*long*/ _gtk_radio_menu_item_new(int /*long*/ group);
public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
lock.lock();
@@ -6866,6 +8980,10 @@ public static final int /*long*/ gtk_radio_menu_item_new(int /*long*/ group) {
lock.unlock();
}
}
+/**
+ * @param group cast=(GSList *)
+ * @param label cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label);
public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/ group, byte[] label) {
lock.lock();
@@ -6875,6 +8993,7 @@ public static final int /*long*/ gtk_radio_menu_item_new_with_label(int /*long*/
lock.unlock();
}
}
+/** @param range cast=(GtkRange *) */
public static final native int /*long*/ _gtk_range_get_adjustment(int /*long*/ range);
public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
lock.lock();
@@ -6884,6 +9003,7 @@ public static final int /*long*/ gtk_range_get_adjustment(int /*long*/ range) {
lock.unlock();
}
}
+/** @param range cast=(GtkRange *) */
public static final native void _gtk_range_set_increments(int /*long*/ range, double step, double page);
public static final void gtk_range_set_increments(int /*long*/ range, double step, double page) {
lock.lock();
@@ -6893,6 +9013,7 @@ public static final void gtk_range_set_increments(int /*long*/ range, double ste
lock.unlock();
}
}
+/** @param range cast=(GtkRange *) */
public static final native void _gtk_range_set_inverted(int /*long*/ range, boolean setting);
public static final void gtk_range_set_inverted(int /*long*/ range, boolean setting) {
lock.lock();
@@ -6902,6 +9023,7 @@ public static final void gtk_range_set_inverted(int /*long*/ range, boolean sett
lock.unlock();
}
}
+/** @param range cast=(GtkRange *) */
public static final native void _gtk_range_set_range(int /*long*/ range, double min, double max);
public static final void gtk_range_set_range(int /*long*/ range, double min, double max) {
lock.lock();
@@ -6911,6 +9033,7 @@ public static final void gtk_range_set_range(int /*long*/ range, double min, dou
lock.unlock();
}
}
+/** @param range cast=(GtkRange *) */
public static final native void _gtk_range_set_value(int /*long*/ range, double value);
public static final void gtk_range_set_value(int /*long*/ range, double value) {
lock.lock();
@@ -6920,6 +9043,7 @@ public static final void gtk_range_set_value(int /*long*/ range, double value) {
lock.unlock();
}
}
+/** @param rc_string cast=(const gchar *) */
public static final native void _gtk_rc_parse_string(byte[] rc_string);
public static final void gtk_rc_parse_string(byte[] rc_string) {
lock.lock();
@@ -6929,6 +9053,7 @@ public static final void gtk_rc_parse_string(byte[] rc_string) {
lock.unlock();
}
}
+/** @param style cast=(GtkRcStyle *) */
public static final native int /*long*/ _gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index);
public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ style, int index) {
lock.lock();
@@ -6938,6 +9063,7 @@ public static final int /*long*/ gtk_rc_style_get_bg_pixmap_name(int /*long*/ st
lock.unlock();
}
}
+/** @param style cast=(GtkRcStyle *) */
public static final native int _gtk_rc_style_get_color_flags(int /*long*/ style, int index);
public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int index) {
lock.lock();
@@ -6947,6 +9073,10 @@ public static final int gtk_rc_style_get_color_flags(int /*long*/ style, int ind
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkRcStyle *)
+ * @param color flags=no_out
+ */
public static final native void _gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color);
public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -6956,6 +9086,10 @@ public static final void gtk_rc_style_set_bg(int /*long*/ style, int index, GdkC
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkRcStyle *)
+ * @param name cast=(char *)
+ */
public static final native void _gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name);
public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int index, int /*long*/ name) {
lock.lock();
@@ -6965,6 +9099,7 @@ public static final void gtk_rc_style_set_bg_pixmap_name(int /*long*/ style, int
lock.unlock();
}
}
+/** @param style cast=(GtkRcStyle *) */
public static final native void _gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag);
public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int index, int flag) {
lock.lock();
@@ -6974,6 +9109,10 @@ public static final void gtk_rc_style_set_color_flags(int /*long*/ style, int in
lock.unlock();
}
}
+/**
+ * @param scale cast=(GtkScale *)
+ * @param digits cast=(gint)
+ */
public static final native void _gtk_scale_set_digits(int /*long*/ scale, int digits);
public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
lock.lock();
@@ -6983,6 +9122,10 @@ public static final void gtk_scale_set_digits(int /*long*/ scale, int digits) {
lock.unlock();
}
}
+/**
+ * @param scale cast=(GtkScale *)
+ * @param draw_value cast=(gboolean)
+ */
public static final native void _gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value);
public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean draw_value) {
lock.lock();
@@ -6992,6 +9135,10 @@ public static final void gtk_scale_set_draw_value(int /*long*/ scale, boolean dr
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkRcStyle *)
+ * @param color flags=no_out
+ */
public static final native void _gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color);
public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7001,6 +9148,10 @@ public static final void gtk_rc_style_set_fg(int /*long*/ style, int index, GdkC
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkRcStyle *)
+ * @param color flags=no_out
+ */
public static final native void _gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color);
public static final void gtk_rc_style_set_text(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7010,6 +9161,10 @@ public static final void gtk_rc_style_set_text(int /*long*/ style, int index, Gd
lock.unlock();
}
}
+/**
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param child cast=(GtkWidget *)
+ */
public static final native void _gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child);
public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scrolled_window, int /*long*/ child) {
lock.lock();
@@ -7019,6 +9174,7 @@ public static final void gtk_scrolled_window_add_with_viewport(int /*long*/ scro
lock.unlock();
}
}
+/** @param scrolled_window cast=(GtkScrolledWindow *) */
public static final native int /*long*/ _gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window);
public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*/ scrolled_window) {
lock.lock();
@@ -7028,6 +9184,11 @@ public static final int /*long*/ gtk_scrolled_window_get_hadjustment(int /*long*
lock.unlock();
}
}
+/**
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param hscrollbar_policy cast=(GtkPolicyType *)
+ * @param vscrollbar_policy cast=(GtkPolicyType *)
+ */
public static final native void _gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy);
public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) {
lock.lock();
@@ -7037,6 +9198,7 @@ public static final void gtk_scrolled_window_get_policy(int /*long*/ scrolled_wi
lock.unlock();
}
}
+/** @param scrolled_window cast=(GtkScrolledWindow *) */
public static final native int _gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window);
public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolled_window) {
lock.lock();
@@ -7046,6 +9208,7 @@ public static final int gtk_scrolled_window_get_shadow_type(int /*long*/ scrolle
lock.unlock();
}
}
+/** @param scrolled_window cast=(GtkScrolledWindow *) */
public static final native int /*long*/ _gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window);
public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*/ scrolled_window) {
lock.lock();
@@ -7055,6 +9218,10 @@ public static final int /*long*/ gtk_scrolled_window_get_vadjustment(int /*long*
lock.unlock();
}
}
+/**
+ * @param hadjustment cast=(GtkAdjustment *)
+ * @param vadjustment cast=(GtkAdjustment *)
+ */
public static final native int /*long*/ _gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment);
public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustment, int /*long*/ vadjustment) {
lock.lock();
@@ -7064,6 +9231,10 @@ public static final int /*long*/ gtk_scrolled_window_new(int /*long*/ hadjustmen
lock.unlock();
}
}
+/**
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param placement cast=(GtkCornerType)
+ */
public static final native void _gtk_scrolled_window_set_placement(int /*long*/ scrolled_window, int placement);
public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled_window, int placement) {
lock.lock();
@@ -7073,6 +9244,11 @@ public static final void gtk_scrolled_window_set_placement(int /*long*/ scrolled
lock.unlock();
}
}
+/**
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param hscrollbar_policy cast=(GtkPolicyType)
+ * @param vscrollbar_policy cast=(GtkPolicyType)
+ */
public static final native void _gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy);
public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) {
lock.lock();
@@ -7082,6 +9258,10 @@ public static final void gtk_scrolled_window_set_policy(int /*long*/ scrolled_wi
lock.unlock();
}
}
+/**
+ * @param scrolled_window cast=(GtkScrolledWindow *)
+ * @param type cast=(GtkShadowType)
+ */
public static final native void _gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type);
public static final void gtk_scrolled_window_set_shadow_type(int /*long*/ scrolled_window, int type) {
lock.lock();
@@ -7100,6 +9280,7 @@ public static final int /*long*/ gtk_settings_get_default() {
lock.unlock();
}
}
+/** @param selection_data cast=(GtkSelectionData *) */
public static final native void _gtk_selection_data_free(int /*long*/ selection_data);
public static final void gtk_selection_data_free(int /*long*/ selection_data) {
lock.lock();
@@ -7109,6 +9290,13 @@ public static final void gtk_selection_data_free(int /*long*/ selection_data) {
lock.unlock();
}
}
+/**
+ * @param selection_data cast=(GtkSelectionData *)
+ * @param type cast=(GdkAtom)
+ * @param format cast=(gint)
+ * @param data cast=(const guchar *)
+ * @param length cast=(gint)
+ */
public static final native void _gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length);
public static final void gtk_selection_data_set(int /*long*/ selection_data, int /*long*/ type, int format, int /*long*/ data, int length) {
lock.lock();
@@ -7136,6 +9324,7 @@ public static final int /*long*/ gtk_set_locale() {
lock.unlock();
}
}
+/** @param socket cast=(GtkSocket *) */
public static final native int /*long*/ _gtk_socket_get_id(int /*long*/ socket);
public static final int /*long*/ gtk_socket_get_id(int /*long*/ socket) {
lock.lock();
@@ -7154,6 +9343,7 @@ public static final int /*long*/ gtk_socket_new() {
lock.unlock();
}
}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native int /*long*/ _gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits);
public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, double climb_rate, int digits) {
lock.lock();
@@ -7163,6 +9353,7 @@ public static final int /*long*/ gtk_spin_button_new(int /*long*/ adjustment, do
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native int /*long*/ _gtk_spin_button_get_adjustment(int /*long*/ spin_button);
public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spin_button) {
lock.lock();
@@ -7173,6 +9364,7 @@ public static final int /*long*/ gtk_spin_button_get_adjustment(int /*long*/ spi
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native int _gtk_spin_button_get_digits(int /*long*/ spin_button);
public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
lock.lock();
@@ -7182,6 +9374,7 @@ public static final int gtk_spin_button_get_digits(int /*long*/ spin_button) {
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native void _gtk_spin_button_set_digits(int /*long*/ spin_button, int digits);
public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, int digits) {
lock.lock();
@@ -7191,6 +9384,7 @@ public static final void gtk_spin_button_set_digits(int /*long*/ spin_button, in
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native void _gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page);
public static final void gtk_spin_button_set_increments(int /*long*/ spin_button, double step, double page) {
lock.lock();
@@ -7200,6 +9394,7 @@ public static final void gtk_spin_button_set_increments(int /*long*/ spin_button
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native void _gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min);
public static final void gtk_spin_button_set_range(int /*long*/ spin_button, double max, double min) {
lock.lock();
@@ -7209,6 +9404,7 @@ public static final void gtk_spin_button_set_range(int /*long*/ spin_button, dou
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native void _gtk_spin_button_set_value(int /*long*/ spin_button, double value);
public static final void gtk_spin_button_set_value(int /*long*/ spin_button, double value) {
lock.lock();
@@ -7218,6 +9414,7 @@ public static final void gtk_spin_button_set_value(int /*long*/ spin_button, dou
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native void _gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap);
public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, boolean wrap) {
lock.lock();
@@ -7227,6 +9424,7 @@ public static final void gtk_spin_button_set_wrap(int /*long*/ spin_button, bool
lock.unlock();
}
}
+/** @param spin_button cast=(GtkSpinButton*) */
public static final native void _gtk_spin_button_update(int /*long*/ spin_button);
public static final void gtk_spin_button_update(int /*long*/ spin_button) {
lock.lock();
@@ -7236,6 +9434,80 @@ public static final void gtk_spin_button_update(int /*long*/ spin_button) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ */
+public static final native boolean _gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation);
+public static final boolean gtk_status_icon_get_geometry(int /*long*/ handle, int /*long*/ screen, GdkRectangle area, int /*long*/ orientation) {
+ lock.lock();
+ try {
+ return _gtk_status_icon_get_geometry(handle, screen, area, orientation);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=dynamic
+ */
+public static final native boolean _gtk_status_icon_get_visible(int /*long*/ handle);
+public static final boolean gtk_status_icon_get_visible(int /*long*/ handle) {
+ lock.lock();
+ try {
+ return _gtk_status_icon_get_visible(handle);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=dynamic */
+public static final native int /*long*/ _gtk_status_icon_new();
+public static final int /*long*/ gtk_status_icon_new() {
+ lock.lock();
+ try {
+ return _gtk_status_icon_new();
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=dynamic
+ */
+public static final native void _gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf);
+public static final void gtk_status_icon_set_from_pixbuf(int /*long*/ handle, int /*long*/ pixbuf) {
+ lock.lock();
+ try {
+ _gtk_status_icon_set_from_pixbuf(handle, pixbuf);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=dynamic
+ */
+public static final native void _gtk_status_icon_set_visible(int /*long*/ handle, boolean visible);
+public static final void gtk_status_icon_set_visible(int /*long*/ handle, boolean visible) {
+ lock.lock();
+ try {
+ _gtk_status_icon_set_visible(handle, visible);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=dynamic
+ */
+public static final native void _gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text);
+public static final void gtk_status_icon_set_tooltip(int /*long*/ handle, byte[] tip_text) {
+ lock.lock();
+ try {
+ _gtk_status_icon_set_tooltip(handle, tip_text);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_base(int /*long*/ style, int index, GdkColor color);
public static final void gtk_style_get_base(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7245,6 +9517,10 @@ public static final void gtk_style_get_base(int /*long*/ style, int index, GdkCo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_black(int /*long*/ style, GdkColor color);
public static final void gtk_style_get_black(int /*long*/ style, GdkColor color) {
lock.lock();
@@ -7254,6 +9530,10 @@ public static final void gtk_style_get_black(int /*long*/ style, GdkColor color)
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_bg(int /*long*/ style, int index, GdkColor color);
public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7263,6 +9543,10 @@ public static final void gtk_style_get_bg(int /*long*/ style, int index, GdkColo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_dark(int /*long*/ style, int index, GdkColor color);
public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7272,6 +9556,10 @@ public static final void gtk_style_get_dark(int /*long*/ style, int index, GdkCo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_fg(int /*long*/ style, int index, GdkColor color);
public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7281,6 +9569,10 @@ public static final void gtk_style_get_fg(int /*long*/ style, int index, GdkColo
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
public static final native void _gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7290,6 +9582,10 @@ public static final void gtk_style_get_fg_gc(int /*long*/ style, int index, int
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
public static final native void _gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7299,6 +9595,10 @@ public static final void gtk_style_get_bg_gc(int /*long*/ style, int index, int
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
public static final native void _gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_light_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7308,6 +9608,10 @@ public static final void gtk_style_get_light_gc(int /*long*/ style, int index, i
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
public static final native void _gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7317,6 +9621,10 @@ public static final void gtk_style_get_dark_gc(int /*long*/ style, int index, in
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
public static final native void _gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7326,6 +9634,10 @@ public static final void gtk_style_get_mid_gc(int /*long*/ style, int index, int
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
public static final native void _gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_text_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7335,6 +9647,10 @@ public static final void gtk_style_get_text_gc(int /*long*/ style, int index, in
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
public static final native void _gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc);
public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index, int /*long*/[] gc) {
lock.lock();
@@ -7344,6 +9660,10 @@ public static final void gtk_style_get_text_aa_gc(int /*long*/ style, int index,
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **),flags=no_in
+ */
public static final native void _gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc);
public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/[] gc) {
lock.lock();
@@ -7353,6 +9673,10 @@ public static final void gtk_style_get_black_gc(int /*long*/ style, int /*long*/
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param gc cast=(GdkGC **)
+ */
public static final native void _gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc);
public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/[] gc) {
lock.lock();
@@ -7362,6 +9686,7 @@ public static final void gtk_style_get_white_gc(int /*long*/ style, int /*long*/
lock.unlock();
}
}
+/** @param style cast=(GtkStyle *) */
public static final native int /*long*/ _gtk_style_get_font_desc(int /*long*/ style);
public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
lock.lock();
@@ -7371,6 +9696,10 @@ public static final int /*long*/ gtk_style_get_font_desc(int /*long*/ style) {
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_light(int /*long*/ style, int index, GdkColor color);
public static final void gtk_style_get_light(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7380,6 +9709,10 @@ public static final void gtk_style_get_light(int /*long*/ style, int index, GdkC
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param color flags=no_in
+ */
public static final native void _gtk_style_get_text(int /*long*/ style, int index, GdkColor color);
public static final void gtk_style_get_text(int /*long*/ style, int index, GdkColor color) {
lock.lock();
@@ -7389,6 +9722,7 @@ public static final void gtk_style_get_text(int /*long*/ style, int index, GdkCo
lock.unlock();
}
}
+/** @param style cast=(GtkStyle *) */
public static final native int _gtk_style_get_xthickness(int /*long*/ style);
public static final int gtk_style_get_xthickness(int /*long*/ style) {
lock.lock();
@@ -7398,6 +9732,7 @@ public static final int gtk_style_get_xthickness(int /*long*/ style) {
lock.unlock();
}
}
+/** @param style cast=(GtkStyle *) */
public static final native int _gtk_style_get_ythickness(int /*long*/ style);
public static final int gtk_style_get_ythickness(int /*long*/ style) {
lock.lock();
@@ -7407,6 +9742,12 @@ public static final int gtk_style_get_ythickness(int /*long*/ style) {
lock.unlock();
}
}
+/**
+ * @param style cast=(GtkStyle *)
+ * @param source cast=(GtkIconSource *)
+ * @param widget cast=(GtkWidget *)
+ * @param detail cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail);
public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /*long*/ source, int direction, int state, int size, int /*long*/ widget, byte[] detail) {
lock.lock();
@@ -7416,6 +9757,10 @@ public static final int /*long*/ gtk_style_render_icon(int /*long*/ style, int /
lock.unlock();
}
}
+/**
+ * @param targets cast=(const GtkTargetEntry *)
+ * @param ntargets cast=(guint)
+ */
public static final native int /*long*/ _gtk_target_list_new(int /*long*/ targets, int ntargets);
public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int ntargets) {
lock.lock();
@@ -7425,6 +9770,7 @@ public static final int /*long*/ gtk_target_list_new(int /*long*/ targets, int n
lock.unlock();
}
}
+/** @param list cast=(GtkTargetList *) */
public static final native void _gtk_target_list_unref(int /*long*/ list);
public static final void gtk_target_list_unref(int /*long*/ list) {
lock.lock();
@@ -7434,6 +9780,10 @@ public static final void gtk_target_list_unref(int /*long*/ list) {
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param clipboard cast=(GtkClipboard *)
+ */
public static final native void _gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard);
public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int /*long*/ clipboard) {
lock.lock();
@@ -7443,6 +9793,11 @@ public static final void gtk_text_buffer_copy_clipboard(int /*long*/ buffer, int
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param clipboard cast=(GtkClipboard *)
+ * @param default_editable cast=(gboolean)
+ */
public static final native void _gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable);
public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int /*long*/ clipboard, boolean default_editable) {
lock.lock();
@@ -7452,6 +9807,11 @@ public static final void gtk_text_buffer_cut_clipboard(int /*long*/ buffer, int
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ */
public static final native void _gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end);
public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] start, byte[] end) {
lock.lock();
@@ -7461,6 +9821,11 @@ public static final void gtk_text_buffer_delete(int /*long*/ buffer, byte[] star
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ */
public static final native void _gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end);
public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[] start, byte[] end) {
lock.lock();
@@ -7470,6 +9835,7 @@ public static final void gtk_text_buffer_get_bounds(int /*long*/ buffer, byte[]
lock.unlock();
}
}
+/** @param buffer cast=(GtkTextBuffer *) */
public static final native int _gtk_text_buffer_get_char_count(int /*long*/ buffer);
public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
lock.lock();
@@ -7479,6 +9845,10 @@ public static final int gtk_text_buffer_get_char_count(int /*long*/ buffer) {
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ */
public static final native void _gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter);
public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[] iter) {
lock.lock();
@@ -7488,6 +9858,7 @@ public static final void gtk_text_buffer_get_end_iter(int /*long*/ buffer, byte[
lock.unlock();
}
}
+/** @param buffer cast=(GtkTextBuffer *) */
public static final native int /*long*/ _gtk_text_buffer_get_insert(int /*long*/ buffer);
public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer) {
lock.lock();
@@ -7497,6 +9868,11 @@ public static final int /*long*/ gtk_text_buffer_get_insert(int /*long*/ buffer)
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ * @param line_number cast=(gint)
+ */
public static final native void _gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number);
public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, byte[] iter, int line_number) {
lock.lock();
@@ -7506,6 +9882,11 @@ public static final void gtk_text_buffer_get_iter_at_line(int /*long*/ buffer, b
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ * @param mark cast=(GtkTextMark *)
+ */
public static final native void _gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark);
public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, byte[] iter, int /*long*/ mark) {
lock.lock();
@@ -7515,6 +9896,11 @@ public static final void gtk_text_buffer_get_iter_at_mark(int /*long*/ buffer, b
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ * @param char_offset cast=(gint)
+ */
public static final native void _gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset);
public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer, byte[] iter, int char_offset) {
lock.lock();
@@ -7524,6 +9910,7 @@ public static final void gtk_text_buffer_get_iter_at_offset(int /*long*/ buffer,
lock.unlock();
}
}
+/** @param buffer cast=(GtkTextBuffer *) */
public static final native int _gtk_text_buffer_get_line_count(int /*long*/ buffer);
public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
lock.lock();
@@ -7533,6 +9920,7 @@ public static final int gtk_text_buffer_get_line_count(int /*long*/ buffer) {
lock.unlock();
}
}
+/** @param buffer cast=(GtkTextBuffer *) */
public static final native int /*long*/ _gtk_text_buffer_get_selection_bound(int /*long*/ buffer);
public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*/ buffer) {
lock.lock();
@@ -7542,6 +9930,11 @@ public static final int /*long*/ gtk_text_buffer_get_selection_bound(int /*long*
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ */
public static final native boolean _gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end);
public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ buffer, byte[] start, byte[] end) {
lock.lock();
@@ -7551,6 +9944,12 @@ public static final boolean gtk_text_buffer_get_selection_bounds(int /*long*/ bu
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param start cast=(GtkTextIter *)
+ * @param end cast=(GtkTextIter *)
+ * @param include_hidden_chars cast=(gboolean)
+ */
public static final native int /*long*/ _gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars);
public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, byte[] start, byte[] end, boolean include_hidden_chars) {
lock.lock();
@@ -7560,6 +9959,12 @@ public static final int /*long*/ gtk_text_buffer_get_text(int /*long*/ buffer, b
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ * @param text cast=(const gchar *)
+ * @param len cast=(gint)
+ */
public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len);
public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter, byte[] text, int len) {
lock.lock();
@@ -7569,6 +9974,12 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, byte[] iter
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param iter cast=(GtkTextIter *)
+ * @param text cast=(const gchar *)
+ * @param len cast=(gint)
+ */
public static final native void _gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len);
public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*/ iter, byte[] text, int len) {
lock.lock();
@@ -7578,6 +9989,11 @@ public static final void gtk_text_buffer_insert(int /*long*/ buffer, int /*long*
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param mark cast=(GtkTextMark *)
+ * @param where cast=(const GtkTextIter *)
+ */
public static final native void _gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where);
public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*long*/ mark, byte[] where) {
lock.lock();
@@ -7587,6 +10003,12 @@ public static final void gtk_text_buffer_move_mark(int /*long*/ buffer, int /*lo
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param clipboard cast=(GtkClipboard *)
+ * @param override_location cast=(GtkTextIter *)
+ * @param default_editable cast=(gboolean)
+ */
public static final native void _gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable);
public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, int /*long*/ clipboard, byte[] override_location, boolean default_editable) {
lock.lock();
@@ -7596,6 +10018,10 @@ public static final void gtk_text_buffer_paste_clipboard(int /*long*/ buffer, in
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param where cast=(const GtkTextIter *)
+ */
public static final native void _gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where);
public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[] where) {
lock.lock();
@@ -7605,6 +10031,11 @@ public static final void gtk_text_buffer_place_cursor(int /*long*/ buffer, byte[
lock.unlock();
}
}
+/**
+ * @param buffer cast=(GtkTextBuffer *)
+ * @param text cast=(const gchar *)
+ * @param len cast=(gint)
+ */
public static final native void _gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len);
public static final void gtk_text_buffer_set_text(int /*long*/ buffer, byte[] text, int len) {
lock.lock();
@@ -7614,6 +10045,7 @@ public static final void gtk_text_buffer_set_text(int /*long*/ buffer, byte[] te
lock.unlock();
}
}
+/** @param iter cast=(const GtkTextIter *) */
public static final native int _gtk_text_iter_get_line(byte[] iter);
public static final int gtk_text_iter_get_line(byte[] iter) {
lock.lock();
@@ -7623,6 +10055,7 @@ public static final int gtk_text_iter_get_line(byte[] iter) {
lock.unlock();
}
}
+/** @param iter cast=(const GtkTextIter *) */
public static final native int _gtk_text_iter_get_offset(byte[] iter);
public static final int gtk_text_iter_get_offset(byte[] iter) {
lock.lock();
@@ -7632,6 +10065,14 @@ public static final int gtk_text_iter_get_offset(byte[] iter) {
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param win cast=(GtkTextWindowType)
+ * @param buffer_x cast=(gint)
+ * @param buffer_y cast=(gint)
+ * @param window_x cast=(gint *)
+ * @param window_y cast=(gint *)
+ */
public static final native void _gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y);
public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text_view, int win, int buffer_x, int buffer_y, int[] window_x, int[] window_y) {
lock.lock();
@@ -7641,6 +10082,7 @@ public static final void gtk_text_view_buffer_to_window_coords(int /*long*/ text
lock.unlock();
}
}
+/** @param text_view cast=(GtkTextView *) */
public static final native int /*long*/ _gtk_text_view_get_buffer(int /*long*/ text_view);
public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view) {
lock.lock();
@@ -7650,6 +10092,7 @@ public static final int /*long*/ gtk_text_view_get_buffer(int /*long*/ text_view
lock.unlock();
}
}
+/** @param text_view cast=(GtkTextView *) */
public static final native boolean _gtk_text_view_get_editable(int /*long*/ text_view);
public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
lock.lock();
@@ -7659,6 +10102,12 @@ public static final boolean gtk_text_view_get_editable(int /*long*/ text_view) {
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param iter cast=(GtkTextIter *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native void _gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y);
public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_view, byte[] iter, int x, int y) {
lock.lock();
@@ -7668,6 +10117,11 @@ public static final void gtk_text_view_get_iter_at_location(int /*long*/ text_vi
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param iter cast=(const GtkTextIter *)
+ * @param location cast=(GdkRectangle *),flags=no_in
+ */
public static final native void _gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location);
public static final void gtk_text_view_get_iter_location(int /*long*/ text_view, byte[] iter, GdkRectangle location) {
lock.lock();
@@ -7677,6 +10131,12 @@ public static final void gtk_text_view_get_iter_location(int /*long*/ text_view,
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param target_iter cast=(GtkTextIter *)
+ * @param y cast=(gint)
+ * @param line_top cast=(gint *)
+ */
public static final native void _gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top);
public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byte[] target_iter, int y, int[] line_top) {
lock.lock();
@@ -7686,6 +10146,10 @@ public static final void gtk_text_view_get_line_at_y(int /*long*/ text_view, byt
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param visible_rect cast=(GdkRectangle *),flags=no_in
+ */
public static final native void _gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect);
public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view, GdkRectangle visible_rect) {
lock.lock();
@@ -7695,6 +10159,10 @@ public static final void gtk_text_view_get_visible_rect(int /*long*/ text_view,
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param win cast=(GtkTextWindowType)
+ */
public static final native int /*long*/ _gtk_text_view_get_window(int /*long*/ text_view, int win);
public static final int /*long*/ gtk_text_view_get_window(int /*long*/ text_view, int win) {
lock.lock();
@@ -7713,6 +10181,10 @@ public static final int /*long*/ gtk_text_view_new() {
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param mark cast=(GtkTextMark *)
+ */
public static final native void _gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark);
public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_view, int /*long*/ mark) {
lock.lock();
@@ -7722,6 +10194,14 @@ public static final void gtk_text_view_scroll_mark_onscreen(int /*long*/ text_vi
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param iter cast=(GtkTextIter *)
+ * @param within_margin cast=(gdouble)
+ * @param use_align cast=(gboolean)
+ * @param xalign cast=(gdouble)
+ * @param yalign cast=(gdouble)
+ */
public static final native boolean _gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign);
public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view, byte[] iter, double within_margin, boolean use_align, double xalign, double yalign) {
lock.lock();
@@ -7731,6 +10211,10 @@ public static final boolean gtk_text_view_scroll_to_iter(int /*long*/ text_view,
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_text_view_set_editable(int /*long*/ text_view, boolean setting);
public static final void gtk_text_view_set_editable(int /*long*/ text_view, boolean setting) {
lock.lock();
@@ -7740,6 +10224,7 @@ public static final void gtk_text_view_set_editable(int /*long*/ text_view, bool
lock.unlock();
}
}
+/** @param text_view cast=(GtkTextView *) */
public static final native void _gtk_text_view_set_justification(int /*long*/ text_view, int justification);
public static final void gtk_text_view_set_justification(int /*long*/ text_view, int justification) {
lock.lock();
@@ -7749,6 +10234,10 @@ public static final void gtk_text_view_set_justification(int /*long*/ text_view,
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param tabs cast=(PangoTabArray *)
+ */
public static final native void _gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs);
public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*long*/ tabs) {
lock.lock();
@@ -7758,6 +10247,7 @@ public static final void gtk_text_view_set_tabs(int /*long*/ text_view, int /*lo
lock.unlock();
}
}
+/** @param text_view cast=(GtkTextView *) */
public static final native void _gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode);
public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int wrap_mode) {
lock.lock();
@@ -7767,6 +10257,14 @@ public static final void gtk_text_view_set_wrap_mode(int /*long*/ text_view, int
lock.unlock();
}
}
+/**
+ * @param text_view cast=(GtkTextView *)
+ * @param win cast=(GtkTextWindowType)
+ * @param window_x cast=(gint)
+ * @param window_y cast=(gint)
+ * @param buffer_x cast=(gint *)
+ * @param buffer_y cast=(gint *)
+ */
public static final native void _gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y);
public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text_view, int win, int window_x, int window_y, int[] buffer_x, int[] buffer_y) {
lock.lock();
@@ -7776,6 +10274,11 @@ public static final void gtk_text_view_window_to_buffer_coords(int /*long*/ text
lock.unlock();
}
}
+/**
+ * @param interval cast=(guint32)
+ * @param function cast=(GtkFunction)
+ * @param data cast=(gpointer)
+ */
public static final native int _gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data);
public static final int gtk_timeout_add(int interval, int /*long*/ function, int /*long*/ data) {
lock.lock();
@@ -7785,6 +10288,7 @@ public static final int gtk_timeout_add(int interval, int /*long*/ function, int
lock.unlock();
}
}
+/** @param timeout_handler_id cast=(guint) */
public static final native void _gtk_timeout_remove(int timeout_handler_id);
public static final void gtk_timeout_remove(int timeout_handler_id) {
lock.lock();
@@ -7794,6 +10298,7 @@ public static final void gtk_timeout_remove(int timeout_handler_id) {
lock.unlock();
}
}
+/** @param toggle_button cast=(GtkToggleButton *) */
public static final native boolean _gtk_toggle_button_get_active(int /*long*/ toggle_button);
public static final boolean gtk_toggle_button_get_active(int /*long*/ toggle_button) {
lock.lock();
@@ -7812,6 +10317,7 @@ public static final int /*long*/ gtk_toggle_button_new() {
lock.unlock();
}
}
+/** @param toggle_button cast=(GtkToggleButton *) */
public static final native boolean _gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button);
public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ toggle_button) {
lock.lock();
@@ -7821,6 +10327,10 @@ public static final boolean gtk_toggle_button_get_inconsistent(int /*long*/ togg
lock.unlock();
}
}
+/**
+ * @param toggle_button cast=(GtkToggleButton *)
+ * @param is_active cast=(gboolean)
+ */
public static final native void _gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active);
public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button, boolean is_active) {
lock.lock();
@@ -7830,6 +10340,10 @@ public static final void gtk_toggle_button_set_active(int /*long*/ toggle_button
lock.unlock();
}
}
+/**
+ * @param toggle_button cast=(GtkToggleButton *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting);
public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_button, boolean setting) {
lock.lock();
@@ -7839,6 +10353,10 @@ public static final void gtk_toggle_button_set_inconsistent(int /*long*/ toggle_
lock.unlock();
}
}
+/**
+ * @param toggle_button cast=(GtkToggleButton *)
+ * @param draw_indicator cast=(gboolean)
+ */
public static final native void _gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator);
public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button, boolean draw_indicator) {
lock.lock();
@@ -7848,6 +10366,13 @@ public static final void gtk_toggle_button_set_mode(int /*long*/ toggle_button,
lock.unlock();
}
}
+/**
+ * @param toolbar cast=(GtkToolbar *)
+ * @param widget cast=(GtkWidget *)
+ * @param tooltip_text cast=(const char *)
+ * @param tooltip_private_text cast=(const char *)
+ * @param position cast=(gint)
+ */
public static final native void _gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position);
public static final void gtk_toolbar_insert_widget(int /*long*/ toolbar, int /*long*/ widget, byte[] tooltip_text, byte[] tooltip_private_text, int position) {
lock.lock();
@@ -7866,6 +10391,10 @@ public static final int /*long*/ gtk_toolbar_new() {
lock.unlock();
}
}
+/**
+ * @param toolbar cast=(GtkToolbar *)
+ * @param orientation cast=(GtkOrientation)
+ */
public static final native void _gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation);
public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int orientation) {
lock.lock();
@@ -7875,6 +10404,7 @@ public static final void gtk_toolbar_set_orientation(int /*long*/ toolbar, int o
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_tooltips_data_get(int /*long*/ widget);
public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
lock.lock();
@@ -7884,6 +10414,7 @@ public static final int /*long*/ gtk_tooltips_data_get(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param tooltips cast=(GtkTooltips *) */
public static final native void _gtk_tooltips_disable(int /*long*/ tooltips);
public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
lock.lock();
@@ -7893,6 +10424,7 @@ public static final void gtk_tooltips_disable(int /*long*/ tooltips) {
lock.unlock();
}
}
+/** @param tooltips cast=(GtkTooltips *) */
public static final native void _gtk_tooltips_enable(int /*long*/ tooltips);
public static final void gtk_tooltips_enable(int /*long*/ tooltips) {
lock.lock();
@@ -7911,6 +10443,7 @@ public static final int /*long*/ gtk_tooltips_new() {
lock.unlock();
}
}
+/** @param tooltips cast=(GtkTooltips *) */
public static final native void _gtk_tooltips_force_window(int /*long*/ tooltips);
public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
lock.lock();
@@ -7920,6 +10453,12 @@ public static final void gtk_tooltips_force_window(int /*long*/ tooltips) {
lock.unlock();
}
}
+/**
+ * @param tooltips cast=(GtkTooltips *)
+ * @param widget cast=(GtkWidget *)
+ * @param tip_text cast=(const gchar *)
+ * @param tip_private cast=(const gchar *)
+ */
public static final native void _gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private);
public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*/ widget, byte[] tip_text, byte[] tip_private) {
lock.lock();
@@ -7929,6 +10468,10 @@ public static final void gtk_tooltips_set_tip(int /*long*/ tooltips, int /*long*
lock.unlock();
}
}
+/**
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator);
public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, int[] value, int /*long*/ terminator) {
lock.lock();
@@ -7938,6 +10481,10 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
lock.unlock();
}
}
+/**
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator);
public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*/ iter, int column, long[] value, int /*long*/ terminator) {
lock.lock();
@@ -7947,6 +10494,11 @@ public static final void gtk_tree_model_get(int /*long*/ tree_model, int /*long*
lock.unlock();
}
}
+/**
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param path cast=(GtkTreePath *)
+ */
public static final native boolean _gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path);
public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ path) {
lock.lock();
@@ -7956,6 +10508,10 @@ public static final boolean gtk_tree_model_get_iter(int /*long*/ tree_model, int
lock.unlock();
}
}
+/**
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native boolean _gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter);
public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_model, int /*long*/ iter) {
lock.lock();
@@ -7965,6 +10521,7 @@ public static final boolean gtk_tree_model_get_iter_first(int /*long*/ tree_mode
lock.unlock();
}
}
+/** @param tree_model cast=(GtkTreeModel *) */
public static final native int _gtk_tree_model_get_n_columns(int /*long*/ tree_model);
public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
lock.lock();
@@ -7974,6 +10531,10 @@ public static final int gtk_tree_model_get_n_columns(int /*long*/ tree_model) {
lock.unlock();
}
}
+/**
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native int /*long*/ _gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter);
public static final int /*long*/ gtk_tree_model_get_path(int /*long*/ tree_model, int /*long*/ iter) {
lock.lock();
@@ -7992,6 +10553,11 @@ public static final int /*long*/ gtk_tree_model_get_type() {
lock.unlock();
}
}
+/**
+ * @param model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ */
public static final native boolean _gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent);
public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int /*long*/ iter, int /*long*/ parent) {
lock.lock();
@@ -8001,6 +10567,10 @@ public static final boolean gtk_tree_model_iter_children(int /*long*/ model, int
lock.unlock();
}
}
+/**
+ * @param model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native int _gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter);
public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /*long*/ iter) {
lock.lock();
@@ -8010,6 +10580,10 @@ public static final int gtk_tree_model_iter_n_children(int /*long*/ model, int /
lock.unlock();
}
}
+/**
+ * @param model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native boolean _gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter);
public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*long*/ iter) {
lock.lock();
@@ -8019,6 +10593,11 @@ public static final boolean gtk_tree_model_iter_next(int /*long*/ model, int /*l
lock.unlock();
}
}
+/**
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ */
public static final native boolean _gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n);
public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_model, int /*long*/ iter, int /*long*/ parent, int n) {
lock.lock();
@@ -8028,6 +10607,7 @@ public static final boolean gtk_tree_model_iter_nth_child(int /*long*/ tree_mode
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native void _gtk_tree_path_append_index(int /*long*/ path, int index);
public static final void gtk_tree_path_append_index(int /*long*/ path, int index) {
lock.lock();
@@ -8037,6 +10617,10 @@ public static final void gtk_tree_path_append_index(int /*long*/ path, int index
lock.unlock();
}
}
+/**
+ * @param a cast=(const GtkTreePath *)
+ * @param b cast=(const GtkTreePath *)
+ */
public static final native int /*long*/ _gtk_tree_path_compare(int /*long*/ a, int /*long*/ b);
public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*long*/ b) {
lock.lock();
@@ -8046,6 +10630,7 @@ public static final int /*long*/ gtk_tree_path_compare(int /*long*/ a, int /*lon
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native void _gtk_tree_path_down(int /*long*/ path);
public static final void gtk_tree_path_down(int /*long*/ path) {
lock.lock();
@@ -8055,6 +10640,7 @@ public static final void gtk_tree_path_down(int /*long*/ path) {
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native void _gtk_tree_path_free(int /*long*/ path);
public static final void gtk_tree_path_free(int /*long*/ path) {
lock.lock();
@@ -8064,6 +10650,7 @@ public static final void gtk_tree_path_free(int /*long*/ path) {
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native int _gtk_tree_path_get_depth(int /*long*/ path);
public static final int gtk_tree_path_get_depth(int /*long*/ path) {
lock.lock();
@@ -8073,6 +10660,7 @@ public static final int gtk_tree_path_get_depth(int /*long*/ path) {
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native int /*long*/ _gtk_tree_path_get_indices(int /*long*/ path);
public static final int /*long*/ gtk_tree_path_get_indices(int /*long*/ path) {
lock.lock();
@@ -8100,6 +10688,7 @@ public static final int /*long*/ gtk_tree_path_new_first() {
lock.unlock();
}
}
+/** @param path cast=(const gchar *) */
public static final native int /*long*/ _gtk_tree_path_new_from_string(byte[] path);
public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
lock.lock();
@@ -8109,6 +10698,7 @@ public static final int /*long*/ gtk_tree_path_new_from_string(byte[] path) {
lock.unlock();
}
}
+/** @param path cast=(const gchar *) */
public static final native int /*long*/ _gtk_tree_path_new_from_string(int /*long*/ path);
public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path) {
lock.lock();
@@ -8118,6 +10708,7 @@ public static final int /*long*/ gtk_tree_path_new_from_string(int /*long*/ path
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native void _gtk_tree_path_next(int /*long*/ path);
public static final void gtk_tree_path_next(int /*long*/ path) {
lock.lock();
@@ -8127,6 +10718,7 @@ public static final void gtk_tree_path_next(int /*long*/ path) {
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native boolean _gtk_tree_path_prev(int /*long*/ path);
public static final boolean gtk_tree_path_prev(int /*long*/ path) {
lock.lock();
@@ -8136,6 +10728,7 @@ public static final boolean gtk_tree_path_prev(int /*long*/ path) {
lock.unlock();
}
}
+/** @param path cast=(GtkTreePath *) */
public static final native boolean _gtk_tree_path_up(int /*long*/ path);
public static final boolean gtk_tree_path_up(int /*long*/ path) {
lock.lock();
@@ -8145,6 +10738,10 @@ public static final boolean gtk_tree_path_up(int /*long*/ path) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param selection cast=(GtkTreeSelection *)
+ */
public static final native int _gtk_tree_selection_count_selected_rows(int /*long*/ selection);
public static final int gtk_tree_selection_count_selected_rows(int /*long*/ selection) {
lock.lock();
@@ -8154,6 +10751,11 @@ public static final int gtk_tree_selection_count_selected_rows(int /*long*/ sele
lock.unlock();
}
}
+/**
+ * @param selection cast=(GtkTreeSelection *)
+ * @param model cast=(GtkTreeModel **)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native boolean _gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter);
public static final boolean gtk_tree_selection_get_selected(int /*long*/ selection, int /*long*/[] model, int /*long*/ iter) {
lock.lock();
@@ -8163,6 +10765,11 @@ public static final boolean gtk_tree_selection_get_selected(int /*long*/ selecti
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param selection cast=(GtkTreeSelection *)
+ * @param model cast=(GtkTreeModel **)
+ */
public static final native int /*long*/ _gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model);
public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long*/ selection, int /*long*/[] model) {
lock.lock();
@@ -8172,6 +10779,10 @@ public static final int /*long*/ gtk_tree_selection_get_selected_rows(int /*long
lock.unlock();
}
}
+/**
+ * @param selection cast=(GtkTreeSelection *)
+ * @param path cast=(GtkTreePath *)
+ */
public static final native boolean _gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path);
public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ selection, int /*long*/ path) {
lock.lock();
@@ -8181,6 +10792,7 @@ public static final boolean gtk_tree_selection_path_is_selected(int /*long*/ sel
lock.unlock();
}
}
+/** @param selection cast=(GtkTreeSelection *) */
public static final native void _gtk_tree_selection_select_all(int /*long*/ selection);
public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
lock.lock();
@@ -8190,6 +10802,10 @@ public static final void gtk_tree_selection_select_all(int /*long*/ selection) {
lock.unlock();
}
}
+/**
+ * @param selection cast=(GtkTreeSelection *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter);
public static final void gtk_tree_selection_select_iter(int /*long*/ selection, int /*long*/ iter) {
lock.lock();
@@ -8199,6 +10815,11 @@ public static final void gtk_tree_selection_select_iter(int /*long*/ selection,
lock.unlock();
}
}
+/**
+ * @param selection cast=(GtkTreeSelection *)
+ * @param func cast=(GtkTreeSelectionForeachFunc)
+ * @param data cast=(gpointer)
+ */
public static final native void _gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data);
public static final void gtk_tree_selection_selected_foreach(int /*long*/ selection, int /*long*/ func, int /*long*/ data) {
lock.lock();
@@ -8208,6 +10829,10 @@ public static final void gtk_tree_selection_selected_foreach(int /*long*/ select
lock.unlock();
}
}
+/**
+ * @param selection cast=(GtkTreeSelection *)
+ * @param mode cast=(GtkSelectionMode)
+ */
public static final native void _gtk_tree_selection_set_mode(int /*long*/ selection, int mode);
public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int mode) {
lock.lock();
@@ -8217,6 +10842,7 @@ public static final void gtk_tree_selection_set_mode(int /*long*/ selection, int
lock.unlock();
}
}
+/** @param selection cast=(GtkTreeSelection *) */
public static final native void _gtk_tree_selection_unselect_all(int /*long*/ selection);
public static final void gtk_tree_selection_unselect_all(int /*long*/ selection) {
lock.lock();
@@ -8226,6 +10852,10 @@ public static final void gtk_tree_selection_unselect_all(int /*long*/ selection)
lock.unlock();
}
}
+/**
+ * @param selection cast=(GtkTreeSelection *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter);
public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection, int /*long*/ iter) {
lock.lock();
@@ -8235,6 +10865,11 @@ public static final void gtk_tree_selection_unselect_iter(int /*long*/ selection
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent);
public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/ iter, int /*long*/ parent) {
lock.lock();
@@ -8244,6 +10879,7 @@ public static final void gtk_tree_store_append(int /*long*/ store, int /*long*/
lock.unlock();
}
}
+/** @param store cast=(GtkTreeStore *) */
public static final native void _gtk_tree_store_clear(int /*long*/ store);
public static final void gtk_tree_store_clear(int /*long*/ store) {
lock.lock();
@@ -8253,6 +10889,12 @@ public static final void gtk_tree_store_clear(int /*long*/ store) {
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param parent cast=(GtkTreeIter *)
+ * @param position cast=(gint)
+ */
public static final native void _gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position);
public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/ iter, int /*long*/ parent, int position) {
lock.lock();
@@ -8262,6 +10904,7 @@ public static final void gtk_tree_store_insert(int /*long*/ store, int /*long*/
lock.unlock();
}
}
+/** @param types cast=(GType *) */
public static final native int /*long*/ _gtk_tree_store_newv(int numColumns, int /*long*/[] types);
public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*/[] types) {
lock.lock();
@@ -8271,6 +10914,10 @@ public static final int /*long*/ gtk_tree_store_newv(int numColumns, int /*long*
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter);
public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/ iter) {
lock.lock();
@@ -8280,6 +10927,10 @@ public static final void gtk_tree_store_remove(int /*long*/ store, int /*long*/
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator);
public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, byte[] value, int /*long*/ terminator) {
lock.lock();
@@ -8289,6 +10940,10 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator);
public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, int value, int /*long*/ terminator) {
lock.lock();
@@ -8298,6 +10953,10 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator);
public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, long value, int /*long*/ terminator) {
lock.lock();
@@ -8307,6 +10966,11 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ * @param value flags=no_out
+ */
public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator);
public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, GdkColor value, int /*long*/ terminator) {
lock.lock();
@@ -8316,6 +10980,10 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param store cast=(GtkTreeStore *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator);
public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ iter, int column, boolean value, int /*long*/ terminator) {
lock.lock();
@@ -8325,6 +10993,10 @@ public static final void gtk_tree_store_set(int /*long*/ store, int /*long*/ ite
lock.unlock();
}
}
+/**
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
public static final native int /*long*/ _gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path);
public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/ view, int /*long*/ path) {
lock.lock();
@@ -8334,6 +11006,10 @@ public static final int /*long*/ gtk_tree_view_create_row_drag_icon(int /*long*/
lock.unlock();
}
}
+/**
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
public static final native boolean _gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path);
public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*long*/ path) {
lock.lock();
@@ -8343,6 +11019,12 @@ public static final boolean gtk_tree_view_collapse_row(int /*long*/ view, int /*
lock.unlock();
}
}
+/**
+ * @param treeColumn cast=(GtkTreeViewColumn *)
+ * @param cellRenderer cast=(GtkCellRenderer *)
+ * @param attribute cast=(const gchar *)
+ * @param column cast=(gint)
+ */
public static final native void _gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column);
public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeColumn, int /*long*/ cellRenderer, byte[] attribute, int column) {
lock.lock();
@@ -8352,6 +11034,13 @@ public static final void gtk_tree_view_column_add_attribute(int /*long*/ treeCol
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param cell_renderer cast=(GtkCellRenderer *)
+ * @param start_pos cast=(gint *)
+ * @param width cast=(gint *)
+ */
public static final native boolean _gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width);
public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/ tree_column, int /*long*/ cell_renderer, int[] start_pos, int[] width) {
lock.lock();
@@ -8361,6 +11050,14 @@ public static final boolean gtk_tree_view_column_cell_get_position(int /*long*/
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param cell_area cast=(GdkRectangle *),flags=no_in
+ * @param x_offset cast=(gint *)
+ * @param y_offset cast=(gint *)
+ * @param width cast=(gint *)
+ * @param height cast=(gint *)
+ */
public static final native void _gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height);
public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_column, GdkRectangle cell_area, int[] x_offset, int[] y_offset, int[] width, int[] height) {
lock.lock();
@@ -8370,6 +11067,11 @@ public static final void gtk_tree_view_column_cell_get_size(int /*long*/ tree_co
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param tree_model cast=(GtkTreeModel *)
+ * @param iter cast=(GtkTreeIter *)
+ */
public static final native void _gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded);
public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tree_column, int /*long*/ tree_model, int /*long*/ iter, boolean is_expander, boolean is_expanded) {
lock.lock();
@@ -8379,6 +11081,7 @@ public static final void gtk_tree_view_column_cell_set_cell_data(int /*long*/ tr
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native void _gtk_tree_view_column_clear(int /*long*/ tree_column);
public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
lock.lock();
@@ -8388,6 +11091,7 @@ public static final void gtk_tree_view_column_clear(int /*long*/ tree_column) {
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native int /*long*/ _gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column);
public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*long*/ tree_column) {
lock.lock();
@@ -8397,6 +11101,7 @@ public static final int /*long*/ gtk_tree_view_column_get_cell_renderers(int /*l
lock.unlock();
}
}
+/** @param column cast=(GtkTreeViewColumn *) */
public static final native int _gtk_tree_view_column_get_fixed_width(int /*long*/ column);
public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column) {
lock.lock();
@@ -8406,6 +11111,7 @@ public static final int gtk_tree_view_column_get_fixed_width(int /*long*/ column
lock.unlock();
}
}
+/** @param column cast=(GtkTreeViewColumn *) */
public static final native boolean _gtk_tree_view_column_get_reorderable(int /*long*/ column);
public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ column) {
lock.lock();
@@ -8415,6 +11121,7 @@ public static final boolean gtk_tree_view_column_get_reorderable(int /*long*/ co
lock.unlock();
}
}
+/** @param column cast=(GtkTreeViewColumn *) */
public static final native boolean _gtk_tree_view_column_get_resizable(int /*long*/ column);
public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ column) {
lock.lock();
@@ -8424,6 +11131,7 @@ public static final boolean gtk_tree_view_column_get_resizable(int /*long*/ colu
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native int _gtk_tree_view_column_get_sizing(int /*long*/ tree_column);
public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column) {
lock.lock();
@@ -8433,6 +11141,7 @@ public static final int gtk_tree_view_column_get_sizing(int /*long*/ tree_column
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native int _gtk_tree_view_column_get_spacing(int /*long*/ tree_column);
public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_column) {
lock.lock();
@@ -8442,6 +11151,7 @@ public static final int gtk_tree_view_column_get_spacing(int /*long*/ tree_colum
lock.unlock();
}
}
+/** @param column cast=(GtkTreeViewColumn *) */
public static final native boolean _gtk_tree_view_column_get_visible(int /*long*/ column);
public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column) {
lock.lock();
@@ -8451,6 +11161,7 @@ public static final boolean gtk_tree_view_column_get_visible(int /*long*/ column
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native boolean _gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column);
public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/ tree_column) {
lock.lock();
@@ -8460,6 +11171,7 @@ public static final boolean gtk_tree_view_column_get_sort_indicator(int /*long*/
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native int _gtk_tree_view_column_get_sort_order(int /*long*/ tree_column);
public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_column) {
lock.lock();
@@ -8469,6 +11181,7 @@ public static final int gtk_tree_view_column_get_sort_order(int /*long*/ tree_co
lock.unlock();
}
}
+/** @param column cast=(GtkTreeViewColumn *) */
public static final native int _gtk_tree_view_column_get_width(int /*long*/ column);
public static final int gtk_tree_view_column_get_width(int /*long*/ column) {
lock.lock();
@@ -8487,6 +11200,11 @@ public static final int /*long*/ gtk_tree_view_column_new() {
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param cell_renderer cast=(GtkCellRenderer *)
+ * @param expand cast=(gboolean)
+ */
public static final native void _gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);
public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {
lock.lock();
@@ -8496,6 +11214,11 @@ public static final void gtk_tree_view_column_pack_start(int /*long*/ tree_colum
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param cell_renderer cast=(GtkCellRenderer *)
+ * @param expand cast=(gboolean)
+ */
public static final native void _gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand);
public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column, int /*long*/ cell_renderer, boolean expand) {
lock.lock();
@@ -8505,6 +11228,7 @@ public static final void gtk_tree_view_column_pack_end(int /*long*/ tree_column,
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native void _gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign);
public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_column, float xalign) {
lock.lock();
@@ -8514,6 +11238,13 @@ public static final void gtk_tree_view_column_set_alignment(int /*long*/ tree_co
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param cell_renderer cast=(GtkCellRenderer *)
+ * @param func cast=(GtkTreeCellDataFunc)
+ * @param func_data cast=(gpointer)
+ * @param destroy cast=(GtkDestroyNotify)
+ */
public static final native void _gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy);
public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tree_column, int /*long*/ cell_renderer, int /*long*/ func, int /*long*/ func_data, int /*long*/ destroy) {
lock.lock();
@@ -8523,6 +11254,10 @@ public static final void gtk_tree_view_column_set_cell_data_func(int /*long*/ tr
lock.unlock();
}
}
+/**
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param clickable cast=(gboolean)
+ */
public static final native void _gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable);
public static final void gtk_tree_view_column_set_clickable(int /*long*/ column, boolean clickable) {
lock.lock();
@@ -8532,6 +11267,10 @@ public static final void gtk_tree_view_column_set_clickable(int /*long*/ column,
lock.unlock();
}
}
+/**
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param fixed_width cast=(gint)
+ */
public static final native void _gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width);
public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ column, int fixed_width) {
lock.lock();
@@ -8541,6 +11280,10 @@ public static final void gtk_tree_view_column_set_fixed_width(int /*long*/ colum
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param min_width cast=(gint)
+ */
public static final native void _gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width);
public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_column, int min_width) {
lock.lock();
@@ -8550,6 +11293,10 @@ public static final void gtk_tree_view_column_set_min_width(int /*long*/ tree_co
lock.unlock();
}
}
+/**
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param reorderable cast=(gboolean)
+ */
public static final native void _gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable);
public static final void gtk_tree_view_column_set_reorderable(int /*long*/ column, boolean reorderable) {
lock.lock();
@@ -8559,6 +11306,10 @@ public static final void gtk_tree_view_column_set_reorderable(int /*long*/ colum
lock.unlock();
}
}
+/**
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param resizable cast=(gboolean)
+ */
public static final native void _gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable);
public static final void gtk_tree_view_column_set_resizable(int /*long*/ column, boolean resizable) {
lock.lock();
@@ -8568,6 +11319,10 @@ public static final void gtk_tree_view_column_set_resizable(int /*long*/ column,
lock.unlock();
}
}
+/**
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param type cast=(GtkTreeViewColumnSizing)
+ */
public static final native void _gtk_tree_view_column_set_sizing(int /*long*/ column, int type);
public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, int type) {
lock.lock();
@@ -8577,6 +11332,10 @@ public static final void gtk_tree_view_column_set_sizing(int /*long*/ column, in
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting);
public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tree_column, boolean setting) {
lock.lock();
@@ -8586,6 +11345,10 @@ public static final void gtk_tree_view_column_set_sort_indicator(int /*long*/ tr
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param order cast=(GtkSortType)
+ */
public static final native void _gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order);
public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_column, int order) {
lock.lock();
@@ -8595,6 +11358,10 @@ public static final void gtk_tree_view_column_set_sort_order(int /*long*/ tree_c
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param title cast=(const gchar *)
+ */
public static final native void _gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title);
public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column, byte[] title) {
lock.lock();
@@ -8604,6 +11371,7 @@ public static final void gtk_tree_view_column_set_title(int /*long*/ tree_column
lock.unlock();
}
}
+/** @param tree_column cast=(GtkTreeViewColumn *) */
public static final native void _gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible);
public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_column, boolean visible) {
lock.lock();
@@ -8613,6 +11381,10 @@ public static final void gtk_tree_view_column_set_visible (int /*long*/ tree_col
lock.unlock();
}
}
+/**
+ * @param tree_column cast=(GtkTreeViewColumn *)
+ * @param widget cast=(GtkWidget *)
+ */
public static final native void _gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget);
public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_column, int /*long*/ widget) {
lock.lock();
@@ -8622,6 +11394,10 @@ public static final void gtk_tree_view_column_set_widget(int /*long*/ tree_colum
lock.unlock();
}
}
+/**
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
public static final native void _gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos);
public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int /*long*/ path, int pos) {
lock.lock();
@@ -8631,6 +11407,7 @@ public static final void gtk_tree_view_set_drag_dest_row(int /*long*/ view, int
lock.unlock();
}
}
+/** @param view cast=(GtkTreeView *) */
public static final native void _gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search);
public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boolean enable_search) {
lock.lock();
@@ -8640,6 +11417,11 @@ public static final void gtk_tree_view_set_enable_search (int /*long*/ view, boo
lock.unlock();
}
}
+/**
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ * @param open_all cast=(gboolean)
+ */
public static final native boolean _gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all);
public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*long*/ path, boolean open_all) {
lock.lock();
@@ -8649,6 +11431,12 @@ public static final boolean gtk_tree_view_expand_row(int /*long*/ view, int /*lo
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param rect cast=(GdkRectangle *)
+ */
public static final native void _gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);
public static final void gtk_tree_view_get_background_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {
lock.lock();
@@ -8658,6 +11446,7 @@ public static final void gtk_tree_view_get_background_area(int /*long*/ tree_vie
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native int /*long*/ _gtk_tree_view_get_bin_window(int /*long*/ tree_view);
public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_view) {
lock.lock();
@@ -8667,6 +11456,12 @@ public static final int /*long*/ gtk_tree_view_get_bin_window(int /*long*/ tree_
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param rect cast=(GdkRectangle *),flags=no_in
+ */
public static final native void _gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect);
public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, GdkRectangle rect) {
lock.lock();
@@ -8676,6 +11471,7 @@ public static final void gtk_tree_view_get_cell_area(int /*long*/ tree_view, int
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native int /*long*/_gtk_tree_view_get_expander_column(int /*long*/ tree_view);
public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ tree_view) {
lock.lock();
@@ -8685,6 +11481,10 @@ public static final int /*long*/gtk_tree_view_get_expander_column(int /*long*/ t
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param n cast=(gint)
+ */
public static final native int /*long*/ _gtk_tree_view_get_column(int /*long*/ tree_view, int n);
public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view, int n) {
lock.lock();
@@ -8694,6 +11494,7 @@ public static final int /*long*/ gtk_tree_view_get_column(int /*long*/ tree_view
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native int /*long*/ _gtk_tree_view_get_columns(int /*long*/ tree_view);
public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_view) {
lock.lock();
@@ -8703,6 +11504,11 @@ public static final int /*long*/ gtk_tree_view_get_columns(int /*long*/ tree_vie
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath **)
+ * @param focus_column cast=(GtkTreeViewColumn **)
+ */
public static final native void _gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column);
public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*long*/[] path, int /*long*/[] focus_column) {
lock.lock();
@@ -8712,6 +11518,7 @@ public static final void gtk_tree_view_get_cursor(int /*long*/ tree_view, int /*
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native boolean _gtk_tree_view_get_headers_visible(int /*long*/ tree_view);
public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_view) {
lock.lock();
@@ -8721,6 +11528,15 @@ public static final boolean gtk_tree_view_get_headers_visible(int /*long*/ tree_
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ * @param path cast=(GtkTreePath **)
+ * @param column cast=(GtkTreeViewColumn **)
+ * @param cell_x cast=(gint *)
+ * @param cell_y cast=(gint *)
+ */
public static final native boolean _gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y);
public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view, int x, int y, int /*long*/[] path, int /*long*/[] column, int[] cell_x, int[] cell_y) {
lock.lock();
@@ -8730,6 +11546,7 @@ public static final boolean gtk_tree_view_get_path_at_pos(int /*long*/ tree_view
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native boolean _gtk_tree_view_get_rules_hint(int /*long*/ tree_view);
public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view) {
lock.lock();
@@ -8739,6 +11556,7 @@ public static final boolean gtk_tree_view_get_rules_hint(int /*long*/ tree_view)
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native int /*long*/ _gtk_tree_view_get_selection(int /*long*/ tree_view);
public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_view) {
lock.lock();
@@ -8748,6 +11566,10 @@ public static final int /*long*/ gtk_tree_view_get_selection(int /*long*/ tree_v
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param visible_rect flags=no_in
+ */
public static final native void _gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect);
public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view, GdkRectangle visible_rect) {
lock.lock();
@@ -8757,6 +11579,11 @@ public static final void gtk_tree_view_get_visible_rect(int /*long*/ tree_view,
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param position cast=(gint)
+ */
public static final native int _gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position);
public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int /*long*/ column, int position) {
lock.lock();
@@ -8766,6 +11593,11 @@ public static final int gtk_tree_view_insert_column(int /*long*/ tree_view, int
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param base_column cast=(GtkTreeViewColumn *)
+ */
public static final native void _gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/ base_column);
public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view, int /*long*/ column, int /*long*/base_column) {
lock.lock();
@@ -8775,6 +11607,7 @@ public static final void gtk_tree_view_move_column_after(int /*long*/ tree_view,
lock.unlock();
}
}
+/** @param model cast=(GtkTreeModel *) */
public static final native int /*long*/ _gtk_tree_view_new_with_model(int /*long*/ model);
public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model) {
lock.lock();
@@ -8784,6 +11617,10 @@ public static final int /*long*/ gtk_tree_view_new_with_model(int /*long*/ model
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param column cast=(GtkTreeViewColumn *)
+ */
public static final native void _gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column);
public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int /*long*/ column) {
lock.lock();
@@ -8793,6 +11630,10 @@ public static final void gtk_tree_view_remove_column(int /*long*/ tree_view, int
lock.unlock();
}
}
+/**
+ * @param view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ */
public static final native boolean _gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path);
public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*long*/ path) {
lock.lock();
@@ -8802,6 +11643,14 @@ public static final boolean gtk_tree_view_row_expanded(int /*long*/ view, int /*
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ * @param column cast=(GtkTreeViewColumn *)
+ * @param use_align cast=(gboolean)
+ * @param row_aligh cast=(gfloat)
+ * @param column_align cast=(gfloat)
+ */
public static final native void _gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align);
public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, int /*long*/ path, int /*long*/ column, boolean use_align, float row_aligh, float column_align) {
lock.lock();
@@ -8811,6 +11660,11 @@ public static final void gtk_tree_view_scroll_to_cell(int /*long*/ tree_view, in
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param tree_x cast=(gint)
+ * @param tree_y cast=(gint)
+ */
public static final native void _gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y);
public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view, int tree_x, int tree_y) {
lock.lock();
@@ -8820,6 +11674,11 @@ public static final void gtk_tree_view_scroll_to_point (int /*long*/ tree_view,
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param path cast=(GtkTreePath *)
+ * @param focus_column cast=(GtkTreeViewColumn *)
+ */
public static final native void _gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing);
public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*long*/ path, int /*long*/ focus_column, boolean start_editing) {
lock.lock();
@@ -8829,6 +11688,23 @@ public static final void gtk_tree_view_set_cursor(int /*long*/ tree_view, int /*
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param tree_view cast=(GtkTreeView*)
+ */
+public static final native void _gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines);
+public static final void gtk_tree_view_set_grid_lines(int /*long*/ tree_view, int grid_lines) {
+ lock.lock();
+ try {
+ _gtk_tree_view_set_grid_lines(tree_view, grid_lines);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param visible cast=(gboolean)
+ */
public static final native void _gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible);
public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_view, boolean visible) {
lock.lock();
@@ -8838,6 +11714,10 @@ public static final void gtk_tree_view_set_headers_visible(int /*long*/ tree_vie
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param model cast=(GtkTreeModel *)
+ */
public static final native void _gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model);
public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*long*/ model) {
lock.lock();
@@ -8847,6 +11727,7 @@ public static final void gtk_tree_view_set_model(int /*long*/ tree_view, int /*l
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native void _gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting);
public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, boolean setting) {
lock.lock();
@@ -8856,6 +11737,10 @@ public static final void gtk_tree_view_set_rules_hint(int /*long*/ tree_view, bo
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param column cast=(gint)
+ */
public static final native void _gtk_tree_view_set_search_column(int /*long*/ tree_view, int column);
public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view, int column) {
lock.lock();
@@ -8865,6 +11750,13 @@ public static final void gtk_tree_view_set_search_column(int /*long*/ tree_view,
lock.unlock();
}
}
+/**
+ * @param tree_view cast=(GtkTreeView *)
+ * @param tx cast=(gint)
+ * @param ty cast=(gint)
+ * @param wx cast=(gint *)
+ * @param wy cast=(gint *)
+ */
public static final native void _gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy);
public static final void gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_view, int tx, int ty, int[] wx, int[] wy) {
lock.lock();
@@ -8874,6 +11766,7 @@ public static final void gtk_tree_view_tree_to_widget_coords(int /*long*/ tree_v
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native void _gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view);
public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_view) {
lock.lock();
@@ -8883,6 +11776,7 @@ public static final void gtk_tree_view_unset_rows_drag_dest(int /*long*/ tree_vi
lock.unlock();
}
}
+/** @param tree_view cast=(GtkTreeView *) */
public static final native void _gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty);
public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_view, int wx, int wy, int[] tx, int[] ty) {
lock.lock();
@@ -8892,6 +11786,10 @@ public static final void gtk_tree_view_widget_to_tree_coords(int /*long*/ tree_v
lock.unlock();
}
}
+/**
+ * @param homogeneous cast=(gboolean)
+ * @param spacing cast=(gint)
+ */
public static final native int /*long*/ _gtk_vbox_new(boolean homogeneous, int spacing);
public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing) {
lock.lock();
@@ -8901,6 +11799,30 @@ public static final int /*long*/ gtk_vbox_new(boolean homogeneous, int spacing)
lock.unlock();
}
}
+/** @param viewport cast=(GtkViewport *) */
+public static final native int _gtk_viewport_get_shadow_type(int /*long*/ viewport);
+public static final int gtk_viewport_get_shadow_type(int /*long*/ viewport) {
+ lock.lock();
+ try {
+ return _gtk_viewport_get_shadow_type(viewport);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @param viewport cast=(GtkViewport *)
+ * @param type cast=(GtkShadowType)
+ */
+public static final native void _gtk_viewport_set_shadow_type(int /*long*/ viewport, int type);
+public static final void gtk_viewport_set_shadow_type(int /*long*/ viewport, int type) {
+ lock.lock();
+ try {
+ _gtk_viewport_set_shadow_type(viewport, type);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native int /*long*/ _gtk_vscale_new(int /*long*/ adjustment);
public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
lock.lock();
@@ -8910,6 +11832,7 @@ public static final int /*long*/ gtk_vscale_new(int /*long*/ adjustment) {
lock.unlock();
}
}
+/** @param adjustment cast=(GtkAdjustment *) */
public static final native int /*long*/ _gtk_vscrollbar_new(int /*long*/ adjustment);
public static final int /*long*/ gtk_vscrollbar_new(int /*long*/ adjustment) {
lock.lock();
@@ -8928,6 +11851,13 @@ public static final int /*long*/ gtk_vseparator_new() {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param accel_signal cast=(const gchar *)
+ * @param accel_group cast=(GtkAccelGroup *)
+ * @param accel_key cast=(guint)
+ * @param accel_mods cast=(GdkModifierType)
+ */
public static final native void _gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags);
public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[] accel_signal, int /*long*/ accel_group, int accel_key, int accel_mods, int accel_flags) {
lock.lock();
@@ -8937,6 +11867,10 @@ public static final void gtk_widget_add_accelerator(int /*long*/ widget, byte[]
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param events cast=(gint)
+ */
public static final native void _gtk_widget_add_events(int /*long*/ widget, int events);
public static final void gtk_widget_add_events(int /*long*/ widget, int events) {
lock.lock();
@@ -8946,6 +11880,7 @@ public static final void gtk_widget_add_events(int /*long*/ widget, int events)
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native boolean _gtk_widget_child_focus(int /*long*/ widget, int direction);
public static final boolean gtk_widget_child_focus(int /*long*/ widget, int direction) {
lock.lock();
@@ -8955,6 +11890,10 @@ public static final boolean gtk_widget_child_focus(int /*long*/ widget, int dire
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param text cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text);
public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, byte[] text) {
lock.lock();
@@ -8964,6 +11903,10 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param text cast=(const gchar *)
+ */
public static final native int /*long*/ _gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text);
public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ widget, int /*long*/ text) {
lock.lock();
@@ -8973,6 +11916,7 @@ public static final int /*long*/ gtk_widget_create_pango_layout(int /*long*/ wid
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_destroy(int /*long*/ widget);
public static final void gtk_widget_destroy(int /*long*/ widget) {
lock.lock();
@@ -8982,6 +11926,10 @@ public static final void gtk_widget_destroy(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param event cast=(GdkEvent *)
+ */
public static final native boolean _gtk_widget_event(int /*long*/ widget, int /*long*/ event);
public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ event) {
lock.lock();
@@ -8991,6 +11939,7 @@ public static final boolean gtk_widget_event(int /*long*/ widget, int /*long*/ e
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_widget_get_accessible (int /*long*/ widget);
public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget) {
lock.lock();
@@ -9000,6 +11949,7 @@ public static final int /*long*/ gtk_widget_get_accessible (int /*long*/ widget)
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native boolean _gtk_widget_get_child_visible (int /*long*/ widget);
public static final boolean gtk_widget_get_child_visible (int /*long*/ widget) {
lock.lock();
@@ -9027,6 +11977,7 @@ public static final int /*long*/ gtk_widget_get_default_style() {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int _gtk_widget_get_direction(int /*long*/ widget);
public static final int gtk_widget_get_direction(int /*long*/ widget) {
lock.lock();
@@ -9036,6 +11987,7 @@ public static final int gtk_widget_get_direction(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int _gtk_widget_get_events(int /*long*/ widget);
public static final int gtk_widget_get_events(int /*long*/ widget) {
lock.lock();
@@ -9045,6 +11997,7 @@ public static final int gtk_widget_get_events(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_widget_get_modifier_style(int /*long*/ widget);
public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widget) {
lock.lock();
@@ -9054,6 +12007,7 @@ public static final int /*long*/ gtk_widget_get_modifier_style(int /*long*/ widg
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_widget_get_pango_context(int /*long*/ widget);
public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widget) {
lock.lock();
@@ -9063,6 +12017,7 @@ public static final int /*long*/ gtk_widget_get_pango_context(int /*long*/ widge
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_widget_get_parent(int /*long*/ widget);
public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
lock.lock();
@@ -9072,6 +12027,7 @@ public static final int /*long*/ gtk_widget_get_parent(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_widget_get_style(int /*long*/ widget);
public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
lock.lock();
@@ -9081,6 +12037,11 @@ public static final int /*long*/ gtk_widget_get_style(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param width cast=(gint *)
+ * @param height cast=(gint *)
+ */
public static final native void _gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height);
public static final void gtk_widget_get_size_request(int /*long*/ widget, int [] width, int [] height) {
lock.lock();
@@ -9090,6 +12051,7 @@ public static final void gtk_widget_get_size_request(int /*long*/ widget, int []
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native int /*long*/ _gtk_widget_get_toplevel (int /*long*/ widget);
public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
lock.lock();
@@ -9099,6 +12061,7 @@ public static final int /*long*/ gtk_widget_get_toplevel (int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_grab_focus(int /*long*/ widget);
public static final void gtk_widget_grab_focus(int /*long*/ widget) {
lock.lock();
@@ -9108,6 +12071,7 @@ public static final void gtk_widget_grab_focus(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_hide(int /*long*/ widget);
public static final void gtk_widget_hide(int /*long*/ widget) {
lock.lock();
@@ -9117,6 +12081,10 @@ public static final void gtk_widget_hide(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param widget cast=(GtkWidget *)
+ */
public static final native boolean _gtk_widget_is_composited(int /*long*/ widget);
public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
lock.lock();
@@ -9126,6 +12094,7 @@ public static final boolean gtk_widget_is_composited(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native boolean _gtk_widget_is_focus(int /*long*/ widget);
public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
lock.lock();
@@ -9135,6 +12104,7 @@ public static final boolean gtk_widget_is_focus(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_map(int /*long*/ widget);
public static final void gtk_widget_map(int /*long*/ widget) {
lock.lock();
@@ -9144,6 +12114,10 @@ public static final void gtk_widget_map(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param group_cycling cast=(gboolean)
+ */
public static final native boolean _gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling);
public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, boolean group_cycling) {
lock.lock();
@@ -9153,6 +12127,11 @@ public static final boolean gtk_widget_mnemonic_activate(int /*long*/ widget, bo
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color);
public static final void gtk_widget_modify_base(int /*long*/ widget, int state, GdkColor color) {
lock.lock();
@@ -9162,6 +12141,11 @@ public static final void gtk_widget_modify_base(int /*long*/ widget, int state,
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color);
public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, GdkColor color) {
lock.lock();
@@ -9171,6 +12155,11 @@ public static final void gtk_widget_modify_bg(int /*long*/ widget, int state, Gd
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color);
public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, GdkColor color) {
lock.lock();
@@ -9180,6 +12169,10 @@ public static final void gtk_widget_modify_fg(int /*long*/ widget, int state, Gd
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param pango_font_descr cast=(PangoFontDescription *)
+ */
public static final native void _gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr);
public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*/ pango_font_descr) {
lock.lock();
@@ -9189,6 +12182,10 @@ public static final void gtk_widget_modify_font(int /*long*/ widget, int /*long*
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param style cast=(GtkRcStyle *)
+ */
public static final native void _gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style);
public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long*/ style) {
lock.lock();
@@ -9198,6 +12195,11 @@ public static final void gtk_widget_modify_style(int /*long*/ widget, int /*long
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param state cast=(GtkStateType)
+ * @param color cast=(GdkColor *),flags=no_out
+ */
public static final native void _gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color);
public static final void gtk_widget_modify_text(int /*long*/ widget, int state, GdkColor color) {
lock.lock();
@@ -9207,6 +12209,7 @@ public static final void gtk_widget_modify_text(int /*long*/ widget, int state,
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_queue_resize(int /*long*/ widget);
public static final void gtk_widget_queue_resize(int /*long*/ widget) {
lock.lock();
@@ -9216,6 +12219,7 @@ public static final void gtk_widget_queue_resize(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_realize(int /*long*/ widget);
public static final void gtk_widget_realize(int /*long*/ widget) {
lock.lock();
@@ -9225,6 +12229,12 @@ public static final void gtk_widget_realize(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param accel_group cast=(GtkAccelGroup *)
+ * @param accel_key cast=(guint)
+ * @param accel_mods cast=(GdkModifierType)
+ */
public static final native void _gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods);
public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int /*long*/ accel_group, int accel_key, int accel_mods) {
lock.lock();
@@ -9234,6 +12244,10 @@ public static final void gtk_widget_remove_accelerator(int /*long*/ widget, int
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param new_parent cast=(GtkWidget *)
+ */
public static final native void _gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent);
public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ new_parent) {
lock.lock();
@@ -9243,6 +12257,10 @@ public static final void gtk_widget_reparent(int /*long*/ widget, int /*long*/ n
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param event cast=(GdkEvent *)
+ */
public static final native int _gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event);
public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/ event) {
lock.lock();
@@ -9252,6 +12270,7 @@ public static final int gtk_widget_send_expose(int /*long*/ widget, int /*long*/
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable);
public static final void gtk_widget_set_app_paintable(int /*long*/ widget, boolean app_paintable) {
lock.lock();
@@ -9261,6 +12280,7 @@ public static final void gtk_widget_set_app_paintable(int /*long*/ widget, boole
lock.unlock();
}
}
+/** @param dir cast=(GtkTextDirection) */
public static final native void _gtk_widget_set_default_direction(int dir);
public static final void gtk_widget_set_default_direction(int dir) {
lock.lock();
@@ -9270,6 +12290,10 @@ public static final void gtk_widget_set_default_direction(int dir) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param dir cast=(GtkTextDirection)
+ */
public static final native void _gtk_widget_set_direction(int /*long*/ widget, int dir);
public static final void gtk_widget_set_direction(int /*long*/ widget, int dir) {
lock.lock();
@@ -9279,6 +12303,10 @@ public static final void gtk_widget_set_direction(int /*long*/ widget, int dir)
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param double_buffered cast=(gboolean)
+ */
public static final native void _gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered);
public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boolean double_buffered) {
lock.lock();
@@ -9288,6 +12316,10 @@ public static final void gtk_widget_set_double_buffered(int /*long*/ widget, boo
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param name cast=(const char *)
+ */
public static final native void _gtk_widget_set_name(int /*long*/ widget, byte[] name);
public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
lock.lock();
@@ -9297,6 +12329,10 @@ public static final void gtk_widget_set_name(int /*long*/ widget, byte[] name) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param redraw cast=(gboolean)
+ */
public static final native void _gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw);
public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget, boolean redraw) {
lock.lock();
@@ -9306,6 +12342,10 @@ public static final void gtk_widget_set_redraw_on_allocate(int /*long*/ widget,
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param sensitive cast=(gboolean)
+ */
public static final native void _gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive);
public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean sensitive) {
lock.lock();
@@ -9315,6 +12355,11 @@ public static final void gtk_widget_set_sensitive(int /*long*/ widget, boolean s
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param width cast=(gint)
+ * @param height cast=(gint)
+ */
public static final native void _gtk_widget_set_size_request(int /*long*/ widget, int width, int height);
public static final void gtk_widget_set_size_request(int /*long*/ widget, int width, int height) {
lock.lock();
@@ -9324,6 +12369,10 @@ public static final void gtk_widget_set_size_request(int /*long*/ widget, int wi
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param state cast=(GtkStateType)
+ */
public static final native void _gtk_widget_set_state(int /*long*/ widget, int state);
public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
lock.lock();
@@ -9333,6 +12382,10 @@ public static final void gtk_widget_set_state(int /*long*/ widget, int state) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param style cast=(GtkStyle *)
+ */
public static final native void _gtk_widget_set_style(int /*long*/ widget, int /*long*/ style);
public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/ style) {
lock.lock();
@@ -9342,6 +12395,12 @@ public static final void gtk_widget_set_style(int /*long*/ widget, int /*long*/
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param shape_mask cast=(GdkBitmap *)
+ * @param offset_x cast=(gint)
+ * @param offset_y cast=(gint)
+ */
public static final native void _gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y);
public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int /*long*/ shape_mask, int offset_x, int offset_y) {
lock.lock();
@@ -9351,6 +12410,7 @@ public static final void gtk_widget_shape_combine_mask(int /*long*/ widget, int
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_show(int /*long*/ widget);
public static final void gtk_widget_show(int /*long*/ widget) {
lock.lock();
@@ -9360,6 +12420,7 @@ public static final void gtk_widget_show(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_show_now(int /*long*/ widget);
public static final void gtk_widget_show_now(int /*long*/ widget) {
lock.lock();
@@ -9369,6 +12430,10 @@ public static final void gtk_widget_show_now(int /*long*/ widget) {
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param allocation cast=(GtkAllocation *),flags=no_out
+ */
public static final native void _gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation);
public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAllocation allocation) {
lock.lock();
@@ -9378,6 +12443,10 @@ public static final void gtk_widget_size_allocate(int /*long*/ widget, GtkAlloca
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param requisition cast=(GtkRequisition *),flags=no_in
+ */
public static final native void _gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition);
public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisition requisition) {
lock.lock();
@@ -9387,6 +12456,11 @@ public static final void gtk_widget_size_request(int /*long*/ widget, GtkRequisi
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param property_name cast=(const gchar *)
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator);
public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, int[] value, int /*long*/ terminator) {
lock.lock();
@@ -9396,6 +12470,11 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param property_name cast=(const gchar *)
+ * @param terminator cast=(const gchar *),flags=sentinel
+ */
public static final native void _gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator);
public static final void gtk_widget_style_get(int /*long*/ widget, byte[] property_name, long[] value, int /*long*/ terminator) {
lock.lock();
@@ -9405,6 +12484,10 @@ public static final void gtk_widget_style_get(int /*long*/ widget, byte[] proper
lock.unlock();
}
}
+/**
+ * @param src_widget cast=(GtkWidget *)
+ * @param dest_widget cast=(GtkWidget *)
+ */
public static final native boolean _gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y);
public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_widget, int /*long*/ dest_widget, int src_x, int src_y, int[] dest_x, int[] dest_y) {
lock.lock();
@@ -9414,6 +12497,7 @@ public static final boolean gtk_widget_translate_coordinates(int /*long*/ src_wi
lock.unlock();
}
}
+/** @param widget cast=(GtkWidget *) */
public static final native void _gtk_widget_unrealize(int /*long*/ widget);
public static final void gtk_widget_unrealize(int /*long*/ widget) {
lock.lock();
@@ -9423,6 +12507,7 @@ public static final void gtk_widget_unrealize(int /*long*/ widget) {
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native boolean _gtk_window_activate_default(int /*long*/ window);
public static final boolean gtk_window_activate_default(int /*long*/ window) {
lock.lock();
@@ -9432,6 +12517,10 @@ public static final boolean gtk_window_activate_default(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param accel_group cast=(GtkAccelGroup *)
+ */
public static final native void _gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group);
public static final void gtk_window_add_accel_group(int /*long*/ window, int /*long*/ accel_group) {
lock.lock();
@@ -9441,6 +12530,7 @@ public static final void gtk_window_add_accel_group(int /*long*/ window, int /*l
lock.unlock();
}
}
+/** @param handle cast=(GtkWindow *) */
public static final native void _gtk_window_deiconify(int /*long*/ handle);
public static final void gtk_window_deiconify(int /*long*/ handle) {
lock.lock();
@@ -9450,6 +12540,7 @@ public static final void gtk_window_deiconify(int /*long*/ handle) {
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native int /*long*/ _gtk_window_get_focus(int /*long*/ window);
public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
lock.lock();
@@ -9459,6 +12550,10 @@ public static final int /*long*/ gtk_window_get_focus(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ */
public static final native int /*long*/ _gtk_window_get_group(int /*long*/ window);
public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
lock.lock();
@@ -9468,6 +12563,7 @@ public static final int /*long*/ gtk_window_get_group(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native int /*long*/ _gtk_window_get_icon_list(int /*long*/ window);
public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
lock.lock();
@@ -9477,6 +12573,7 @@ public static final int /*long*/ gtk_window_get_icon_list(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native boolean _gtk_window_get_modal(int /*long*/ window);
public static final boolean gtk_window_get_modal(int /*long*/ window) {
lock.lock();
@@ -9486,6 +12583,7 @@ public static final boolean gtk_window_get_modal(int /*long*/ window) {
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native int _gtk_window_get_mnemonic_modifier(int /*long*/ window);
public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
lock.lock();
@@ -9495,6 +12593,10 @@ public static final int gtk_window_get_mnemonic_modifier(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ */
public static final native double _gtk_window_get_opacity (int /*long*/ window);
public static final double gtk_window_get_opacity (int /*long*/ window) {
lock.lock();
@@ -9504,6 +12606,11 @@ public static final double gtk_window_get_opacity (int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param handle cast=(GtkWindow *)
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
public static final native void _gtk_window_get_position(int /*long*/ handle, int[] x, int[] y);
public static final void gtk_window_get_position(int /*long*/ handle, int[] x, int[] y) {
lock.lock();
@@ -9513,6 +12620,11 @@ public static final void gtk_window_get_position(int /*long*/ handle, int[] x, i
lock.unlock();
}
}
+/**
+ * @param handle cast=(GtkWindow *)
+ * @param x cast=(gint *)
+ * @param y cast=(gint *)
+ */
public static final native void _gtk_window_get_size(int /*long*/ handle, int[] x, int[] y);
public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[] y) {
lock.lock();
@@ -9522,6 +12634,10 @@ public static final void gtk_window_get_size(int /*long*/ handle, int[] x, int[]
lock.unlock();
}
}
+/**
+ * @param group cast=(GtkWindowGroup*)
+ * @param window cast=(GtkWindow*)
+ */
public static final native void _gtk_window_group_add_window(int /*long*/ group, int /*long*/ window);
public static final void gtk_window_group_add_window(int /*long*/ group, int /*long*/ window) {
lock.lock();
@@ -9531,6 +12647,10 @@ public static final void gtk_window_group_add_window(int /*long*/ group, int /*l
lock.unlock();
}
}
+/**
+ * @param group cast=(GtkWindowGroup*)
+ * @param window cast=(GtkWindow*)
+ */
public static final native void _gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window);
public static final void gtk_window_group_remove_window(int /*long*/ group, int /*long*/ window) {
lock.lock();
@@ -9549,6 +12669,7 @@ public static final int /*long*/ gtk_window_group_new() {
lock.unlock();
}
}
+/** @param handle cast=(GtkWindow *) */
public static final native void _gtk_window_iconify(int /*long*/ handle);
public static final void gtk_window_iconify(int /*long*/ handle) {
lock.lock();
@@ -9567,6 +12688,7 @@ public static final int /*long*/ gtk_window_list_toplevels () {
lock.unlock();
}
}
+/** @param handle cast=(GtkWindow *) */
public static final native void _gtk_window_maximize(int /*long*/ handle);
public static final void gtk_window_maximize(int /*long*/ handle) {
lock.lock();
@@ -9576,6 +12698,7 @@ public static final void gtk_window_maximize(int /*long*/ handle) {
lock.unlock();
}
}
+/** @param handle cast=(GtkWindow *) */
public static final native void _gtk_window_fullscreen(int /*long*/ handle);
public static final void gtk_window_fullscreen(int /*long*/ handle) {
lock.lock();
@@ -9585,6 +12708,7 @@ public static final void gtk_window_fullscreen(int /*long*/ handle) {
lock.unlock();
}
}
+/** @param handle cast=(GtkWindow *) */
public static final native void _gtk_window_unfullscreen(int /*long*/ handle);
public static final void gtk_window_unfullscreen(int /*long*/ handle) {
lock.lock();
@@ -9594,6 +12718,11 @@ public static final void gtk_window_unfullscreen(int /*long*/ handle) {
lock.unlock();
}
}
+/**
+ * @param handle cast=(GtkWindow *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native void _gtk_window_move(int /*long*/ handle, int x, int y);
public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
lock.lock();
@@ -9603,6 +12732,7 @@ public static final void gtk_window_move(int /*long*/ handle, int x, int y) {
lock.unlock();
}
}
+/** @param type cast=(GtkWindowType) */
public static final native int /*long*/ _gtk_window_new(int type);
public static final int /*long*/ gtk_window_new(int type) {
lock.lock();
@@ -9612,6 +12742,7 @@ public static final int /*long*/ gtk_window_new(int type) {
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native void _gtk_window_present(int /*long*/ window);
public static final void gtk_window_present(int /*long*/ window) {
lock.lock();
@@ -9621,6 +12752,10 @@ public static final void gtk_window_present(int /*long*/ window) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param accel_group cast=(GtkAccelGroup *)
+ */
public static final native void _gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group);
public static final void gtk_window_remove_accel_group(int /*long*/ window, int /*long*/ accel_group) {
lock.lock();
@@ -9630,6 +12765,11 @@ public static final void gtk_window_remove_accel_group(int /*long*/ window, int
lock.unlock();
}
}
+/**
+ * @param handle cast=(GtkWindow *)
+ * @param x cast=(gint)
+ * @param y cast=(gint)
+ */
public static final native void _gtk_window_resize(int /*long*/ handle, int x, int y);
public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
lock.lock();
@@ -9639,6 +12779,10 @@ public static final void gtk_window_resize(int /*long*/ handle, int x, int y) {
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param widget cast=(GtkWidget *)
+ */
public static final native void _gtk_window_set_default(int /*long*/ window, int /*long*/ widget);
public static final void gtk_window_set_default(int /*long*/ window, int /*long*/ widget) {
lock.lock();
@@ -9648,6 +12792,10 @@ public static final void gtk_window_set_default(int /*long*/ window, int /*long*
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting);
public static final void gtk_window_set_destroy_with_parent(int /*long*/ window, boolean setting) {
lock.lock();
@@ -9657,6 +12805,11 @@ public static final void gtk_window_set_destroy_with_parent(int /*long*/ window,
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _gtk_window_set_keep_below(int /*long*/ window, boolean setting);
public static final void gtk_window_set_keep_below(int /*long*/ window, boolean setting) {
lock.lock();
@@ -9666,6 +12819,11 @@ public static final void gtk_window_set_keep_below(int /*long*/ window, boolean
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param geometry_widget cast=(GtkWidget *)
+ * @param geometry flags=no_out
+ */
public static final native void _gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask);
public static final void gtk_window_set_geometry_hints(int /*long*/ window, int /*long*/ geometry_widget, GdkGeometry geometry, int geom_mask) {
lock.lock();
@@ -9675,6 +12833,10 @@ public static final void gtk_window_set_geometry_hints(int /*long*/ window, int
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param list cast=(GList *)
+ */
public static final native void _gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list);
public static final void gtk_window_set_icon_list(int /*long*/ window, int /*long*/ list) {
lock.lock();
@@ -9684,6 +12846,10 @@ public static final void gtk_window_set_icon_list(int /*long*/ window, int /*lon
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param modal cast=(gboolean)
+ */
public static final native void _gtk_window_set_modal(int /*long*/ window, boolean modal);
public static final void gtk_window_set_modal(int /*long*/ window, boolean modal) {
lock.lock();
@@ -9693,6 +12859,10 @@ public static final void gtk_window_set_modal(int /*long*/ window, boolean modal
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ */
public static final native void _gtk_window_set_opacity(int /*long*/ window, double opacity);
public static final void gtk_window_set_opacity(int /*long*/ window, double opacity) {
lock.lock();
@@ -9702,6 +12872,11 @@ public static final void gtk_window_set_opacity(int /*long*/ window, double opac
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param widget cast=(GtkWidget *)
+ * @param tip_text cast=(const gchar *)
+ */
public static final native void _gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text);
public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[] tip_text) {
lock.lock();
@@ -9711,6 +12886,10 @@ public static final void gtk_widget_set_tooltip_text(int /*long*/ widget, byte[]
lock.unlock();
}
}
+/**
+ * @param widget cast=(GtkWidget *)
+ * @param parent_window cast=(GdkWindow *)
+ */
public static final native void _gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window);
public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /*long*/ parent_window) {
lock.lock();
@@ -9720,6 +12899,10 @@ public static final void gtk_widget_set_parent_window(int /*long*/ widget, int /
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param resizable cast=(gboolean)
+ */
public static final native void _gtk_window_set_resizable(int /*long*/ window, boolean resizable);
public static final void gtk_window_set_resizable(int /*long*/ window, boolean resizable) {
lock.lock();
@@ -9729,6 +12912,10 @@ public static final void gtk_window_set_resizable(int /*long*/ window, boolean r
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param title cast=(const gchar *)
+ */
public static final native void _gtk_window_set_title(int /*long*/ window, byte[] title);
public static final void gtk_window_set_title(int /*long*/ window, byte[] title) {
lock.lock();
@@ -9738,6 +12925,11 @@ public static final void gtk_window_set_title(int /*long*/ window, byte[] title)
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param window cast=(GtkWindow *)
+ * @param skips_taskbar cast=(gboolean)
+ */
public static final native void _gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar);
public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, boolean skips_taskbar) {
lock.lock();
@@ -9747,6 +12939,7 @@ public static final void gtk_window_set_skip_taskbar_hint(int /*long*/ window, b
lock.unlock();
}
}
+/** @param window cast=(GtkWindow *) */
public static final native void _gtk_window_set_type_hint(int /*long*/ window, int hint);
public static final void gtk_window_set_type_hint(int /*long*/ window, int hint) {
lock.lock();
@@ -9756,6 +12949,10 @@ public static final void gtk_window_set_type_hint(int /*long*/ window, int hint)
lock.unlock();
}
}
+/**
+ * @param window cast=(GtkWindow *)
+ * @param parent cast=(GtkWindow *)
+ */
public static final native void _gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent);
public static final void gtk_window_set_transient_for(int /*long*/ window, int /*long*/ parent) {
lock.lock();
@@ -9765,6 +12962,7 @@ public static final void gtk_window_set_transient_for(int /*long*/ window, int /
lock.unlock();
}
}
+/** @param handle cast=(GtkWindow *) */
public static final native void _gtk_window_unmaximize(int /*long*/ handle);
public static final void gtk_window_unmaximize(int /*long*/ handle) {
lock.lock();
@@ -9774,52 +12972,258 @@ public static final void gtk_window_unmaximize(int /*long*/ handle) {
lock.unlock();
}
}
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, GInterfaceInfo src, int size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *),flags=no_out
+ */
public static final native void memmove(int /*long*/ dest, GObjectClass src);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, GTypeInfo src, int size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, GtkTargetEntry src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ */
public static final native void memmove(int /*long*/ dest, GtkAdjustment src);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, GdkEventButton src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, GdkEventExpose src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, GdkEventMotion src, int /*long*/ size);
+/** @param src flags=no_out */
public static final native void memmove(int /*long*/ dest, GtkWidgetClass src);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out
+ * @param size cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, PangoAttribute src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GObjectClass dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GTypeQuery dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GtkColorSelectionDialog dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GtkFileSelection dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkDragContext dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GtkSelectionData dest, int /*long*/ src, int /*long*/ size);
+/** @param dest flags=no_in */
public static final native void memmove(GtkWidgetClass dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GtkTargetPair dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GtkCombo dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GtkAdjustment dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GtkBorder dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkColor dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEvent dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventAny dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventButton dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventCrossing dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventExpose dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventFocus dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventKey dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventMotion dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventScroll dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventVisibility dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkEventWindowState dest, int /*long*/ src, int /*long*/ size);
public static final native void memmove(int /*long*/ dest, GtkCellRendererClass src);
public static final native void memmove(GtkCellRendererClass dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GtkFixed dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *),flags=no_out
+ */
public static final native void memmove(int /*long*/ dest, GtkFixed src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GdkVisual dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ */
public static final native void memmove(GdkImage dest, int /*long*/ src);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(GdkRectangle dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoAttribute dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoAttrColor dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoAttrInt dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoItem dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoLayoutLine dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoLayoutRun dest, int /*long*/ src, int /*long*/ size);
+/**
+ * @param dest cast=(void *),flags=no_in
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(PangoLogAttr dest, int /*long*/ src, int /*long*/ size);
public static final native int /*long*/ _pango_attr_background_new (short red, short green, short blue);
public static final int /*long*/ pango_attr_background_new (short red, short green, short blue) {
@@ -9830,6 +13234,7 @@ public static final int /*long*/ pango_attr_background_new (short red, short gre
lock.unlock();
}
}
+/** @param desc cast=(const PangoFontDescription *) */
public static final native int /*long*/ _pango_attr_font_desc_new(int /*long*/ desc);
public static final int /*long*/ pango_attr_font_desc_new(int /*long*/ desc) {
lock.lock();
@@ -9857,6 +13262,10 @@ public static final int /*long*/ pango_attr_rise_new(int rise) {
lock.unlock();
}
}
+/**
+ * @param ink_rect flags=no_out
+ * @param logical_rect flags=no_out
+ */
public static final native int /*long*/ _pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect);
public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, PangoRectangle logical_rect) {
lock.lock();
@@ -9866,6 +13275,10 @@ public static final int /*long*/ pango_attr_shape_new(PangoRectangle ink_rect, P
lock.unlock();
}
}
+/**
+ * @param list cast=(PangoAttrList *)
+ * @param attr cast=(PangoAttribute *)
+ */
public static final native void _pango_attr_list_insert(int /*long*/ list, int /*long*/ attr);
public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/ attr) {
lock.lock();
@@ -9875,6 +13288,10 @@ public static final void pango_attr_list_insert(int /*long*/ list, int /*long*/
lock.unlock();
}
}
+/**
+ * @param list cast=(PangoAttrList *)
+ * @param attr cast=(PangoAttribute *)
+ */
public static final native void _pango_attr_list_change(int /*long*/ list, int /*long*/ attr);
public static final void pango_attr_list_change(int /*long*/ list, int /*long*/ attr) {
lock.lock();
@@ -9884,6 +13301,7 @@ public static final void pango_attr_list_change(int /*long*/ list, int /*long*/
lock.unlock();
}
}
+/** @param list cast=(PangoAttrList *) */
public static final native int /*long*/ _pango_attr_list_get_iterator(int /*long*/ list);
public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list) {
lock.lock();
@@ -9893,6 +13311,7 @@ public static final int /*long*/ pango_attr_list_get_iterator(int /*long*/ list)
lock.unlock();
}
}
+/** @param iterator cast=(PangoAttrIterator *) */
public static final native boolean _pango_attr_iterator_next(int /*long*/ iterator);
public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
lock.lock();
@@ -9902,6 +13321,7 @@ public static final boolean pango_attr_iterator_next(int /*long*/ iterator) {
lock.unlock();
}
}
+/** @param iterator cast=(PangoAttrIterator *) */
public static final native void _pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end);
public static final void pango_attr_iterator_range(int /*long*/ iterator, int[] start, int[] end) {
lock.lock();
@@ -9911,6 +13331,10 @@ public static final void pango_attr_iterator_range(int /*long*/ iterator, int[]
lock.unlock();
}
}
+/**
+ * @param iterator cast=(PangoAttrIterator *)
+ * @param type cast=(PangoAttrType)
+ */
public static final native int /*long*/ _pango_attr_iterator_get(int /*long*/ iterator, int type);
public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator, int type) {
lock.lock();
@@ -9920,6 +13344,7 @@ public static final int /*long*/ pango_attr_iterator_get(int /*long*/ iterator,
lock.unlock();
}
}
+/** @param iterator cast=(PangoAttrIterator *) */
public static final native int /*long*/ _pango_attr_iterator_get_attrs(int /*long*/ iterator);
public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iterator) {
lock.lock();
@@ -9930,6 +13355,7 @@ public static final int /*long*/ pango_attr_iterator_get_attrs(int /*long*/ iter
}
}
+/** @param iterator cast=(PangoAttrIterator *) */
public static final native void _pango_attr_iterator_destroy(int /*long*/ iterator);
public static final void pango_attr_iterator_destroy(int /*long*/ iterator) {
lock.lock();
@@ -9948,6 +13374,7 @@ public static final int /*long*/ pango_attr_list_new() {
lock.unlock();
}
}
+/** @param list cast=(PangoAttrList *) */
public static final native void _pango_attr_list_unref(int /*long*/ list);
public static final void pango_attr_list_unref(int /*long*/ list) {
lock.lock();
@@ -9957,6 +13384,7 @@ public static final void pango_attr_list_unref(int /*long*/ list) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _pango_attr_strikethrough_color_new(short red, short green, short blue);
public static final int /*long*/ pango_attr_strikethrough_color_new(short red, short green, short blue) {
lock.lock();
@@ -9975,6 +13403,7 @@ public static final int /*long*/ pango_attr_strikethrough_new(boolean strikethro
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _pango_attr_underline_color_new(short red, short green, short blue);
public static final int /*long*/ pango_attr_underline_color_new(short red, short green, short blue) {
lock.lock();
@@ -10002,6 +13431,7 @@ public static final int /*long*/ pango_attr_weight_new(int weight) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _pango_cairo_font_map_get_default();
public static final int /*long*/ pango_cairo_font_map_get_default() {
lock.lock();
@@ -10011,6 +13441,7 @@ public static final int /*long*/ pango_cairo_font_map_get_default() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _pango_cairo_font_map_new();
public static final int /*long*/ pango_cairo_font_map_new() {
lock.lock();
@@ -10020,6 +13451,7 @@ public static final int /*long*/ pango_cairo_font_map_new() {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _pango_cairo_font_map_create_context(int /*long*/ fontmap);
public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*/ fontmap) {
lock.lock();
@@ -10029,6 +13461,7 @@ public static final int /*long*/ pango_cairo_font_map_create_context(int /*long*
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int /*long*/ _pango_cairo_create_layout(int /*long*/ cairo);
public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
lock.lock();
@@ -10038,6 +13471,10 @@ public static final int /*long*/ pango_cairo_create_layout(int /*long*/ cairo) {
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param context cast=(PangoContext *)
+ */
public static final native int /*long*/ _pango_cairo_context_get_font_options(int /*long*/ context);
public static final int /*long*/ pango_cairo_context_get_font_options(int /*long*/ context) {
lock.lock();
@@ -10047,6 +13484,10 @@ public static final int /*long*/ pango_cairo_context_get_font_options(int /*long
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param context cast=(PangoContext *)
+ */
public static final native void _pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options);
public static final void pango_cairo_context_set_font_options(int /*long*/ context, int /*long*/ options) {
lock.lock();
@@ -10056,6 +13497,7 @@ public static final void pango_cairo_context_set_font_options(int /*long*/ conte
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi);
public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontmap, double dpi) {
lock.lock();
@@ -10065,6 +13507,7 @@ public static final void pango_cairo_font_map_set_resolution(int /*long*/ fontma
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout);
public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*/ layout) {
lock.lock();
@@ -10074,6 +13517,7 @@ public static final void pango_cairo_layout_path(int /*long*/ cairo, int /*long*
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout);
public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*/ layout) {
lock.lock();
@@ -10083,6 +13527,7 @@ public static final void pango_cairo_show_layout(int /*long*/ cairo, int /*long*
lock.unlock();
}
}
+/** @param context cast=(PangoContext *) */
public static final native int _pango_context_get_base_dir(int /*long*/ context);
public static final int pango_context_get_base_dir(int /*long*/ context) {
lock.lock();
@@ -10092,6 +13537,7 @@ public static final int pango_context_get_base_dir(int /*long*/ context) {
lock.unlock();
}
}
+/** @param context cast=(PangoContext *) */
public static final native int /*long*/ _pango_context_get_language(int /*long*/ context);
public static final int /*long*/ pango_context_get_language(int /*long*/ context) {
lock.lock();
@@ -10101,6 +13547,11 @@ public static final int /*long*/ pango_context_get_language(int /*long*/ context
lock.unlock();
}
}
+/**
+ * @param context cast=(PangoContext *)
+ * @param desc cast=(const PangoFontDescription *)
+ * @param language cast=(PangoLanguage *)
+ */
public static final native int /*long*/ _pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language);
public static final int /*long*/ pango_context_get_metrics(int /*long*/ context, int /*long*/ desc, int /*long*/ language) {
lock.lock();
@@ -10110,6 +13561,11 @@ public static final int /*long*/ pango_context_get_metrics(int /*long*/ context,
lock.unlock();
}
}
+/**
+ * @param context cast=(PangoContext *)
+ * @param families cast=(PangoFontFamily ***)
+ * @param n_families cast=(int *)
+ */
public static final native void _pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families);
public static final void pango_context_list_families(int /*long*/ context, int /*long*/[] families, int[] n_families) {
lock.lock();
@@ -10119,6 +13575,7 @@ public static final void pango_context_list_families(int /*long*/ context, int /
lock.unlock();
}
}
+/** @param context cast=(PangoContext *) */
public static final native void _pango_context_set_base_dir(int /*long*/ context, int direction);
public static final void pango_context_set_base_dir(int /*long*/ context, int direction) {
lock.lock();
@@ -10128,6 +13585,10 @@ public static final void pango_context_set_base_dir(int /*long*/ context, int di
lock.unlock();
}
}
+/**
+ * @param context cast=(PangoContext *)
+ * @param language cast=(PangoLanguage *)
+ */
public static final native void _pango_context_set_language(int /*long*/ context, int /*long*/ language);
public static final void pango_context_set_language(int /*long*/ context, int /*long*/ language) {
lock.lock();
@@ -10137,6 +13598,7 @@ public static final void pango_context_set_language(int /*long*/ context, int /*
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native int /*long*/ _pango_font_description_copy(int /*long*/ desc);
public static final int /*long*/ pango_font_description_copy(int /*long*/ desc) {
lock.lock();
@@ -10146,6 +13608,7 @@ public static final int /*long*/ pango_font_description_copy(int /*long*/ desc)
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native void _pango_font_description_free(int /*long*/ desc);
public static final void pango_font_description_free(int /*long*/ desc) {
lock.lock();
@@ -10155,6 +13618,7 @@ public static final void pango_font_description_free(int /*long*/ desc) {
lock.unlock();
}
}
+/** @param str cast=(const char *),flags=no_out critical */
public static final native int /*long*/ _pango_font_description_from_string(byte[] str);
public static final int /*long*/ pango_font_description_from_string(byte[] str) {
lock.lock();
@@ -10164,6 +13628,7 @@ public static final int /*long*/ pango_font_description_from_string(byte[] str)
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native int /*long*/ _pango_font_description_get_family(int /*long*/ desc);
public static final int /*long*/ pango_font_description_get_family(int /*long*/ desc) {
lock.lock();
@@ -10173,6 +13638,7 @@ public static final int /*long*/ pango_font_description_get_family(int /*long*/
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native int _pango_font_description_get_size(int /*long*/ desc);
public static final int pango_font_description_get_size(int /*long*/ desc) {
lock.lock();
@@ -10182,6 +13648,7 @@ public static final int pango_font_description_get_size(int /*long*/ desc) {
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native int _pango_font_description_get_style(int /*long*/ desc);
public static final int pango_font_description_get_style(int /*long*/ desc) {
lock.lock();
@@ -10191,6 +13658,7 @@ public static final int pango_font_description_get_style(int /*long*/ desc) {
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native int _pango_font_description_get_weight(int /*long*/ desc);
public static final int pango_font_description_get_weight(int /*long*/ desc) {
lock.lock();
@@ -10209,6 +13677,10 @@ public static final int /*long*/ pango_font_description_new() {
lock.unlock();
}
}
+/**
+ * @param desc cast=(PangoFontDescription *)
+ * @param family cast=(const char *),flags=no_out critical
+ */
public static final native void _pango_font_description_set_family(int /*long*/ desc, byte[] family);
public static final void pango_font_description_set_family(int /*long*/ desc, byte[] family) {
lock.lock();
@@ -10218,6 +13690,10 @@ public static final void pango_font_description_set_family(int /*long*/ desc, by
lock.unlock();
}
}
+/**
+ * @param desc cast=(PangoFontDescription *)
+ * @param size cast=(gint)
+ */
public static final native void _pango_font_description_set_size(int /*long*/ desc, int size);
public static final void pango_font_description_set_size(int /*long*/ desc, int size) {
lock.lock();
@@ -10227,6 +13703,10 @@ public static final void pango_font_description_set_size(int /*long*/ desc, int
lock.unlock();
}
}
+/**
+ * @param desc cast=(PangoFontDescription *)
+ * @param stretch cast=(PangoStretch)
+ */
public static final native void _pango_font_description_set_stretch(int /*long*/ desc, int stretch);
public static final void pango_font_description_set_stretch(int /*long*/ desc, int stretch) {
lock.lock();
@@ -10236,6 +13716,10 @@ public static final void pango_font_description_set_stretch(int /*long*/ desc, i
lock.unlock();
}
}
+/**
+ * @param desc cast=(PangoFontDescription *)
+ * @param weight cast=(PangoStyle)
+ */
public static final native void _pango_font_description_set_style(int /*long*/ desc, int weight);
public static final void pango_font_description_set_style(int /*long*/ desc, int weight) {
lock.lock();
@@ -10245,6 +13729,10 @@ public static final void pango_font_description_set_style(int /*long*/ desc, int
lock.unlock();
}
}
+/**
+ * @param desc cast=(PangoFontDescription *)
+ * @param weight cast=(PangoWeight)
+ */
public static final native void _pango_font_description_set_weight(int /*long*/ desc, int weight);
public static final void pango_font_description_set_weight(int /*long*/ desc, int weight) {
lock.lock();
@@ -10254,6 +13742,7 @@ public static final void pango_font_description_set_weight(int /*long*/ desc, in
lock.unlock();
}
}
+/** @param desc cast=(PangoFontDescription *) */
public static final native int /*long*/ _pango_font_description_to_string(int /*long*/ desc);
public static final int /*long*/ pango_font_description_to_string(int /*long*/ desc) {
lock.lock();
@@ -10263,6 +13752,7 @@ public static final int /*long*/ pango_font_description_to_string(int /*long*/ d
lock.unlock();
}
}
+/** @param face cast=(PangoFontFace *) */
public static final native int /*long*/ _pango_font_face_describe(int /*long*/ face);
public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
lock.lock();
@@ -10272,6 +13762,7 @@ public static final int /*long*/ pango_font_face_describe(int /*long*/ face) {
lock.unlock();
}
}
+/** @param family cast=(PangoFontFamily *) */
public static final native int /*long*/ _pango_font_family_get_name(int /*long*/ family);
public static final int /*long*/ pango_font_family_get_name(int /*long*/ family) {
lock.lock();
@@ -10281,6 +13772,11 @@ public static final int /*long*/ pango_font_family_get_name(int /*long*/ family)
lock.unlock();
}
}
+/**
+ * @param family cast=(PangoFontFamily *)
+ * @param faces cast=(PangoFontFace ***)
+ * @param n_faces cast=(int *)
+ */
public static final native void _pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces);
public static final void pango_font_family_list_faces(int /*long*/ family, int /*long*/[] faces, int[] n_faces) {
lock.lock();
@@ -10290,6 +13786,10 @@ public static final void pango_font_family_list_faces(int /*long*/ family, int /
lock.unlock();
}
}
+/**
+ * @param font cast=(PangoFont *)
+ * @param language cast=(PangoLanguage *)
+ */
public static final native int /*long*/ _pango_font_get_metrics(int /*long*/ font, int /*long*/ language);
public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /*long*/ language) {
lock.lock();
@@ -10299,6 +13799,7 @@ public static final int /*long*/ pango_font_get_metrics(int /*long*/ font, int /
lock.unlock();
}
}
+/** @param metrics cast=(PangoFontMetrics *) */
public static final native int _pango_font_metrics_get_approximate_char_width(int /*long*/ metrics);
public static final int pango_font_metrics_get_approximate_char_width(int /*long*/ metrics) {
lock.lock();
@@ -10308,6 +13809,7 @@ public static final int pango_font_metrics_get_approximate_char_width(int /*long
lock.unlock();
}
}
+/** @param metrics cast=(PangoFontMetrics *) */
public static final native int _pango_font_metrics_get_ascent(int /*long*/ metrics);
public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
lock.lock();
@@ -10317,6 +13819,7 @@ public static final int pango_font_metrics_get_ascent(int /*long*/ metrics) {
lock.unlock();
}
}
+/** @param metrics cast=(PangoFontMetrics *) */
public static final native int _pango_font_metrics_get_descent(int /*long*/ metrics);
public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
lock.lock();
@@ -10326,6 +13829,7 @@ public static final int pango_font_metrics_get_descent(int /*long*/ metrics) {
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _pango_font_metrics_get_underline_thickness(int /*long*/ metrics);
public static final int pango_font_metrics_get_underline_thickness(int /*long*/ metrics) {
lock.lock();
@@ -10335,6 +13839,7 @@ public static final int pango_font_metrics_get_underline_thickness(int /*long*/
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _pango_font_metrics_get_underline_position(int /*long*/ metrics);
public static final int pango_font_metrics_get_underline_position(int /*long*/ metrics) {
lock.lock();
@@ -10344,6 +13849,7 @@ public static final int pango_font_metrics_get_underline_position(int /*long*/ m
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics);
public static final int pango_font_metrics_get_strikethrough_thickness(int /*long*/ metrics) {
lock.lock();
@@ -10353,6 +13859,7 @@ public static final int pango_font_metrics_get_strikethrough_thickness(int /*lon
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native int _pango_font_metrics_get_strikethrough_position(int /*long*/ metrics);
public static final int pango_font_metrics_get_strikethrough_position(int /*long*/ metrics) {
lock.lock();
@@ -10362,6 +13869,7 @@ public static final int pango_font_metrics_get_strikethrough_position(int /*long
lock.unlock();
}
}
+/** @param metrics cast=(PangoFontMetrics *) */
public static final native void _pango_font_metrics_unref(int /*long*/ metrics);
public static final void pango_font_metrics_unref(int /*long*/ metrics) {
lock.lock();
@@ -10371,6 +13879,7 @@ public static final void pango_font_metrics_unref(int /*long*/ metrics) {
lock.unlock();
}
}
+/** @param language cast=(const char *),flags=no_out */
public static final native int /*long*/ _pango_language_from_string(byte[] language);
public static final int /*long*/ pango_language_from_string(byte[] language) {
lock.lock();
@@ -10380,6 +13889,7 @@ public static final int /*long*/ pango_language_from_string(byte[] language) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native void _pango_layout_context_changed(int /*long*/ layout);
public static final void pango_layout_context_changed(int /*long*/ layout) {
lock.lock();
@@ -10389,6 +13899,7 @@ public static final void pango_layout_context_changed(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native int _pango_layout_get_alignment(int /*long*/ layout);
public static final int pango_layout_get_alignment(int /*long*/ layout) {
lock.lock();
@@ -10398,6 +13909,7 @@ public static final int pango_layout_get_alignment(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native int /*long*/ _pango_layout_get_context(int /*long*/ layout);
public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
lock.lock();
@@ -10407,6 +13919,7 @@ public static final int /*long*/ pango_layout_get_context(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native int /*long*/ _pango_layout_get_attributes(int /*long*/ layout);
public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout) {
lock.lock();
@@ -10416,6 +13929,7 @@ public static final int /*long*/ pango_layout_get_attributes(int /*long*/ layout
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native int _pango_layout_get_indent(int /*long*/ layout);
public static final int pango_layout_get_indent(int /*long*/ layout) {
lock.lock();
@@ -10425,6 +13939,7 @@ public static final int pango_layout_get_indent(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native int /*long*/ _pango_layout_get_iter(int /*long*/ layout);
public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
lock.lock();
@@ -10434,6 +13949,7 @@ public static final int /*long*/ pango_layout_get_iter(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native boolean _pango_layout_get_justify(int /*long*/ layout);
public static final boolean pango_layout_get_justify(int /*long*/ layout) {
lock.lock();
@@ -10443,6 +13959,7 @@ public static final boolean pango_layout_get_justify(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native int /*long*/ _pango_layout_get_line(int /*long*/ layout, int line);
public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int line) {
lock.lock();
@@ -10452,6 +13969,7 @@ public static final int /*long*/ pango_layout_get_line(int /*long*/ layout, int
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native int _pango_layout_get_line_count(int /*long*/ layout);
public static final int pango_layout_get_line_count(int /*long*/ layout) {
lock.lock();
@@ -10461,6 +13979,11 @@ public static final int pango_layout_get_line_count(int /*long*/ layout) {
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout*)
+ * @param attrs cast=(PangoLogAttr **)
+ * @param n_attrs cast=(int *)
+ */
public static final native void _pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs);
public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*long*/[] attrs, int[] n_attrs) {
lock.lock();
@@ -10470,6 +13993,11 @@ public static final void pango_layout_get_log_attrs(int /*long*/ layout, int /*l
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout *)
+ * @param width cast=(int *)
+ * @param height cast=(int *)
+ */
public static final native void _pango_layout_get_size(int /*long*/ layout, int[] width, int[] height);
public static final void pango_layout_get_size(int /*long*/ layout, int[] width, int[] height) {
lock.lock();
@@ -10479,6 +14007,7 @@ public static final void pango_layout_get_size(int /*long*/ layout, int[] width,
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native int _pango_layout_get_spacing(int /*long*/ layout);
public static final int pango_layout_get_spacing(int /*long*/ layout) {
lock.lock();
@@ -10488,6 +14017,7 @@ public static final int pango_layout_get_spacing(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native int /*long*/ _pango_layout_get_tabs(int /*long*/ layout);
public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
lock.lock();
@@ -10497,6 +14027,7 @@ public static final int /*long*/ pango_layout_get_tabs(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native int /*long*/ _pango_layout_get_text(int /*long*/ layout);
public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
lock.lock();
@@ -10506,6 +14037,7 @@ public static final int /*long*/ pango_layout_get_text(int /*long*/ layout) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native int _pango_layout_get_width(int /*long*/ layout);
public static final int pango_layout_get_width(int /*long*/ layout) {
lock.lock();
@@ -10515,6 +14047,10 @@ public static final int pango_layout_get_width(int /*long*/ layout) {
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout*)
+ * @param pos flags=no_in
+ */
public static final native void _pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos);
public static final void pango_layout_index_to_pos(int /*long*/ layout, int index, PangoRectangle pos) {
lock.lock();
@@ -10524,6 +14060,7 @@ public static final void pango_layout_index_to_pos(int /*long*/ layout, int inde
lock.unlock();
}
}
+/** @param iter cast=(PangoLayoutIter*) */
public static final native void _pango_layout_iter_free(int /*long*/ iter);
public static final void pango_layout_iter_free(int /*long*/ iter) {
lock.lock();
@@ -10533,6 +14070,11 @@ public static final void pango_layout_iter_free(int /*long*/ iter) {
lock.unlock();
}
}
+/**
+ * @param iter cast=(PangoLayoutIter*)
+ * @param ink_rect flags=no_in
+ * @param logical_rect flags=no_in
+ */
public static final native void _pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect);
public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, PangoRectangle ink_rect, PangoRectangle logical_rect) {
lock.lock();
@@ -10542,6 +14084,7 @@ public static final void pango_layout_iter_get_line_extents(int /*long*/ iter, P
lock.unlock();
}
}
+/** @param iter cast=(PangoLayoutIter*) */
public static final native int _pango_layout_iter_get_index(int /*long*/ iter);
public static final int pango_layout_iter_get_index(int /*long*/ iter) {
lock.lock();
@@ -10551,6 +14094,7 @@ public static final int pango_layout_iter_get_index(int /*long*/ iter) {
lock.unlock();
}
}
+/** @param iter cast=(PangoLayoutIter*) */
public static final native int /*long*/ _pango_layout_iter_get_run(int /*long*/ iter);
public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
lock.lock();
@@ -10560,6 +14104,7 @@ public static final int /*long*/ pango_layout_iter_get_run(int /*long*/ iter) {
lock.unlock();
}
}
+/** @param iter cast=(PangoLayoutIter*) */
public static final native boolean _pango_layout_iter_next_line(int /*long*/ iter);
public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
lock.lock();
@@ -10569,6 +14114,7 @@ public static final boolean pango_layout_iter_next_line(int /*long*/ iter) {
lock.unlock();
}
}
+/** @param iter cast=(PangoLayoutIter*) */
public static final native boolean _pango_layout_iter_next_run(int /*long*/ iter);
public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
lock.lock();
@@ -10578,6 +14124,11 @@ public static final boolean pango_layout_iter_next_run(int /*long*/ iter) {
lock.unlock();
}
}
+/**
+ * @param line cast=(PangoLayoutLine*)
+ * @param ink_rect cast=(PangoRectangle *),flags=no_in
+ * @param logical_rect cast=(PangoRectangle *),flags=no_in
+ */
public static final native void _pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect);
public static final void pango_layout_line_get_extents(int /*long*/ line, PangoRectangle ink_rect, PangoRectangle logical_rect) {
lock.lock();
@@ -10587,6 +14138,11 @@ public static final void pango_layout_line_get_extents(int /*long*/ line, PangoR
lock.unlock();
}
}
+/**
+ * @param line cast=(PangoLayoutLine*)
+ * @param index_ cast=(int *)
+ * @param trailing cast=(int *)
+ */
public static final native boolean _pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing);
public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int x_pos, int[] index_, int[] trailing) {
lock.lock();
@@ -10596,16 +14152,7 @@ public static final boolean pango_layout_line_x_to_index(int /*long*/ line, int
lock.unlock();
}
}
-public static final native int _pango_layout_line_get_resolved_dir(int /*long*/ line);
-public static final int pango_layout_line_get_resolved_dir(int /*long*/ line) {
- lock.lock();
- try {
- return _pango_layout_line_get_resolved_dir(line);
- } finally {
- lock.unlock();
- }
-}
-
+/** @param context cast=(PangoContext *) */
public static final native int /*long*/ _pango_layout_new(int /*long*/ context);
public static final int /*long*/ pango_layout_new(int /*long*/ context) {
lock.lock();
@@ -10615,6 +14162,7 @@ public static final int /*long*/ pango_layout_new(int /*long*/ context) {
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native void _pango_layout_set_alignment (int /*long*/ layout, int alignment);
public static final void pango_layout_set_alignment (int /*long*/ layout, int alignment) {
lock.lock();
@@ -10624,6 +14172,10 @@ public static final void pango_layout_set_alignment (int /*long*/ layout, int al
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout *)
+ * @param attrs cast=(PangoAttrList *)
+ */
public static final native void _pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs);
public static final void pango_layout_set_attributes(int /*long*/ layout, int /*long*/ attrs) {
lock.lock();
@@ -10633,6 +14185,7 @@ public static final void pango_layout_set_attributes(int /*long*/ layout, int /*
lock.unlock();
}
}
+/** @method flags=dynamic */
public static final native void _pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir);
public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean auto_dir) {
lock.lock();
@@ -10642,6 +14195,10 @@ public static final void pango_layout_set_auto_dir(int /*long*/ layout, boolean
lock.unlock();
}
}
+/**
+ * @param context cast=(PangoLayout *)
+ * @param descr cast=(PangoFontDescription *)
+ */
public static final native void _pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr);
public static final void pango_layout_set_font_description(int /*long*/ context, int /*long*/ descr) {
lock.lock();
@@ -10651,6 +14208,7 @@ public static final void pango_layout_set_font_description(int /*long*/ context,
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native void _pango_layout_set_indent(int /*long*/ layout, int indent);
public static final void pango_layout_set_indent(int /*long*/ layout, int indent) {
lock.lock();
@@ -10660,6 +14218,7 @@ public static final void pango_layout_set_indent(int /*long*/ layout, int indent
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout*) */
public static final native void _pango_layout_set_justify(int /*long*/ layout, boolean justify);
public static final void pango_layout_set_justify(int /*long*/ layout, boolean justify) {
lock.lock();
@@ -10669,6 +14228,10 @@ public static final void pango_layout_set_justify(int /*long*/ layout, boolean j
lock.unlock();
}
}
+/**
+ * @param context cast=(PangoLayout *)
+ * @param setting cast=(gboolean)
+ */
public static final native void _pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting);
public static final void pango_layout_set_single_paragraph_mode(int /*long*/ context, boolean setting) {
lock.lock();
@@ -10678,6 +14241,7 @@ public static final void pango_layout_set_single_paragraph_mode(int /*long*/ con
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native void _pango_layout_set_spacing(int /*long*/ layout, int spacing);
public static final void pango_layout_set_spacing(int /*long*/ layout, int spacing) {
lock.lock();
@@ -10687,6 +14251,10 @@ public static final void pango_layout_set_spacing(int /*long*/ layout, int spaci
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout *)
+ * @param tabs cast=(PangoTabArray *)
+ */
public static final native void _pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs);
public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/ tabs) {
lock.lock();
@@ -10696,6 +14264,11 @@ public static final void pango_layout_set_tabs(int /*long*/ layout, int /*long*/
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout *)
+ * @param text cast=(const char *),flags=no_out critical
+ * @param length cast=(int)
+ */
public static final native void _pango_layout_set_text(int /*long*/ layout, byte[] text, int length);
public static final void pango_layout_set_text(int /*long*/ layout, byte[] text, int length) {
lock.lock();
@@ -10705,6 +14278,7 @@ public static final void pango_layout_set_text(int /*long*/ layout, byte[] text,
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native void _pango_layout_set_width(int /*long*/ layout, int width);
public static final void pango_layout_set_width(int /*long*/ layout, int width) {
lock.lock();
@@ -10714,6 +14288,7 @@ public static final void pango_layout_set_width(int /*long*/ layout, int width)
lock.unlock();
}
}
+/** @param layout cast=(PangoLayout *) */
public static final native void _pango_layout_set_wrap (int /*long*/ layout, int wrap);
public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
lock.lock();
@@ -10723,6 +14298,11 @@ public static final void pango_layout_set_wrap (int /*long*/ layout, int wrap) {
lock.unlock();
}
}
+/**
+ * @param layout cast=(PangoLayout *)
+ * @param index cast=(int *)
+ * @param trailing cast=(int *)
+ */
public static final native boolean _pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing);
public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x, int y, int[] index, int[] trailing) {
lock.lock();
@@ -10732,6 +14312,7 @@ public static final boolean pango_layout_xy_to_index(int /*long*/ layout, int x,
lock.unlock();
}
}
+/** @param tab_array cast=(PangoTabArray *) */
public static final native int _pango_tab_array_get_size(int /*long*/ tab_array);
public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
lock.lock();
@@ -10741,6 +14322,11 @@ public static final int pango_tab_array_get_size(int /*long*/ tab_array) {
lock.unlock();
}
}
+/**
+ * @param tab_array cast=(PangoTabArray *)
+ * @param alignments cast=(PangoTabAlign **)
+ * @param locations cast=(int **)
+ */
public static final native void _pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations);
public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*long*/[] alignments, int /*long*/[] locations) {
lock.lock();
@@ -10750,6 +14336,7 @@ public static final void pango_tab_array_get_tabs(int /*long*/ tab_array, int /*
lock.unlock();
}
}
+/** @param tab_array cast=(PangoTabArray *) */
public static final native void _pango_tab_array_free(int /*long*/ tab_array);
public static final void pango_tab_array_free(int /*long*/ tab_array) {
lock.lock();
@@ -10759,6 +14346,10 @@ public static final void pango_tab_array_free(int /*long*/ tab_array) {
lock.unlock();
}
}
+/**
+ * @param initial_size cast=(gint)
+ * @param positions_in_pixels cast=(gboolean)
+ */
public static final native int /*long*/ _pango_tab_array_new(int initial_size, boolean positions_in_pixels);
public static final int /*long*/ pango_tab_array_new(int initial_size, boolean positions_in_pixels) {
lock.lock();
@@ -10768,6 +14359,12 @@ public static final int /*long*/ pango_tab_array_new(int initial_size, boolean p
lock.unlock();
}
}
+/**
+ * @param tab_array cast=(PangoTabArray *)
+ * @param tab_index cast=(gint)
+ * @param alignment cast=(PangoTabAlign)
+ * @param location cast=(gint)
+ */
public static final native void _pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location);
public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab_index, int /*long*/ alignment, int location) {
lock.lock();
@@ -10777,6 +14374,12 @@ public static final void pango_tab_array_set_tab(int /*long*/ tab_array, int tab
lock.unlock();
}
}
+/**
+ * @method flags=dynamic
+ * @param object cast=(AtkObject *)
+ * @param relationship cast=(AtkRelationType)
+ * @param target cast=(AtkObject *)
+ */
public static final native boolean _atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target);
public static final boolean atk_object_add_relationship (int /*long*/ object, int relationship, int /*long*/ target) {
lock.lock();
diff --git a/org/eclipse/swt/internal/gtk/PangoAttrColor.java b/org/eclipse/swt/internal/gtk/PangoAttrColor.java
old mode 100755
new mode 100644
index 43783c2..8b96802
--- a/org/eclipse/swt/internal/gtk/PangoAttrColor.java
+++ b/org/eclipse/swt/internal/gtk/PangoAttrColor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,8 +16,11 @@ package org.eclipse.swt.internal.gtk;
public class PangoAttrColor extends PangoAttribute {
+ /** @field accessor=color.red */
public short color_red;
+ /** @field accessor=color.green */
public short color_green;
+ /** @field accessor=color.blue */
public short color_blue;
public static final int sizeof = OS.PangoAttrColor_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/PangoAttrInt.java b/org/eclipse/swt/internal/gtk/PangoAttrInt.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/PangoAttribute.java b/org/eclipse/swt/internal/gtk/PangoAttribute.java
old mode 100755
new mode 100644
index 81c49c3..f218643
--- a/org/eclipse/swt/internal/gtk/PangoAttribute.java
+++ b/org/eclipse/swt/internal/gtk/PangoAttribute.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -16,6 +16,7 @@ package org.eclipse.swt.internal.gtk;
public class PangoAttribute {
+ /** @field cast=(const PangoAttrClass *) */
public int /*long*/ klass;
public int start_index;
public int end_index;
diff --git a/org/eclipse/swt/internal/gtk/PangoItem.java b/org/eclipse/swt/internal/gtk/PangoItem.java
old mode 100755
new mode 100644
index c7c039f..c0f5b01
--- a/org/eclipse/swt/internal/gtk/PangoItem.java
+++ b/org/eclipse/swt/internal/gtk/PangoItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -18,11 +18,17 @@ public class PangoItem {
public int offset;
public int length;
public int num_chars;
+ /** @field accessor=analysis.shape_engine,cast=(PangoEngineShape *) */
public int /*long*/ analysis_shape_engine;
+ /** @field accessor=analysis.lang_engine,cast=(PangoEngineLang *) */
public int /*long*/ analysis_lang_engine;
+ /** @field accessor=analysis.font,cast=(PangoFont *) */
public int /*long*/ analysis_font;
+ /** @field accessor=analysis.level */
public byte analysis_level;
+ /** @field accessor=analysis.language,cast=(PangoLanguage *) */
public int /*long*/ analysis_language;
+ /** @field accessor=analysis.extra_attrs,cast=(GSList *) */
public int /*long*/ analysis_extra_attrs;
public static final int sizeof = OS.PangoItem_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/PangoLayoutLine.java b/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
old mode 100755
new mode 100644
index 0859002..d1517c6
--- a/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+++ b/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
@@ -15,9 +15,11 @@
package org.eclipse.swt.internal.gtk;
public class PangoLayoutLine {
+ /** @field cast=(PangoLayout *) */
public int /*long*/ layout;
public int start_index;
public int length;
+ /** @field cast=(GSList *) */
public int /*long*/ runs;
// public boolean is_paragraph_start;
// public byte resolved_dir;
diff --git a/org/eclipse/swt/internal/gtk/PangoLayoutRun.java b/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
old mode 100755
new mode 100644
index 9d9f9d6..b032b6a
--- a/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+++ b/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2008 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
@@ -15,7 +15,9 @@
package org.eclipse.swt.internal.gtk;
public class PangoLayoutRun {
+ /** @field cast=(PangoItem *) */
public int /*long*/ item;
+ /** @field cast=(PangoGlyphString *) */
public int /*long*/ glyphs;
public static final int sizeof = OS.PangoLayoutRun_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/PangoLogAttr.java b/org/eclipse/swt/internal/gtk/PangoLogAttr.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/PangoRectangle.java b/org/eclipse/swt/internal/gtk/PangoRectangle.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/XAnyEvent.java b/org/eclipse/swt/internal/gtk/XAnyEvent.java
old mode 100755
new mode 100644
index af533a5..9fc6482
--- a/org/eclipse/swt/internal/gtk/XAnyEvent.java
+++ b/org/eclipse/swt/internal/gtk/XAnyEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,7 +14,9 @@ package org.eclipse.swt.internal.gtk;
public abstract class XAnyEvent extends XEvent {
public int /*long*/ serial;
public int send_event;
+ /** @field cast=(Display *) */
public int /*long*/ display;
+ /** @field cast=(Window) */
public int /*long*/ window;
public static final int sizeof = OS.XAnyEvent_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/XButtonEvent.java b/org/eclipse/swt/internal/gtk/XButtonEvent.java
old mode 100755
new mode 100644
index cb3148f..97edb2d
--- a/org/eclipse/swt/internal/gtk/XButtonEvent.java
+++ b/org/eclipse/swt/internal/gtk/XButtonEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/gtk/XClientMessageEvent.java b/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
old mode 100755
new mode 100644
index e4047db..b1428fd
--- a/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
+++ b/org/eclipse/swt/internal/gtk/XClientMessageEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,10 +15,14 @@ public class XClientMessageEvent {
public int type;
public int /*long*/ serial;
public boolean send_event;
+ /** @field cast=(Display *) */
public int /*long*/ display;
+ /** @field cast=(Window) */
public int /*long*/ window;
+ /** @field cast=(Atom) */
public int /*long*/ message_type;
public int format;
+ /** @field accessor=data.l,cast=(long *) */
public int /*long*/[] data = new int /*long*/[5];
public static final int sizeof = OS.XClientMessageEvent_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/XCrossingEvent.java b/org/eclipse/swt/internal/gtk/XCrossingEvent.java
old mode 100755
new mode 100644
index 4ed4b8c..b8631b9
--- a/org/eclipse/swt/internal/gtk/XCrossingEvent.java
+++ b/org/eclipse/swt/internal/gtk/XCrossingEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,8 +12,11 @@ package org.eclipse.swt.internal.gtk;
public class XCrossingEvent extends XAnyEvent {
+ /** @field cast=(Window) */
public int /*long*/ root;
+ /** @field cast=(Window) */
public int /*long*/ subwindow;
+ /** @field cast=(Time) */
public int time;
public int x;
public int y;
@@ -21,8 +24,11 @@ public class XCrossingEvent extends XAnyEvent {
public int y_root;
public int mode;
public int detail;
+ /** @field cast=(Bool) */
public boolean same_screen;
+ /** @field cast=(Bool) */
public boolean focus;
+ /** @field cast=(unsigned int) */
public int state;
public static final int sizeof = OS.XCrossingEvent_sizeof();
}
diff --git a/org/eclipse/swt/internal/gtk/XEvent.java b/org/eclipse/swt/internal/gtk/XEvent.java
old mode 100755
new mode 100644
index 83c43ba..28f12f7
--- a/org/eclipse/swt/internal/gtk/XEvent.java
+++ b/org/eclipse/swt/internal/gtk/XEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/gtk/XExposeEvent.java b/org/eclipse/swt/internal/gtk/XExposeEvent.java
old mode 100755
new mode 100644
index 62b1bf8..5d9af2d
--- a/org/eclipse/swt/internal/gtk/XExposeEvent.java
+++ b/org/eclipse/swt/internal/gtk/XExposeEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/gtk/XFocusChangeEvent.java b/org/eclipse/swt/internal/gtk/XFocusChangeEvent.java
old mode 100755
new mode 100644
index 60be0c7..9e27fa0
--- a/org/eclipse/swt/internal/gtk/XFocusChangeEvent.java
+++ b/org/eclipse/swt/internal/gtk/XFocusChangeEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java b/org/eclipse/swt/internal/gtk/XRenderPictureAttributes.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/gtk/XVisibilityEvent.java b/org/eclipse/swt/internal/gtk/XVisibilityEvent.java
old mode 100755
new mode 100644
index 6a06492..ba2d80b
--- a/org/eclipse/swt/internal/gtk/XVisibilityEvent.java
+++ b/org/eclipse/swt/internal/gtk/XVisibilityEvent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/gtk/XWindowChanges.java b/org/eclipse/swt/internal/gtk/XWindowChanges.java
old mode 100755
new mode 100644
index 0862c60..b748c34
--- a/org/eclipse/swt/internal/gtk/XWindowChanges.java
+++ b/org/eclipse/swt/internal/gtk/XWindowChanges.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/FileFormat.java b/org/eclipse/swt/internal/image/FileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/GIFFileFormat.java b/org/eclipse/swt/internal/image/GIFFileFormat.java
old mode 100755
new mode 100644
index df9608e..583e7c0
--- a/org/eclipse/swt/internal/image/GIFFileFormat.java
+++ b/org/eclipse/swt/internal/image/GIFFileFormat.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -292,14 +292,10 @@ public final class GIFFileFormat extends FileFormat {
*/
byte[] readApplicationExtension() {
try {
- // Read size of block = 0x0B.
- inputStream.read();
- // Read application identifier.
- byte[] application = new byte[8];
- inputStream.read(application);
- // Read authentication code.
- byte[] authentication = new byte[3];
- inputStream.read(authentication);
+ // Read block data.
+ int blockSize = inputStream.read();
+ byte[] blockData = new byte[blockSize];
+ inputStream.read(blockData);
// Read application data.
byte[] data = new byte[0];
byte[] block = new byte[255];
@@ -313,18 +309,20 @@ public final class GIFFileFormat extends FileFormat {
}
// Look for the NETSCAPE 'repeat count' field for an animated GIF.
boolean netscape =
- application[0] == 'N' &&
- application[1] == 'E' &&
- application[2] == 'T' &&
- application[3] == 'S' &&
- application[4] == 'C' &&
- application[5] == 'A' &&
- application[6] == 'P' &&
- application[7] == 'E';
+ blockSize > 7 &&
+ blockData[0] == 'N' &&
+ blockData[1] == 'E' &&
+ blockData[2] == 'T' &&
+ blockData[3] == 'S' &&
+ blockData[4] == 'C' &&
+ blockData[5] == 'A' &&
+ blockData[6] == 'P' &&
+ blockData[7] == 'E';
boolean authentic =
- authentication[0] == '2' &&
- authentication[1] == '.' &&
- authentication[2] == '0';
+ blockSize > 10 &&
+ blockData[8] == '2' &&
+ blockData[9] == '.' &&
+ blockData[10] == '0';
if (netscape && authentic && data[0] == 01) { //$NON-NLS-1$ //$NON-NLS-2$
repeatCount = (data[1] & 0xFF) | ((data[2] & 0xFF) << 8);
loader.repeatCount = repeatCount;
diff --git a/org/eclipse/swt/internal/image/JPEGAppn.java b/org/eclipse/swt/internal/image/JPEGAppn.java
old mode 100755
new mode 100644
index 5c54492..37160a2
--- a/org/eclipse/swt/internal/image/JPEGAppn.java
+++ b/org/eclipse/swt/internal/image/JPEGAppn.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java b/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java
old mode 100755
new mode 100644
index fb4b9a3..b8c8392
--- a/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java
+++ b/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGComment.java b/org/eclipse/swt/internal/image/JPEGComment.java
old mode 100755
new mode 100644
index dfb5c0f..21070f1
--- a/org/eclipse/swt/internal/image/JPEGComment.java
+++ b/org/eclipse/swt/internal/image/JPEGComment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGDecoder.java b/org/eclipse/swt/internal/image/JPEGDecoder.java
old mode 100755
new mode 100644
index b7c10c7..54d6daa
--- a/org/eclipse/swt/internal/image/JPEGDecoder.java
+++ b/org/eclipse/swt/internal/image/JPEGDecoder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -2456,11 +2456,6 @@ static void jpeg_calc_output_dimensions (jpeg_decompress_struct cinfo)
cinfo.out_color_components = 1;
break;
case JCS_RGB:
- if (RGB_PIXELSIZE != 3) {
- cinfo.out_color_components = RGB_PIXELSIZE;
- break;
- }
- //FALLTHROUGH
case JCS_YCbCr:
cinfo.out_color_components = 3;
break;
@@ -2618,7 +2613,7 @@ static void jinit_color_deconverter (jpeg_decompress_struct cinfo) {
build_ycc_rgb_table(cinfo);
} else if (cinfo.jpeg_color_space == JCS_GRAYSCALE) {
cconvert.color_convert = GRAY_RGB_CONVERT;
- } else if (cinfo.jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
+ } else if (cinfo.jpeg_color_space == JCS_RGB) {
cconvert.color_convert = NULL_CONVERT;
} else
error();
diff --git a/org/eclipse/swt/internal/image/JPEGEndOfImage.java b/org/eclipse/swt/internal/image/JPEGEndOfImage.java
old mode 100755
new mode 100644
index df40f1f..faa369c
--- a/org/eclipse/swt/internal/image/JPEGEndOfImage.java
+++ b/org/eclipse/swt/internal/image/JPEGEndOfImage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGFileFormat.java b/org/eclipse/swt/internal/image/JPEGFileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java b/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java
old mode 100755
new mode 100644
index 9fea253..28da869
--- a/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java
+++ b/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGFrameHeader.java b/org/eclipse/swt/internal/image/JPEGFrameHeader.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/JPEGHuffmanTable.java b/org/eclipse/swt/internal/image/JPEGHuffmanTable.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/JPEGQuantizationTable.java b/org/eclipse/swt/internal/image/JPEGQuantizationTable.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/JPEGRestartInterval.java b/org/eclipse/swt/internal/image/JPEGRestartInterval.java
old mode 100755
new mode 100644
index bd722fe..fd6fc48
--- a/org/eclipse/swt/internal/image/JPEGRestartInterval.java
+++ b/org/eclipse/swt/internal/image/JPEGRestartInterval.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGScanHeader.java b/org/eclipse/swt/internal/image/JPEGScanHeader.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/JPEGSegment.java b/org/eclipse/swt/internal/image/JPEGSegment.java
old mode 100755
new mode 100644
index 3d1b733..0dbf42a
--- a/org/eclipse/swt/internal/image/JPEGSegment.java
+++ b/org/eclipse/swt/internal/image/JPEGSegment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGStartOfImage.java b/org/eclipse/swt/internal/image/JPEGStartOfImage.java
old mode 100755
new mode 100644
index fde151a..5b80999
--- a/org/eclipse/swt/internal/image/JPEGStartOfImage.java
+++ b/org/eclipse/swt/internal/image/JPEGStartOfImage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java b/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java
old mode 100755
new mode 100644
index a8052f3..a3896e6
--- a/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java
+++ b/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/LEDataInputStream.java b/org/eclipse/swt/internal/image/LEDataInputStream.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/LEDataOutputStream.java b/org/eclipse/swt/internal/image/LEDataOutputStream.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/LZWCodec.java b/org/eclipse/swt/internal/image/LZWCodec.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/LZWNode.java b/org/eclipse/swt/internal/image/LZWNode.java
old mode 100755
new mode 100644
index e24bff1..869e532
--- a/org/eclipse/swt/internal/image/LZWNode.java
+++ b/org/eclipse/swt/internal/image/LZWNode.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/OS2BMPFileFormat.java b/org/eclipse/swt/internal/image/OS2BMPFileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PNGFileFormat.java b/org/eclipse/swt/internal/image/PNGFileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngChunk.java b/org/eclipse/swt/internal/image/PngChunk.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngChunkReader.java b/org/eclipse/swt/internal/image/PngChunkReader.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngDecodingDataStream.java b/org/eclipse/swt/internal/image/PngDecodingDataStream.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngDeflater.java b/org/eclipse/swt/internal/image/PngDeflater.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngEncoder.java b/org/eclipse/swt/internal/image/PngEncoder.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngFileReadState.java b/org/eclipse/swt/internal/image/PngFileReadState.java
old mode 100755
new mode 100644
index 3ad40e0..f8f0064
--- a/org/eclipse/swt/internal/image/PngFileReadState.java
+++ b/org/eclipse/swt/internal/image/PngFileReadState.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/PngHuffmanTable.java b/org/eclipse/swt/internal/image/PngHuffmanTable.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngHuffmanTables.java b/org/eclipse/swt/internal/image/PngHuffmanTables.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngIdatChunk.java b/org/eclipse/swt/internal/image/PngIdatChunk.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngIendChunk.java b/org/eclipse/swt/internal/image/PngIendChunk.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngIhdrChunk.java b/org/eclipse/swt/internal/image/PngIhdrChunk.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngInputStream.java b/org/eclipse/swt/internal/image/PngInputStream.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngLzBlockReader.java b/org/eclipse/swt/internal/image/PngLzBlockReader.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngPlteChunk.java b/org/eclipse/swt/internal/image/PngPlteChunk.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/PngTrnsChunk.java b/org/eclipse/swt/internal/image/PngTrnsChunk.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/TIFFDirectory.java b/org/eclipse/swt/internal/image/TIFFDirectory.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/TIFFFileFormat.java b/org/eclipse/swt/internal/image/TIFFFileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/TIFFModifiedHuffmanCodec.java b/org/eclipse/swt/internal/image/TIFFModifiedHuffmanCodec.java
old mode 100755
new mode 100644
index 6a62184..5f0904c
--- a/org/eclipse/swt/internal/image/TIFFModifiedHuffmanCodec.java
+++ b/org/eclipse/swt/internal/image/TIFFModifiedHuffmanCodec.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/TIFFRandomFileAccess.java b/org/eclipse/swt/internal/image/TIFFRandomFileAccess.java
old mode 100755
new mode 100644
index 3d00cdb..8cc7e39
--- a/org/eclipse/swt/internal/image/TIFFRandomFileAccess.java
+++ b/org/eclipse/swt/internal/image/TIFFRandomFileAccess.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org/eclipse/swt/internal/image/WinBMPFileFormat.java b/org/eclipse/swt/internal/image/WinBMPFileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/image/WinICOFileFormat.java b/org/eclipse/swt/internal/image/WinICOFileFormat.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/XPCOM.java b/org/eclipse/swt/internal/mozilla/XPCOM.java
old mode 100755
new mode 100644
index a2f889c..f474386
--- a/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -29,6 +29,7 @@ package org.eclipse.swt.internal.mozilla;
import org.eclipse.swt.internal.*;
+/** @jniclass flags=cpp */
public class XPCOM extends C {
public static final String MOZILLA_FIVE_HOME = "MOZILLA_FIVE_HOME"; //$NON-NLS-1$
public static final String MOZILLA_PLUGIN_PATH = "MOZ_PLUGIN_PATH"; //$NON-NLS-1$
@@ -48,6 +49,7 @@ public class XPCOM extends C {
public static final String DOMEVENT_KEYPRESS = "keypress"; //$NON-NLS-1$
/* CID constants */
+ public static final nsID EXTERNAL_CID = new nsID ("f2c59ad0-bd76-11dd-ad8b-0800200c9a66"); //$NON-NLS-1$
public static final nsID NS_APPSHELL_CID = new nsID("2d96b3df-c051-11d1-a827-0040959a28c9"); //$NON-NLS-1$
public static final nsID NS_CATEGORYMANAGER_CID = new nsID("16d222a6-1dd2-11b2-b693-f38b02c021b2"); //$NON-NLS-1$
public static final nsID NS_DOWNLOAD_CID = new nsID("e3fa9D0a-1dd1-11b2-bdef-8c720b597445"); //$NON-NLS-1$
@@ -58,19 +60,25 @@ public class XPCOM extends C {
public static final nsID NS_LOADGROUP_CID = new nsID("e1c61582-2a84-11d3-8cce-0060b0fc14a3"); //$NON-NLS-1$
public static final nsID NS_PROMPTSERVICE_CID = new nsID("a2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
+ public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$
+ public static final String NS_CERTOVERRIDE_CONTRACTID = "@mozilla.org/security/certoverride;1"; //$NON-NLS-1$
+ public static final String NS_CERTIFICATEDIALOGS_CONTRACTID = "@mozilla.org/nsCertificateDialogs;1"; //$NON-NLS-1$
public static final String NS_CONTEXTSTACK_CONTRACTID = "@mozilla.org/js/xpc/ContextStack;1"; //$NON-NLS-1$
public static final String NS_COOKIEMANAGER_CONTRACTID = "@mozilla.org/cookiemanager;1"; //$NON-NLS-1$
+ public static final String NS_COOKIESERVICE_CONTRACTID = "@mozilla.org/cookieService;1"; //$NON-NLS-1$
public static final String NS_DIRECTORYSERVICE_CONTRACTID = "@mozilla.org/file/directory_service;1"; //$NON-NLS-1$
public static final String NS_DOMSERIALIZER_CONTRACTID = "@mozilla.org/xmlextras/xmlserializer;1"; //$NON-NLS-1$
public static final String NS_DOWNLOAD_CONTRACTID = "@mozilla.org/download;1"; //$NON-NLS-1$
public static final String NS_FILEPICKER_CONTRACTID = "@mozilla.org/filepicker;1"; //$NON-NLS-1$
public static final String NS_HELPERAPPLAUNCHERDIALOG_CONTRACTID = "@mozilla.org/helperapplauncherdialog;1"; //$NON-NLS-1$
public static final String NS_MEMORY_CONTRACTID = "@mozilla.org/xpcom/memory-service;1"; //$NON-NLS-1$
+ public static final String NS_SCRIPTSECURITYMANAGER_CONTRACTID = "@mozilla.org/scriptsecuritymanager;1"; //$NON-NLS-1$
public static final String NS_OBSERVER_CONTRACTID = "@mozilla.org/observer-service;1"; //$NON-NLS-1$
public static final String NS_PREFLOCALIZEDSTRING_CONTRACTID = "@mozilla.org/pref-localizedstring;1"; //$NON-NLS-1$
public static final String NS_PREFSERVICE_CONTRACTID = "@mozilla.org/preferences-service;1"; //$NON-NLS-1$
public static final String NS_PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; //$NON-NLS-1$
public static final String NS_TRANSFER_CONTRACTID = "@mozilla.org/transfer;1"; //$NON-NLS-1$
+ public static final String NS_VARIANT_CONTRACTID = "@mozilla.org/variant;1"; //$NON-NLS-1$
public static final String NS_WEBNAVIGATIONINFO_CONTRACTID = "@mozilla.org/webnavigation-info;1"; //$NON-NLS-1$
public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$
@@ -124,183 +132,2136 @@ public class XPCOM extends C {
public static final int NS_ERROR_FILE_NOT_FOUND = 0x80520012;
public static final int NS_ERROR_FILE_UNRECOGNIZED_PATH = 0x80520001;
+public static final native int nsDynamicFunctionLoad_sizeof ();
+
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *),flags=no_out critical
+ * @param size cast=(size_t)
+ */
+public static final native void memmove (int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param nbytes cast=(size_t)
+ */
public static final native void memmove(nsID dest, int /*long*/ src, int nbytes);
+/**
+ * @param dest cast=(void *)
+ * @param src cast=(const void *)
+ * @param nbytes cast=(size_t)
+ */
public static final native void memmove(int /*long*/ dest, nsID src, int nbytes);
-public static final native int NS_GetComponentManager(int /*long*/[] result);
-public static final native int NS_GetServiceManager(int /*long*/[] result);
-public static final native int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
-public static final native int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
+/** @method flags=no_gen */
public static final native int strlen_PRUnichar(int /*long*/ s);
-public static final native int /*long*/ nsEmbedCString_new();
-public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length);
-public static final native int /*long*/ nsEmbedCString_new(int aString, int length);
-public static final native void nsEmbedCString_delete(int /*long*/ ptr);
-public static final native int nsEmbedCString_Length(int /*long*/ ptr);
-public static final native int /*long*/ nsEmbedCString_get(int /*long*/ ptr);
-public static final native void nsID_delete(int /*long*/ ptr);
-public static final native int /*long*/ nsID_new();
-public static final native int nsID_Equals(int /*long*/ ptr, int /*long*/ other);
-public static final native int /*long*/ nsEmbedString_new();
-public static final native int /*long*/ nsEmbedString_new(char[] aString);
-public static final native void nsEmbedString_delete(int /*long*/ ptr);
-public static final native int nsEmbedString_Length(int /*long*/ ptr);
-public static final native int /*long*/ nsEmbedString_get(int /*long*/ ptr);
-public static final native int XPCOMGlueStartup(byte[] place);
-public static final native int XPCOMGlueShutdown();
-public static final native int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
+/** @method flags=no_gen */
+public static final native int _JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal);
+public static final int JS_EvaluateUCScriptForPrincipals(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, int /*long*/ principals, char[] chars, int length, byte[] filename, int lineno, int /*long*/[] retVal) {
+ lock.lock();
+ try {
+ return _JS_EvaluateUCScriptForPrincipals(mozillaPath, cx, obj, principals, chars, length, filename, lineno, retVal);
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
+/** @param result cast=(nsIComponentManager**) */
+public static final native int _NS_GetComponentManager(int /*long*/[] result);
+public static final int NS_GetComponentManager(int /*long*/[] result) {
+ lock.lock();
+ try {
+ return _NS_GetComponentManager(result);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param result cast=(nsIServiceManager**) */
+public static final native int _NS_GetServiceManager(int /*long*/[] result);
+public static final int NS_GetServiceManager(int /*long*/[] result) {
+ lock.lock();
+ try {
+ return _NS_GetServiceManager(result);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @param result cast=(nsIServiceManager **)
+ * @param binDirectory cast=(nsIFile *)
+ * @param appFileLocationProvider cast=(nsIDirectoryServiceProvider *)
+ */
+public static final native int _NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider);
+public static final int NS_InitXPCOM2(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider) {
+ lock.lock();
+ try {
+ return _NS_InitXPCOM2(result, binDirectory, appFileLocationProvider);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @param path cast=(nsAString *),flags=struct
+ * @param result cast=(nsILocalFile**)
+ */
+public static final native int _NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result);
+public static final int NS_NewLocalFile(int /*long*/ path, int followLinks, int /*long*/[] result) {
+ lock.lock();
+ try {
+ return _NS_NewLocalFile(path, followLinks, result);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=new */
+public static final native int /*long*/ _nsEmbedCString_new();
+public static final int /*long*/ nsEmbedCString_new() {
+ lock.lock();
+ try {
+ return _nsEmbedCString_new();
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=new
+ * @param aString cast=(const char *)
+ */
+public static final native int /*long*/ _nsEmbedCString_new(byte[] aString, int length);
+public static final int /*long*/ nsEmbedCString_new(byte[] aString, int length) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_new(aString, length);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=new
+ * @param aString cast=(const char *)
+ */
+public static final native int /*long*/ _nsEmbedCString_new(int /*long*/ aString, int length);
+public static final int /*long*/ nsEmbedCString_new(int /*long*/ aString, int length) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_new(aString, length);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=delete
+ * @param ptr cast=(nsEmbedCString *)
+ */
+public static final native void _nsEmbedCString_delete(int /*long*/ ptr);
+public static final void nsEmbedCString_delete(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ _nsEmbedCString_delete(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedCString *)
+ */
+public static final native int _nsEmbedCString_Length(int /*long*/ ptr);
+public static final int nsEmbedCString_Length(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_Length(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+public static final native int _nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang);
+public static final int nsIScriptGlobalObject_EnsureScriptEnvironment(int /*long*/ ptr, int lang) {
+ lock.lock();
+ try {
+ return _nsIScriptGlobalObject_EnsureScriptEnvironment(ptr, lang);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang);
+public static final int /*long*/ nsIScriptGlobalObject_GetScriptGlobal(int /*long*/ ptr, int lang) {
+ lock.lock();
+ try {
+ return _nsIScriptGlobalObject_GetScriptGlobal(ptr, lang);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptGlobalObject *)
+ */
+public static final native int /*long*/ _nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang);
+public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*long*/ ptr, int lang) {
+ lock.lock();
+ try {
+ return _nsIScriptGlobalObject_GetScriptContext(ptr, lang);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIScriptContext *)
+ */
+public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);
+public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ return _nsIScriptContext_GetNativeContext(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedCString *)
+ */
+public static final native int /*long*/ _nsEmbedCString_get(int /*long*/ ptr);
+public static final int /*long*/ nsEmbedCString_get(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedCString_get(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=delete
+ * @param ptr cast=(nsID *)
+ */
+public static final native void _nsID_delete(int /*long*/ ptr);
+public static final void nsID_delete(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ _nsID_delete(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=new */
+public static final native int /*long*/ _nsID_new();
+public static final int /*long*/ nsID_new() {
+ lock.lock();
+ try {
+ return _nsID_new();
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsID *)
+ * @param other cast=(nsID *),flags=struct
+ */
+public static final native int _nsID_Equals(int /*long*/ ptr, int /*long*/ other);
+public static final int nsID_Equals(int /*long*/ ptr, int /*long*/ other) {
+ lock.lock();
+ try {
+ return _nsID_Equals(ptr, other);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @method flags=new */
+public static final native int /*long*/ _nsEmbedString_new();
+public static final int /*long*/ nsEmbedString_new() {
+ lock.lock();
+ try {
+ return _nsEmbedString_new();
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=new
+ * @param aString cast=(PRUnichar *)
+ */
+public static final native int /*long*/ _nsEmbedString_new(char[] aString);
+public static final int /*long*/ nsEmbedString_new(char[] aString) {
+ lock.lock();
+ try {
+ return _nsEmbedString_new(aString);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=delete
+ * @param ptr cast=(nsEmbedString *)
+ */
+public static final native void _nsEmbedString_delete(int /*long*/ ptr);
+public static final void nsEmbedString_delete(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ _nsEmbedString_delete(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedString *)
+ */
+public static final native int _nsEmbedString_Length(int /*long*/ ptr);
+public static final int nsEmbedString_Length(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedString_Length(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsEmbedString *)
+ */
+public static final native int /*long*/ _nsEmbedString_get(int /*long*/ ptr);
+public static final int /*long*/ nsEmbedString_get(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ return _nsEmbedString_get(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr cast=(nsIMemory *)
+ * @param size cast=(size_t)
+ */
+public static final native int /*long*/ _nsIMemory_Alloc(int /*long*/ ptr, int size);
+public static final int /*long*/ nsIMemory_Alloc(int /*long*/ ptr, int size) {
+ lock.lock();
+ try {
+ return _nsIMemory_Alloc(ptr, size);
+ } finally {
+ lock.unlock();
+ }
+}
+/**
+ * @method flags=cpp
+ * @param ptr1 cast=(nsIMemory *)
+ * @param ptr2 cast=(void *)
+ * @param size cast=(size_t)
+ */
+public static final native int /*long*/ _nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size);
+public static final int /*long*/ nsIMemory_Realloc(int /*long*/ ptr1, int /*long*/ ptr2, int size) {
+ lock.lock();
+ try {
+ return _nsIMemory_Realloc(ptr1, ptr2, size);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param functionLoad cast=(const nsDynamicFunctionLoad *) */
+public static final native int _XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad);
+public static final int XPCOMGlueLoadXULFunctions (int /*long*/ functionLoad) {
+ lock.lock();
+ try {
+ return _XPCOMGlueLoadXULFunctions(functionLoad);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param place cast=(const char *) */
+public static final native int _XPCOMGlueStartup(byte[] place);
+public static final int XPCOMGlueStartup(byte[] place) {
+ lock.lock();
+ try {
+ return _XPCOMGlueStartup(place);
+ } finally {
+ lock.unlock();
+ }
+}
+public static final native int _XPCOMGlueShutdown();
+public static final int XPCOMGlueShutdown() {
+ lock.lock();
+ try {
+ return _XPCOMGlueShutdown();
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
+public static final native int _Call(int /*long*/ ptr);
+public static final int Call(int /*long*/ ptr) {
+ lock.lock();
+ try {
+ return _Call(ptr);
+ } finally {
+ lock.unlock();
+ }
+}
+
+/**
+ * @param ptr cast=(nsWriteSegmentFun)
+ * @param aInStream cast=(nsIInputStream *)
+ * @param aClosure cast=(void *)
+ * @param aFromSegment cast=(const char *)
+ * @param aWriteCount cast=(PRUint32 *)
+ */
+public static final native int /*long*/ _Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
+public static final int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount) {
+ lock.lock();
+ try {
+ return _Call(ptr, aInStream, aClosure, aFromSegment, aToOffset, aCount, aWriteCount);
+ } finally {
+ lock.unlock();
+ }
+}
+
+/**
+ * @param ptr cast=(SWT_XREInitEmbedding)
+ * @param aLibXULDirectory cast=(nsILocalFile *)
+ * @param aAppDirectory cast=(nsILocalFile *)
+ * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *)
+ * @param aStaticComponents cast=(nsStaticModuleInfo const *)
+ */
+public static final native int _Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount);
+public static final int Call(int /*long*/ ptr, int /*long*/ aLibXULDirectory, int /*long*/ aAppDirectory, int /*long*/ aAppDirProvider, int /*long*/ aStaticComponents, int aStaticComponentsCount) {
+ lock.lock();
+ try {
+ return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, double arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, float[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long [] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, char[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long [] arg0, long [] arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, int arg1, int arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short arg0, long arg1, int arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long [] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, long[] arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, long arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long [] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, nsID arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int[] arg1, long[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, nsID arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, char[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int[] arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, int arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, short arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, short arg2) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, nsID arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, long arg1, nsID arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, long arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long [] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, char[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, char[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int arg1, nsID arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, long arg1, nsID arg2, long [] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long [] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, byte[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, byte[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, int arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, short[] arg0, long arg1, int[] arg2, long[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int[] arg2, int[] arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, int arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, char[] arg0, int arg1, long arg2, long arg3, long arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, int arg2, int[] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, int arg1, long arg2, long [] arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, byte[] arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, byte[] arg2, long arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, nsID arg1, int arg2, int arg3, int[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, nsID arg1, long arg2, long arg3, long[] arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int arg3, int arg4) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, byte[] arg1, byte[] arg2, byte[] arg3, int arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, byte[] arg1, byte[] arg2, byte[] arg3, long arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, int arg3, long arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, int arg3, long arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int[] arg0, int[] arg1, int[] arg2, int[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long[] arg0, long[] arg1, long[] arg2, long[] arg3, long[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, int arg3, int arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int [] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, int arg3, byte[] arg4, byte[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, byte[] arg1, byte[] arg2, long arg3, byte[] arg4, byte[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, long arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, char[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, byte[] arg0, byte[] arg1, byte[] arg2, int arg3, int arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int[] arg4, long [] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, char[] arg2, char[] arg3, int arg4, int [] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, char[] arg2, char[] arg3, int arg4, long[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, byte[] arg3, byte[] arg4, int arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, byte[] arg3, byte[] arg4, long arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, int[] arg3, int[] arg4, int[] arg5) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, long arg2, long arg3, int[] arg4, int[] arg5, int[] arg6) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long[] arg7) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ } finally {
+ lock.unlock();
+ }
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
+ } finally {
+ lock.unlock();
+ }
+}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14);
+ } finally {
+ lock.unlock();
+ }
+}
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, int[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, long[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, int arg2, long arg3, char[] arg4, int[] arg5, int[] arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, long arg4, int arg5, int arg6);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
+/**
+ * @method flags=no_gen
+ */
+public static final native int GetAddress(int ptr, int index);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int[] arg3, int[] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, long[] arg3, long [] arg4, char[] arg5, int[] arg6, int[] arg7);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, char[] arg6, int[] arg7, int[] arg8);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3, int arg4, long arg5, char[] arg6, int[] arg7, long [] arg8);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, char[] arg1, char[] arg2, int arg3, char[] arg4, char[] arg5, char[] arg6, char[] arg7, int[] arg8, int[] arg9);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int[] arg10, int[] arg11);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, long arg5, long arg6, int arg7, long arg8, int arg9, long [] arg10, long [] arg11);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, char[] arg4, byte[] arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int[] arg11, int[] arg12);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, int arg3, char[] arg4, byte[] arg5, long arg6, long arg7, int arg8, long arg9, int arg10, long [] arg11, long [] arg12);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14);
-static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14);
}
diff --git a/org/eclipse/swt/internal/mozilla/XPCOMInit.java b/org/eclipse/swt/internal/mozilla/XPCOMInit.java
deleted file mode 100755
index 4cd6352..0000000
--- a/org/eclipse/swt/internal/mozilla/XPCOMInit.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2006 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-import org.eclipse.swt.internal.Platform;
-
-public class XPCOMInit extends Platform {
- public static final int PATH_MAX = 4096;
-
-public static final native int GREVersionRange_sizeof ();
-public static final native int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
-public static final native int XPCOMGlueStartup (byte[] place);
-public static final native int XPCOMGlueShutdown ();
-}
diff --git a/org/eclipse/swt/internal/mozilla/XPCOMObject.java b/org/eclipse/swt/internal/mozilla/XPCOMObject.java
old mode 100755
new mode 100644
index 7f67a2f..bc22e54
--- a/org/eclipse/swt/internal/mozilla/XPCOMObject.java
+++ b/org/eclipse/swt/internal/mozilla/XPCOMObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,28 +15,35 @@ import org.eclipse.swt.*;
import org.eclipse.swt.internal.*;
public class XPCOMObject {
-
- private int /*long*/ ppVtable;
+ static boolean IsSolaris;
+ static {
+ String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+ IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
+ }
+ private int /*long*/ ppVtable;
+
static private final int MAX_ARG_COUNT = 12;
static private final int MAX_VTABLE_LENGTH = 80;
- static private Callback[][] Callbacks = new Callback[MAX_VTABLE_LENGTH][MAX_ARG_COUNT];
+ static final int OS_OFFSET = IsSolaris ? 2 : 0;
+ static private Callback[][] Callbacks = new Callback[MAX_VTABLE_LENGTH + OS_OFFSET][MAX_ARG_COUNT];
static private Hashtable ObjectMap = new Hashtable ();
+
public XPCOMObject (int[] argCounts) {
- int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length];
+ int /*long*/[] callbackAddresses = new int /*long*/[argCounts.length + OS_OFFSET];
synchronized (Callbacks) {
- for (int i = 0, length = argCounts.length; i < length; i++){
- if ((Callbacks[i][argCounts[i]]) == null) {
- Callbacks[i][argCounts[i]] = new Callback (getClass (), "callback"+i, argCounts[i] + 1, true, XPCOM.NS_ERROR_FAILURE); //$NON-NLS-1$
+ for (int i = 0, length = argCounts.length; i < length; i++) {
+ if ((Callbacks[i + OS_OFFSET][argCounts[i]]) == null) {
+ Callbacks[i + OS_OFFSET][argCounts[i]] = new Callback (getClass (), "callback"+i, argCounts[i] + 1, true, XPCOM.NS_ERROR_FAILURE); //$NON-NLS-1$
}
- callbackAddresses[i] = Callbacks[i][argCounts[i]].getAddress ();
- if (callbackAddresses[i] == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
+ callbackAddresses[i + OS_OFFSET] = Callbacks[i + OS_OFFSET][argCounts[i]].getAddress ();
+ if (callbackAddresses[i + OS_OFFSET] == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
}
}
- int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * argCounts.length);
- XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * argCounts.length);
+ int /*long*/ pVtable = C.malloc (C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
+ XPCOM.memmove (pVtable, callbackAddresses, C.PTR_SIZEOF * (argCounts.length + OS_OFFSET));
ppVtable = C.malloc (C.PTR_SIZEOF);
XPCOM.memmove (ppVtable, new int /*long*/[] {pVtable}, C.PTR_SIZEOF);
ObjectMap.put (new LONG (ppVtable), this);
diff --git a/org/eclipse/swt/internal/mozilla/GREVersionRange.java b/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
old mode 100755
new mode 100644
similarity index 71%
copy from org/eclipse/swt/internal/mozilla/GREVersionRange.java
copy to org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
index 70838a0..da361dd
--- a/org/eclipse/swt/internal/mozilla/GREVersionRange.java
+++ b/org/eclipse/swt/internal/mozilla/init/GREVersionRange.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,12 +8,15 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.swt.internal.mozilla;
+package org.eclipse.swt.internal.mozilla.init;
+/** @jniclass flags=cpp */
public class GREVersionRange {
- public int /*long*/ lower;
+ /** @field cast=(const char *) */
+ public int /*long*/ lower;
public boolean lowerInclusive;
- public int /*long*/ upper;
+ /** @field cast=(const char *) */
+ public int /*long*/ upper;
public boolean upperInclusive;
public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
}
diff --git a/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java b/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
new file mode 100644
index 0000000..a746934
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java
@@ -0,0 +1,71 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2006 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla.init;
+
+import org.eclipse.swt.internal.Platform;
+
+/** @jniclass flags=cpp */
+public class XPCOMInit extends Platform {
+ public static final int PATH_MAX = 4096;
+
+public static final native int GREVersionRange_sizeof ();
+
+/**
+ * @param versions cast=(const GREVersionRange *)
+ * @param properties cast=(const GREProperty *)
+ * @param buffer cast=(char *)
+ */
+public static final native int _GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen);
+public static final int GRE_GetGREPathWithProperties (GREVersionRange versions, int versionsLength, int /*long*/ properties, int propertiesLength, int /*long*/ buffer, int buflen) {
+ lock.lock();
+ try {
+ return _GRE_GetGREPathWithProperties(versions, versionsLength, properties, propertiesLength, buffer, buflen);
+ } finally {
+ lock.unlock();
+ }
+}
+/** @param place cast=(const char *) */
+public static final native int _XPCOMGlueStartup (byte[] place);
+public static final int XPCOMGlueStartup (byte[] place) {
+ lock.lock();
+ try {
+ return _XPCOMGlueStartup(place);
+ } finally {
+ lock.unlock();
+ }
+}
+public static final native int _XPCOMGlueShutdown ();
+public static final int XPCOMGlueShutdown () {
+ lock.lock();
+ try {
+ return _XPCOMGlueShutdown();
+ } finally {
+ lock.unlock();
+ }
+}
+}
diff --git a/org/eclipse/swt/internal/mozilla/GREVersionRange.java b/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
old mode 100755
new mode 100644
similarity index 64%
rename from org/eclipse/swt/internal/mozilla/GREVersionRange.java
rename to org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
index 70838a0..7857539
--- a/org/eclipse/swt/internal/mozilla/GREVersionRange.java
+++ b/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,10 +10,9 @@
*******************************************************************************/
package org.eclipse.swt.internal.mozilla;
-public class GREVersionRange {
- public int /*long*/ lower;
- public boolean lowerInclusive;
- public int /*long*/ upper;
- public boolean upperInclusive;
- public static final int sizeof = XPCOMInit.GREVersionRange_sizeof();
+public class nsDynamicFunctionLoad {
+ /** @field cast=(const char *) */
+ public int /*long*/ functionName;
+ /** @field cast=(NSFuncPtr *) */
+ public int /*long*/ function;
}
diff --git a/org/eclipse/swt/internal/mozilla/nsEmbedString.java b/org/eclipse/swt/internal/mozilla/nsEmbedString.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/org/eclipse/swt/internal/mozilla/nsIAppShell.java
old mode 100755
new mode 100644
index 71942b2..9ce7481
--- a/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+++ b/org/eclipse/swt/internal/mozilla/nsIAppShell.java
@@ -1,75 +1,75 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIAppShell extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
- public static final String NS_IAPPSHELL_IID_STR =
- "a0757c31-eeac-11d1-9ec1-00aa002fb821";
-
- public static final nsID NS_IAPPSHELL_IID =
- new nsID(NS_IAPPSHELL_IID_STR);
-
- public nsIAppShell(int /*long*/ address) {
- super(address);
- }
-
- public int Create(int /*long*/ argc, int /*long*/[] argv) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
- }
-
- public int Run() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
- }
-
- public int Spinup() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
- public int Spindown() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
- }
-
- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
- }
-
- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
- }
-
- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
- }
-
- public int Exit() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIAppShell extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+ public static final String NS_IAPPSHELL_IID_STR =
+ "a0757c31-eeac-11d1-9ec1-00aa002fb821";
+
+ public static final nsID NS_IAPPSHELL_IID =
+ new nsID(NS_IAPPSHELL_IID_STR);
+
+ public nsIAppShell(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Create(int /*long*/ argc, int /*long*/[] argv) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
+ }
+
+ public int Run() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
+ }
+
+ public int Spinup() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
+
+ public int Spindown() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+ }
+
+ public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
+ }
+
+ public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
+ }
+
+ public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
+ }
+
+ public int Exit() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
old mode 100755
new mode 100644
similarity index 68%
copy from org/eclipse/swt/internal/mozilla/nsIWeakReference.java
copy to org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
index faf448b..361bc5d
--- a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+++ b/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
@@ -22,26 +22,26 @@
*
* IBM
* - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
-public class nsIWeakReference extends nsISupports {
+public class nsIBadCertListener2 extends nsISupports {
static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
- public static final String NS_IWEAKREFERENCE_IID_STR =
- "9188bc85-f92e-11d2-81ef-0060083a0bcf";
+ public static final String NS_IBADCERTLISTENER2_IID_STR =
+ "2c3d268c-ad82-49f3-99aa-e9ffddd7a0dc";
- public static final nsID NS_IWEAKREFERENCE_IID =
- new nsID(NS_IWEAKREFERENCE_IID_STR);
+ public static final nsID NS_IBADCERTLISTENER2_IID =
+ new nsID(NS_IBADCERTLISTENER2_IID_STR);
- public nsIWeakReference(int /*long*/ address) {
+ public nsIBadCertListener2(int /*long*/ address) {
super(address);
}
- public int QueryReferent(nsID uuid, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uuid, result);
+ public int NotifyCertProblem(int /*long*/ socketInfo, int /*long*/ status, int /*long*/ targetSite, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), socketInfo, status, targetSite, _retval);
}
}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
old mode 100755
new mode 100644
index 958916d..23c915b
--- a/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+++ b/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
@@ -1,139 +1,139 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIBaseWindow extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 24;
-
- public static final String NS_IBASEWINDOW_IID_STR =
- "046bc8a0-8015-11d3-af70-00a024ffc08c";
-
- public static final nsID NS_IBASEWINDOW_IID =
- new nsID(NS_IBASEWINDOW_IID_STR);
-
- public nsIBaseWindow(int /*long*/ address) {
- super(address);
- }
-
- public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
- }
-
- public int Create() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
- }
-
- public int Destroy() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
- public int SetPosition(int x, int y) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), x, y);
- }
-
- public int GetPosition(int[] x, int[] y) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), x, y);
- }
-
- public int SetSize(int cx, int cy, int fRepaint) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);
- }
-
- public int GetSize(int[] cx, int[] cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), cx, cy);
- }
-
- public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);
- }
-
- public int GetPositionAndSize(int[] x, int[] y, int[] cx, int[] cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);
- }
-
- public int Repaint(int force) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
- }
-
- public int GetParentWidget(int /*long*/[] aParentWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
- }
-
- public int SetParentWidget(int /*long*/ aParentWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
- }
-
- public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
- }
-
- public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
- }
-
- public int GetVisibility(int[] aVisibility) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);
- }
-
- public int SetVisibility(int aVisibility) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);
- }
-
- public int GetEnabled(int[] aEnabled) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);
- }
-
- public int SetEnabled(int aEnabled) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);
- }
-
- public int GetBlurSuppression(int[] aBlurSuppression) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
- }
-
- public int SetBlurSuppression(int aBlurSuppression) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
- }
-
- public int GetMainWidget(int /*long*/[] aMainWidget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
- }
-
- public int SetFocus() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
- }
-
- public int GetTitle(int /*long*/[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
- }
-
- public int SetTitle(char[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aTitle);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIBaseWindow extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 24;
+
+ public static final String NS_IBASEWINDOW_IID_STR =
+ "046bc8a0-8015-11d3-af70-00a024ffc08c";
+
+ public static final nsID NS_IBASEWINDOW_IID =
+ new nsID(NS_IBASEWINDOW_IID_STR);
+
+ public nsIBaseWindow(int /*long*/ address) {
+ super(address);
+ }
+
+ public int InitWindow(int /*long*/ parentNativeWindow, int /*long*/ parentWidget, int x, int y, int cx, int cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parentNativeWindow, parentWidget, x, y, cx, cy);
+ }
+
+ public int Create() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
+ }
+
+ public int Destroy() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
+
+ public int SetPosition(int x, int y) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), x, y);
+ }
+
+ public int GetPosition(int[] x, int[] y) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), x, y);
+ }
+
+ public int SetSize(int cx, int cy, int fRepaint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, cy, fRepaint);
+ }
+
+ public int GetSize(int[] cx, int[] cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), cx, cy);
+ }
+
+ public int SetPositionAndSize(int x, int y, int cx, int cy, int fRepaint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), x, y, cx, cy, fRepaint);
+ }
+
+ public int GetPositionAndSize(int[] x, int[] y, int[] cx, int[] cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), x, y, cx, cy);
+ }
+
+ public int Repaint(int force) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), force);
+ }
+
+ public int GetParentWidget(int /*long*/[] aParentWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aParentWidget);
+ }
+
+ public int SetParentWidget(int /*long*/ aParentWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aParentWidget);
+ }
+
+ public int GetParentNativeWindow(int /*long*/[] aParentNativeWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aParentNativeWindow);
+ }
+
+ public int SetParentNativeWindow(int /*long*/ aParentNativeWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentNativeWindow);
+ }
+
+ public int GetVisibility(int[] aVisibility) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility);
+ }
+
+ public int SetVisibility(int aVisibility) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility);
+ }
+
+ public int GetEnabled(int[] aEnabled) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled);
+ }
+
+ public int SetEnabled(int aEnabled) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled);
+ }
+
+ public int GetBlurSuppression(int[] aBlurSuppression) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
+ }
+
+ public int SetBlurSuppression(int aBlurSuppression) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
+ }
+
+ public int GetMainWidget(int /*long*/[] aMainWidget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
+ }
+
+ public int SetFocus() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
+ }
+
+ public int GetTitle(int /*long*/[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
+ }
+
+ public int SetTitle(char[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aTitle);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsICancelable.java b/org/eclipse/swt/internal/mozilla/nsICancelable.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsICategoryManager.java b/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
old mode 100755
new mode 100644
index 7e49f85..8417352
--- a/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+++ b/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
@@ -1,67 +1,67 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsICategoryManager extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
-
- public static final String NS_ICATEGORYMANAGER_IID_STR =
- "3275b2cd-af6d-429a-80d7-f0c5120342ac";
-
- public static final nsID NS_ICATEGORYMANAGER_IID =
- new nsID(NS_ICATEGORYMANAGER_IID_STR);
-
- public nsICategoryManager(int /*long*/ address) {
- super(address);
- }
-
- public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
- }
-
- public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
- }
-
- public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCategory, aEntry, aPersist);
- }
-
- public int DeleteCategory(byte[] aCategory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
- }
-
- public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
- }
-
- public int EnumerateCategories(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICategoryManager extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
+
+ public static final String NS_ICATEGORYMANAGER_IID_STR =
+ "3275b2cd-af6d-429a-80d7-f0c5120342ac";
+
+ public static final nsID NS_ICATEGORYMANAGER_IID =
+ new nsID(NS_ICATEGORYMANAGER_IID_STR);
+
+ public nsICategoryManager(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetCategoryEntry(byte[] aCategory, byte[] aEntry, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCategory, aEntry, _retval);
+ }
+
+ public int AddCategoryEntry(byte[] aCategory, byte[] aEntry, byte[] aValue, int aPersist, int aReplace, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCategory, aEntry, aValue, aPersist, aReplace, _retval);
+ }
+
+ public int DeleteCategoryEntry(byte[] aCategory, byte[] aEntry, int aPersist) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCategory, aEntry, aPersist);
+ }
+
+ public int DeleteCategory(byte[] aCategory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aCategory);
+ }
+
+ public int EnumerateCategory(byte[] aCategory, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCategory, _retval);
+ }
+
+ public int EnumerateCategories(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java b/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
new file mode 100644
index 0000000..bd5752a
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
@@ -0,0 +1,73 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICertOverrideService extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
+
+ public static final String NS_ICERTOVERRIDESERVICE_IID_STR =
+ "31738d2a-77d3-4359-84c9-4be2f38fb8c5";
+
+ public static final nsID NS_ICERTOVERRIDESERVICE_IID =
+ new nsID(NS_ICERTOVERRIDESERVICE_IID_STR);
+
+ public nsICertOverrideService(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int ERROR_UNTRUSTED = 1;
+
+ public static final int ERROR_MISMATCH = 2;
+
+ public static final int ERROR_TIME = 4;
+
+ public int RememberValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int aOverrideBits, int aTemporary) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aHostName, aPort, aCert, aOverrideBits, aTemporary);
+ }
+
+ public int HasMatchingOverride(int /*long*/ aHostName, int aPort, int /*long*/ aCert, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aHostName, aPort, aCert, aOverrideBits, aIsTemporary, _retval);
+ }
+
+ public int GetValidityOverride(int /*long*/ aHostName, int aPort, int /*long*/ aHashAlg, int /*long*/ aFingerprint, int[] aOverrideBits, int[] aIsTemporary, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aHostName, aPort, aHashAlg, aFingerprint, aOverrideBits, aIsTemporary, _retval);
+ }
+
+ public int ClearValidityOverride(int /*long*/ aHostName, int aPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHostName, aPort);
+ }
+
+ public int GetAllOverrideHostsWithPorts(int[] aCount, int /*long*/[] aHostsWithPortsArray) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCount, aHostsWithPortsArray);
+ }
+
+ public int IsCertUsedForOverrides(int /*long*/ aCert, int aCheckTemporaries, int aCheckPermanents, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCert, aCheckTemporaries, aCheckPermanents, _retval);
+ }
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
old mode 100755
new mode 100644
similarity index 60%
copy from org/eclipse/swt/internal/mozilla/nsIPrefService.java
copy to org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
index b3fc9fb..44d581d
--- a/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+++ b/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
@@ -22,46 +22,46 @@
*
* IBM
* - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2006 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
-public class nsIPrefService extends nsISupports {
+public class nsICertificateDialogs extends nsISupports {
static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 6;
- public static final String NS_IPREFSERVICE_IID_STR =
- "decb9cc7-c08f-4ea5-be91-a8fc637ce2d2";
+ public static final String NS_ICERTIFICATEDIALOGS_IID_STR =
+ "a03ca940-09be-11d5-ac5d-000064657374";
- public static final nsID NS_IPREFSERVICE_IID =
- new nsID(NS_IPREFSERVICE_IID_STR);
+ public static final nsID NS_ICERTIFICATEDIALOGS_IID =
+ new nsID(NS_ICERTIFICATEDIALOGS_IID_STR);
- public nsIPrefService(int /*long*/ address) {
+ public nsICertificateDialogs(int /*long*/ address) {
super(address);
}
- public int ReadUserPrefs(int /*long*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFile);
+ public int ConfirmDownloadCACert(int /*long*/ ctx, int /*long*/ cert, int[] trust, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), ctx, cert, trust, _retval);
}
- public int ResetPrefs() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
+ public int NotifyCACertExists(int /*long*/ ctx) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ctx);
}
- public int ResetUserPrefs() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ public int SetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ctx, password, _retval);
}
- public int SavePrefFile(int /*long*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile);
+ public int GetPKCS12FilePassword(int /*long*/ ctx, int /*long*/ password, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), ctx, password, _retval);
}
- public int GetBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefRoot, _retval);
+ public int ViewCert(int /*long*/ ctx, int /*long*/ cert) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), ctx, cert);
}
- public int GetDefaultBranch(byte[] aPrefRoot, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefRoot, _retval);
+ public int CrlImportStatusDialog(int /*long*/ ctx, int /*long*/ crl) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), ctx, crl);
}
-}
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIChannel.java b/org/eclipse/swt/internal/mozilla/nsIChannel.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java b/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
old mode 100755
new mode 100644
similarity index 58%
copy from org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
copy to org/eclipse/swt/internal/mozilla/nsIClassInfo.java
index 2041790..180f721
--- a/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+++ b/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
@@ -27,61 +27,65 @@
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
-public class nsIAuthInformation extends nsISupports {
+public class nsIClassInfo extends nsISupports {
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
- public static final String NS_IAUTHINFORMATION_IID_STR =
- "0d73639c-2a92-4518-9f92-28f71fea5f20";
+ public static final String NS_ICLASSINFO_IID_STR =
+ "986c11d0-f340-11d4-9075-0010a4e73d9a";
- public static final nsID NS_IAUTHINFORMATION_IID =
- new nsID(NS_IAUTHINFORMATION_IID_STR);
+ public static final nsID NS_ICLASSINFO_IID =
+ new nsID(NS_ICLASSINFO_IID_STR);
- public nsIAuthInformation(int /*long*/ address) {
+ public nsIClassInfo(int /*long*/ address) {
super(address);
}
- public static final int AUTH_HOST = 1;
-
- public static final int AUTH_PROXY = 2;
-
- public static final int NEED_DOMAIN = 4;
-
- public static final int ONLY_PASSWORD = 8;
-
- public int GetFlags(int[] aFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aFlags);
+ public int GetInterfaces(int[] count, int /*long*/[] array) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), count, array);
}
- public int GetRealm(int /*long*/ aRealm) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aRealm);
+ public int GetHelperForLanguage(int language, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), language, _retval);
}
- public int GetAuthenticationScheme(int /*long*/ aAuthenticationScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aAuthenticationScheme);
+ public int GetContractID(int /*long*/[] aContractID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContractID);
}
- public int GetUsername(int /*long*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aUsername);
+ public int GetClassDescription(int /*long*/[] aClassDescription) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClassDescription);
}
- public int SetUsername(int /*long*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aUsername);
+ public int GetClassID(int /*long*/ aClassID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClassID);
}
- public int GetPassword(int /*long*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPassword);
+ public int GetImplementationLanguage(int[] aImplementationLanguage) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aImplementationLanguage);
}
- public int SetPassword(int /*long*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPassword);
- }
+ public static final int SINGLETON = 1;
+
+ public static final int THREADSAFE = 2;
- public int GetDomain(int /*long*/ aDomain) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aDomain);
+ public static final int MAIN_THREAD_ONLY = 4;
+
+ public static final int DOM_OBJECT = 8;
+
+ public static final int PLUGIN_OBJECT = 16;
+
+ public static final int EAGER_CLASSINFO = 32;
+
+ public static final int CONTENT_NODE = 64;
+
+// public static final int RESERVED = 2147483648;
+
+ public int GetFlags(int[] aFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFlags);
}
- public int SetDomain(int /*long*/ aDomain) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDomain);
+ public int GetClassIDNoAlloc(int /*long*/ aClassIDNoAlloc) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aClassIDNoAlloc);
}
}
diff --git a/org/eclipse/swt/internal/mozilla/nsIComponentManager.java b/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java b/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
old mode 100755
new mode 100644
index 8f0032f..6ff0cff
--- a/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+++ b/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
@@ -1,91 +1,91 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIComponentRegistrar extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 12;
-
- public static final String NS_ICOMPONENTREGISTRAR_IID_STR =
- "2417cbfe-65ad-48a6-b4b6-eb84db174392";
-
- public static final nsID NS_ICOMPONENTREGISTRAR_IID =
- new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
-
- public nsIComponentRegistrar(int /*long*/ address) {
- super(address);
- }
-
- public int AutoRegister(int /*long*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
- public int AutoUnregister(int /*long*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
- public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
- }
-
- public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
- }
-
- public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
- }
-
- public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
- }
-
- public int IsCIDRegistered(nsID aClass, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval);
- }
-
- public int IsContractIDRegistered(byte[] aContractID, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
- }
-
- public int EnumerateCIDs(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
- }
-
- public int EnumerateContractIDs(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
- }
-
- public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
- }
-
- public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIComponentRegistrar extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 12;
+
+ public static final String NS_ICOMPONENTREGISTRAR_IID_STR =
+ "2417cbfe-65ad-48a6-b4b6-eb84db174392";
+
+ public static final nsID NS_ICOMPONENTREGISTRAR_IID =
+ new nsID(NS_ICOMPONENTREGISTRAR_IID_STR);
+
+ public nsIComponentRegistrar(int /*long*/ address) {
+ super(address);
+ }
+
+ public int AutoRegister(int /*long*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+ }
+
+ public int AutoUnregister(int /*long*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+ }
+
+ public int RegisterFactory(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFactory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aClassName, aContractID, aFactory);
+ }
+
+ public int UnregisterFactory(nsID aClass, int /*long*/ aFactory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aClass, aFactory);
+ }
+
+ public int RegisterFactoryLocation(nsID aClass, byte[] aClassName, byte[] aContractID, int /*long*/ aFile, byte[] aLoaderStr, byte[] aType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aClass, aClassName, aContractID, aFile, aLoaderStr, aType);
+ }
+
+ public int UnregisterFactoryLocation(nsID aClass, int /*long*/ aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aClass, aFile);
+ }
+
+ public int IsCIDRegistered(nsID aClass, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aClass, _retval);
+ }
+
+ public int IsContractIDRegistered(byte[] aContractID, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aContractID, _retval);
+ }
+
+ public int EnumerateCIDs(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+ public int EnumerateContractIDs(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+ public int CIDToContractID(nsID aClass, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aClass, _retval);
+ }
+
+ public int ContractIDToCID(byte[] aContractID, int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aContractID, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java b/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsICookie.java b/org/eclipse/swt/internal/mozilla/nsICookie.java
old mode 100755
new mode 100644
index 5f0f734..77eb6d2
--- a/org/eclipse/swt/internal/mozilla/nsICookie.java
+++ b/org/eclipse/swt/internal/mozilla/nsICookie.java
@@ -1,101 +1,101 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsICookie extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
- public static final String NS_ICOOKIE_IID_STR =
- "e9fcb9a4-d376-458f-b720-e65e7df593bc";
-
- public static final nsID NS_ICOOKIE_IID =
- new nsID(NS_ICOOKIE_IID_STR);
-
- public nsICookie(int /*long*/ address) {
- super(address);
- }
-
- public int GetName(int /*long*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
- }
-
- public int GetValue(int /*long*/ aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
- }
-
- public int GetIsDomain(int[] aIsDomain) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
- }
-
- public int GetHost(int /*long*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
- }
-
- public int GetPath(int /*long*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
- }
-
- public int GetIsSecure(int[] aIsSecure) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsSecure);
- }
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICookie extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+ public static final String NS_ICOOKIE_IID_STR =
+ "e9fcb9a4-d376-458f-b720-e65e7df593bc";
+
+ public static final nsID NS_ICOOKIE_IID =
+ new nsID(NS_ICOOKIE_IID_STR);
+
+ public nsICookie(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetName(int /*long*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+ }
+
+ public int GetValue(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aValue);
+ }
+
+ public int GetIsDomain(int[] aIsDomain) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aIsDomain);
+ }
+
+ public int GetHost(int /*long*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aHost);
+ }
+
+ public int GetPath(int /*long*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPath);
+ }
+
+ public int GetIsSecure(int[] aIsSecure) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsSecure);
+ }
+
public int GetExpires(long[] aExpires) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aExpires);
- }
-
- public static final int STATUS_UNKNOWN = 0;
-
- public static final int STATUS_ACCEPTED = 1;
-
- public static final int STATUS_DOWNGRADED = 2;
-
- public static final int STATUS_FLAGGED = 3;
-
- public static final int STATUS_REJECTED = 4;
-
- public int GetStatus(int /*long*/ aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
- }
-
- public static final int POLICY_UNKNOWN = 0;
-
- public static final int POLICY_NONE = 1;
-
- public static final int POLICY_NO_CONSENT = 2;
-
- public static final int POLICY_IMPLICIT_CONSENT = 3;
-
- public static final int POLICY_EXPLICIT_CONSENT = 4;
-
- public static final int POLICY_NO_II = 5;
-
- public int GetPolicy(int /*long*/ aPolicy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
- }
-}
\ No newline at end of file
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aExpires);
+ }
+
+ public static final int STATUS_UNKNOWN = 0;
+
+ public static final int STATUS_ACCEPTED = 1;
+
+ public static final int STATUS_DOWNGRADED = 2;
+
+ public static final int STATUS_FLAGGED = 3;
+
+ public static final int STATUS_REJECTED = 4;
+
+ public int GetStatus(int /*long*/ aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aStatus);
+ }
+
+ public static final int POLICY_UNKNOWN = 0;
+
+ public static final int POLICY_NONE = 1;
+
+ public static final int POLICY_NO_CONSENT = 2;
+
+ public static final int POLICY_IMPLICIT_CONSENT = 3;
+
+ public static final int POLICY_EXPLICIT_CONSENT = 4;
+
+ public static final int POLICY_NO_II = 5;
+
+ public int GetPolicy(int /*long*/ aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPolicy);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsICookieManager.java b/org/eclipse/swt/internal/mozilla/nsICookieManager.java
old mode 100755
new mode 100644
index cda96b1..a925dd8
--- a/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+++ b/org/eclipse/swt/internal/mozilla/nsICookieManager.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsICookieManager extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
- public static final String NS_ICOOKIEMANAGER_IID_STR =
- "aaab6710-0f2c-11d5-a53b-0010a401eb10";
-
- public static final nsID NS_ICOOKIEMANAGER_IID =
- new nsID(NS_ICOOKIEMANAGER_IID_STR);
-
- public nsICookieManager(int /*long*/ address) {
- super(address);
- }
-
- public int RemoveAll() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
- public int GetEnumerator(int /*long*/[] aEnumerator) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
- }
-
- public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsICookieManager extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+ public static final String NS_ICOOKIEMANAGER_IID_STR =
+ "aaab6710-0f2c-11d5-a53b-0010a401eb10";
+
+ public static final nsID NS_ICOOKIEMANAGER_IID =
+ new nsID(NS_ICOOKIEMANAGER_IID_STR);
+
+ public nsICookieManager(int /*long*/ address) {
+ super(address);
+ }
+
+ public int RemoveAll() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+ public int GetEnumerator(int /*long*/[] aEnumerator) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEnumerator);
+ }
+
+ public int Remove(int /*long*/ aDomain, int /*long*/ aName, int /*long*/ aPath, int aBlocked) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDomain, aName, aPath, aBlocked);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIMemory.java b/org/eclipse/swt/internal/mozilla/nsICookieService.java
old mode 100755
new mode 100644
similarity index 57%
copy from org/eclipse/swt/internal/mozilla/nsIMemory.java
copy to org/eclipse/swt/internal/mozilla/nsICookieService.java
index 4ff830a..f3faf9b
--- a/org/eclipse/swt/internal/mozilla/nsIMemory.java
+++ b/org/eclipse/swt/internal/mozilla/nsICookieService.java
@@ -1,3 +1,4 @@
+package org.eclipse.swt.internal.mozilla;
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1
*
@@ -25,39 +26,39 @@
* - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-public class nsIMemory extends nsISupports {
+
+public class nsICookieService extends nsISupports {
static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
- public static final String NS_IMEMORY_IID_STR =
- "59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";
+ public static final String NS_ICOOKIESERVICE_IID_STR =
+ "011c3190-1434-11d6-a618-0010a401eb10";
- public static final nsID NS_IMEMORY_IID =
- new nsID(NS_IMEMORY_IID_STR);
+ public static final nsID NS_ICOOKIESERVICE_IID =
+ new nsID(NS_ICOOKIESERVICE_IID_STR);
- public nsIMemory(int /*long*/ address) {
+ public nsICookieService(int /*long*/ address) {
super(address);
}
- public int Alloc(int size) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), size);
+ public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
}
- public int Realloc(int /*long*/ ptr, int newSize) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ptr, newSize);
+ public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
}
- public int Free(int /*long*/ ptr) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
+ public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
}
- public int HeapMinimize(int immediate) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
+ public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
- public int IsLowMemory(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+ public int GetCookieIconIsVisible(int[] aCookieIconIsVisible) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aCookieIconIsVisible);
}
-}
\ No newline at end of file
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
old mode 100755
new mode 100644
similarity index 58%
copy from org/eclipse/swt/internal/mozilla/nsIServiceManager.java
copy to org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
index 9a09f90..0824f34
--- a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+++ b/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
@@ -27,33 +27,33 @@
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
-public class nsIServiceManager extends nsISupports {
+public class nsICookieService_1_9 extends nsISupports {
static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
- public static final String NS_ISERVICEMANAGER_IID_STR =
- "8bb35ed9-e332-462d-9155-4a002ab5c958";
+ public static final String NS_ICOOKIESERVICE_IID_STR =
+ "2aaa897a-293c-4d2b-a657-8c9b7136996d";
- public static final nsID NS_ISERVICEMANAGER_IID =
- new nsID(NS_ISERVICEMANAGER_IID_STR);
+ public static final nsID NS_ICOOKIESERVICE_IID =
+ new nsID(NS_ICOOKIESERVICE_IID_STR);
- public nsIServiceManager(int /*long*/ address) {
+ public nsICookieService_1_9(int /*long*/ address) {
super(address);
}
- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+ public int GetCookieString(int /*long*/ aURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, aChannel, _retval);
}
- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+ public int GetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aChannel, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aURI, aFirstURI, aChannel, _retval);
}
- public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
+ public int SetCookieString(int /*long*/ aURI, int /*long*/ aPrompt, byte[] aCookie, int /*long*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aPrompt, aCookie, aChannel);
}
- public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
+ public int SetCookieStringFromHttp(int /*long*/ aURI, int /*long*/ aFirstURI, int /*long*/ aPrompt, byte[] aCookie, byte[] aServerTime, int /*long*/ aChannel) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aURI, aFirstURI, aPrompt, aCookie, aServerTime, aChannel);
}
-}
\ No newline at end of file
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsID.java b/org/eclipse/swt/internal/mozilla/nsID.java
old mode 100755
new mode 100644
index d92dbcf..a5fd6d8
--- a/org/eclipse/swt/internal/mozilla/nsID.java
+++ b/org/eclipse/swt/internal/mozilla/nsID.java
@@ -27,6 +27,7 @@
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
+/** @jniclass flags=cpp */
public class nsID {
public int m0;
@@ -43,18 +44,18 @@ public nsID(String id) {
}
public boolean Equals(nsID other) {
- int /*long*/ ptr = XPCOM.nsID_new();
- XPCOM.memmove(ptr, this, nsID.sizeof);
- int /*long*/ otherPtr = XPCOM.nsID_new();
- XPCOM.memmove(otherPtr, other, nsID.sizeof);
- boolean result = XPCOM.nsID_Equals(ptr, otherPtr) != 0;
- XPCOM.nsID_delete(ptr);
- XPCOM.nsID_delete(otherPtr);
+ int /*long*/ ptr = XPCOM.nsID_new ();
+ XPCOM.memmove (ptr, this, nsID.sizeof);
+ int /*long*/ otherPtr = XPCOM.nsID_new ();
+ XPCOM.memmove (otherPtr, other, nsID.sizeof);
+ boolean result = XPCOM.nsID_Equals (ptr, otherPtr) != 0;
+ XPCOM.nsID_delete (ptr);
+ XPCOM.nsID_delete (otherPtr);
return result;
}
public void Parse (String aIDStr) {
- if(aIDStr == null) throw new Error ();
+ if (aIDStr == null) throw new Error ();
int i = 0;
for (; i < 8; i++) m0 = (m0 << 4) + Integer.parseInt (aIDStr.substring (i, i + 1), 16);
if (aIDStr.charAt (i++) != '-') throw new Error ();
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
old mode 100755
new mode 100644
index 755a708..b07be67
--- a/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
@@ -1,89 +1,89 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMEvent extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
- public static final String NS_IDOMEVENT_IID_STR =
- "a66b7b80-ff46-bd97-0080-5f8ae38add32";
-
- public static final nsID NS_IDOMEVENT_IID =
- new nsID(NS_IDOMEVENT_IID_STR);
-
- public nsIDOMEvent(int /*long*/ address) {
- super(address);
- }
-
- public static final int CAPTURING_PHASE = 1;
-
- public static final int AT_TARGET = 2;
-
- public static final int BUBBLING_PHASE = 3;
-
- public int GetType(int /*long*/ aType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
- }
-
- public int GetTarget(int /*long*/[] aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
- }
-
- public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
- }
-
- public int GetEventPhase(short[] aEventPhase) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
- }
-
- public int GetBubbles(int[] aBubbles) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
- }
-
- public int GetCancelable(int[] aCancelable) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
- }
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMEvent extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+ public static final String NS_IDOMEVENT_IID_STR =
+ "a66b7b80-ff46-bd97-0080-5f8ae38add32";
+
+ public static final nsID NS_IDOMEVENT_IID =
+ new nsID(NS_IDOMEVENT_IID_STR);
+
+ public nsIDOMEvent(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int CAPTURING_PHASE = 1;
+
+ public static final int AT_TARGET = 2;
+
+ public static final int BUBBLING_PHASE = 3;
+
+ public int GetType(int /*long*/ aType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aType);
+ }
+
+ public int GetTarget(int /*long*/[] aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aTarget);
+ }
+
+ public int GetCurrentTarget(int /*long*/[] aCurrentTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aCurrentTarget);
+ }
+
+ public int GetEventPhase(short[] aEventPhase) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEventPhase);
+ }
+
+ public int GetBubbles(int[] aBubbles) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aBubbles);
+ }
+
+ public int GetCancelable(int[] aCancelable) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCancelable);
+ }
+
public int GetTimeStamp(int /*long*/[] aTimeStamp) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
- }
-
- public int StopPropagation() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
-
- public int PreventDefault() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
- }
-
- public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
- }
-}
\ No newline at end of file
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTimeStamp);
+ }
+
+ public int StopPropagation() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+ }
+
+ public int PreventDefault() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress());
+ }
+
+ public int InitEvent(int /*long*/ eventTypeArg, int canBubbleArg, int cancelableArg) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), eventTypeArg, canBubbleArg, cancelableArg);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java b/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
old mode 100755
new mode 100644
index 3c8cac5..fd08c33
--- a/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMEventTarget extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
- public static final String NS_IDOMEVENTTARGET_IID_STR =
- "1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
-
- public static final nsID NS_IDOMEVENTTARGET_IID =
- new nsID(NS_IDOMEVENTTARGET_IID_STR);
-
- public nsIDOMEventTarget(int /*long*/ address) {
- super(address);
- }
-
- public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
- }
-
- public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
- }
-
- public int DispatchEvent(int /*long*/ evt, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMEventTarget extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+ public static final String NS_IDOMEVENTTARGET_IID_STR =
+ "1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
+
+ public static final nsID NS_IDOMEVENTTARGET_IID =
+ new nsID(NS_IDOMEVENTTARGET_IID_STR);
+
+ public nsIDOMEventTarget(int /*long*/ address) {
+ super(address);
+ }
+
+ public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
+ }
+
+ public int RemoveEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture);
+ }
+
+ public int DispatchEvent(int /*long*/ evt, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
old mode 100755
new mode 100644
index 05db310..906c132
--- a/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
@@ -1,299 +1,299 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMKeyEvent extends nsIDOMUIEvent {
-
- static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 7;
-
- public static final String NS_IDOMKEYEVENT_IID_STR =
- "028e0e6e-8b01-11d3-aae7-0010838a3123";
-
- public static final nsID NS_IDOMKEYEVENT_IID =
- new nsID(NS_IDOMKEYEVENT_IID_STR);
-
- public nsIDOMKeyEvent(int /*long*/ address) {
- super(address);
- }
-
- public static final int DOM_VK_CANCEL = 3;
-
- public static final int DOM_VK_HELP = 6;
-
- public static final int DOM_VK_BACK_SPACE = 8;
-
- public static final int DOM_VK_TAB = 9;
-
- public static final int DOM_VK_CLEAR = 12;
-
- public static final int DOM_VK_RETURN = 13;
-
- public static final int DOM_VK_ENTER = 14;
-
- public static final int DOM_VK_SHIFT = 16;
-
- public static final int DOM_VK_CONTROL = 17;
-
- public static final int DOM_VK_ALT = 18;
-
- public static final int DOM_VK_PAUSE = 19;
-
- public static final int DOM_VK_CAPS_LOCK = 20;
-
- public static final int DOM_VK_ESCAPE = 27;
-
- public static final int DOM_VK_SPACE = 32;
-
- public static final int DOM_VK_PAGE_UP = 33;
-
- public static final int DOM_VK_PAGE_DOWN = 34;
-
- public static final int DOM_VK_END = 35;
-
- public static final int DOM_VK_HOME = 36;
-
- public static final int DOM_VK_LEFT = 37;
-
- public static final int DOM_VK_UP = 38;
-
- public static final int DOM_VK_RIGHT = 39;
-
- public static final int DOM_VK_DOWN = 40;
-
- public static final int DOM_VK_PRINTSCREEN = 44;
-
- public static final int DOM_VK_INSERT = 45;
-
- public static final int DOM_VK_DELETE = 46;
-
- public static final int DOM_VK_0 = 48;
-
- public static final int DOM_VK_1 = 49;
-
- public static final int DOM_VK_2 = 50;
-
- public static final int DOM_VK_3 = 51;
-
- public static final int DOM_VK_4 = 52;
-
- public static final int DOM_VK_5 = 53;
-
- public static final int DOM_VK_6 = 54;
-
- public static final int DOM_VK_7 = 55;
-
- public static final int DOM_VK_8 = 56;
-
- public static final int DOM_VK_9 = 57;
-
- public static final int DOM_VK_SEMICOLON = 59;
-
- public static final int DOM_VK_EQUALS = 61;
-
- public static final int DOM_VK_A = 65;
-
- public static final int DOM_VK_B = 66;
-
- public static final int DOM_VK_C = 67;
-
- public static final int DOM_VK_D = 68;
-
- public static final int DOM_VK_E = 69;
-
- public static final int DOM_VK_F = 70;
-
- public static final int DOM_VK_G = 71;
-
- public static final int DOM_VK_H = 72;
-
- public static final int DOM_VK_I = 73;
-
- public static final int DOM_VK_J = 74;
-
- public static final int DOM_VK_K = 75;
-
- public static final int DOM_VK_L = 76;
-
- public static final int DOM_VK_M = 77;
-
- public static final int DOM_VK_N = 78;
-
- public static final int DOM_VK_O = 79;
-
- public static final int DOM_VK_P = 80;
-
- public static final int DOM_VK_Q = 81;
-
- public static final int DOM_VK_R = 82;
-
- public static final int DOM_VK_S = 83;
-
- public static final int DOM_VK_T = 84;
-
- public static final int DOM_VK_U = 85;
-
- public static final int DOM_VK_V = 86;
-
- public static final int DOM_VK_W = 87;
-
- public static final int DOM_VK_X = 88;
-
- public static final int DOM_VK_Y = 89;
-
- public static final int DOM_VK_Z = 90;
-
- public static final int DOM_VK_NUMPAD0 = 96;
-
- public static final int DOM_VK_NUMPAD1 = 97;
-
- public static final int DOM_VK_NUMPAD2 = 98;
-
- public static final int DOM_VK_NUMPAD3 = 99;
-
- public static final int DOM_VK_NUMPAD4 = 100;
-
- public static final int DOM_VK_NUMPAD5 = 101;
-
- public static final int DOM_VK_NUMPAD6 = 102;
-
- public static final int DOM_VK_NUMPAD7 = 103;
-
- public static final int DOM_VK_NUMPAD8 = 104;
-
- public static final int DOM_VK_NUMPAD9 = 105;
-
- public static final int DOM_VK_MULTIPLY = 106;
-
- public static final int DOM_VK_ADD = 107;
-
- public static final int DOM_VK_SEPARATOR = 108;
-
- public static final int DOM_VK_SUBTRACT = 109;
-
- public static final int DOM_VK_DECIMAL = 110;
-
- public static final int DOM_VK_DIVIDE = 111;
-
- public static final int DOM_VK_F1 = 112;
-
- public static final int DOM_VK_F2 = 113;
-
- public static final int DOM_VK_F3 = 114;
-
- public static final int DOM_VK_F4 = 115;
-
- public static final int DOM_VK_F5 = 116;
-
- public static final int DOM_VK_F6 = 117;
-
- public static final int DOM_VK_F7 = 118;
-
- public static final int DOM_VK_F8 = 119;
-
- public static final int DOM_VK_F9 = 120;
-
- public static final int DOM_VK_F10 = 121;
-
- public static final int DOM_VK_F11 = 122;
-
- public static final int DOM_VK_F12 = 123;
-
- public static final int DOM_VK_F13 = 124;
-
- public static final int DOM_VK_F14 = 125;
-
- public static final int DOM_VK_F15 = 126;
-
- public static final int DOM_VK_F16 = 127;
-
- public static final int DOM_VK_F17 = 128;
-
- public static final int DOM_VK_F18 = 129;
-
- public static final int DOM_VK_F19 = 130;
-
- public static final int DOM_VK_F20 = 131;
-
- public static final int DOM_VK_F21 = 132;
-
- public static final int DOM_VK_F22 = 133;
-
- public static final int DOM_VK_F23 = 134;
-
- public static final int DOM_VK_F24 = 135;
-
- public static final int DOM_VK_NUM_LOCK = 144;
-
- public static final int DOM_VK_SCROLL_LOCK = 145;
-
- public static final int DOM_VK_COMMA = 188;
-
- public static final int DOM_VK_PERIOD = 190;
-
- public static final int DOM_VK_SLASH = 191;
-
- public static final int DOM_VK_BACK_QUOTE = 192;
-
- public static final int DOM_VK_OPEN_BRACKET = 219;
-
- public static final int DOM_VK_BACK_SLASH = 220;
-
- public static final int DOM_VK_CLOSE_BRACKET = 221;
-
- public static final int DOM_VK_QUOTE = 222;
-
- public static final int DOM_VK_META = 224;
-
- public int GetCharCode(int[] aCharCode) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aCharCode);
- }
-
- public int GetKeyCode(int[] aKeyCode) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aKeyCode);
- }
-
- public int GetAltKey(int[] aAltKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aAltKey);
- }
-
- public int GetCtrlKey(int[] aCtrlKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aCtrlKey);
- }
-
- public int GetShiftKey(int[] aShiftKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aShiftKey);
- }
-
- public int GetMetaKey(int[] aMetaKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
- }
-
- public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMKeyEvent extends nsIDOMUIEvent {
+
+ static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 7;
+
+ public static final String NS_IDOMKEYEVENT_IID_STR =
+ "028e0e6e-8b01-11d3-aae7-0010838a3123";
+
+ public static final nsID NS_IDOMKEYEVENT_IID =
+ new nsID(NS_IDOMKEYEVENT_IID_STR);
+
+ public nsIDOMKeyEvent(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int DOM_VK_CANCEL = 3;
+
+ public static final int DOM_VK_HELP = 6;
+
+ public static final int DOM_VK_BACK_SPACE = 8;
+
+ public static final int DOM_VK_TAB = 9;
+
+ public static final int DOM_VK_CLEAR = 12;
+
+ public static final int DOM_VK_RETURN = 13;
+
+ public static final int DOM_VK_ENTER = 14;
+
+ public static final int DOM_VK_SHIFT = 16;
+
+ public static final int DOM_VK_CONTROL = 17;
+
+ public static final int DOM_VK_ALT = 18;
+
+ public static final int DOM_VK_PAUSE = 19;
+
+ public static final int DOM_VK_CAPS_LOCK = 20;
+
+ public static final int DOM_VK_ESCAPE = 27;
+
+ public static final int DOM_VK_SPACE = 32;
+
+ public static final int DOM_VK_PAGE_UP = 33;
+
+ public static final int DOM_VK_PAGE_DOWN = 34;
+
+ public static final int DOM_VK_END = 35;
+
+ public static final int DOM_VK_HOME = 36;
+
+ public static final int DOM_VK_LEFT = 37;
+
+ public static final int DOM_VK_UP = 38;
+
+ public static final int DOM_VK_RIGHT = 39;
+
+ public static final int DOM_VK_DOWN = 40;
+
+ public static final int DOM_VK_PRINTSCREEN = 44;
+
+ public static final int DOM_VK_INSERT = 45;
+
+ public static final int DOM_VK_DELETE = 46;
+
+ public static final int DOM_VK_0 = 48;
+
+ public static final int DOM_VK_1 = 49;
+
+ public static final int DOM_VK_2 = 50;
+
+ public static final int DOM_VK_3 = 51;
+
+ public static final int DOM_VK_4 = 52;
+
+ public static final int DOM_VK_5 = 53;
+
+ public static final int DOM_VK_6 = 54;
+
+ public static final int DOM_VK_7 = 55;
+
+ public static final int DOM_VK_8 = 56;
+
+ public static final int DOM_VK_9 = 57;
+
+ public static final int DOM_VK_SEMICOLON = 59;
+
+ public static final int DOM_VK_EQUALS = 61;
+
+ public static final int DOM_VK_A = 65;
+
+ public static final int DOM_VK_B = 66;
+
+ public static final int DOM_VK_C = 67;
+
+ public static final int DOM_VK_D = 68;
+
+ public static final int DOM_VK_E = 69;
+
+ public static final int DOM_VK_F = 70;
+
+ public static final int DOM_VK_G = 71;
+
+ public static final int DOM_VK_H = 72;
+
+ public static final int DOM_VK_I = 73;
+
+ public static final int DOM_VK_J = 74;
+
+ public static final int DOM_VK_K = 75;
+
+ public static final int DOM_VK_L = 76;
+
+ public static final int DOM_VK_M = 77;
+
+ public static final int DOM_VK_N = 78;
+
+ public static final int DOM_VK_O = 79;
+
+ public static final int DOM_VK_P = 80;
+
+ public static final int DOM_VK_Q = 81;
+
+ public static final int DOM_VK_R = 82;
+
+ public static final int DOM_VK_S = 83;
+
+ public static final int DOM_VK_T = 84;
+
+ public static final int DOM_VK_U = 85;
+
+ public static final int DOM_VK_V = 86;
+
+ public static final int DOM_VK_W = 87;
+
+ public static final int DOM_VK_X = 88;
+
+ public static final int DOM_VK_Y = 89;
+
+ public static final int DOM_VK_Z = 90;
+
+ public static final int DOM_VK_NUMPAD0 = 96;
+
+ public static final int DOM_VK_NUMPAD1 = 97;
+
+ public static final int DOM_VK_NUMPAD2 = 98;
+
+ public static final int DOM_VK_NUMPAD3 = 99;
+
+ public static final int DOM_VK_NUMPAD4 = 100;
+
+ public static final int DOM_VK_NUMPAD5 = 101;
+
+ public static final int DOM_VK_NUMPAD6 = 102;
+
+ public static final int DOM_VK_NUMPAD7 = 103;
+
+ public static final int DOM_VK_NUMPAD8 = 104;
+
+ public static final int DOM_VK_NUMPAD9 = 105;
+
+ public static final int DOM_VK_MULTIPLY = 106;
+
+ public static final int DOM_VK_ADD = 107;
+
+ public static final int DOM_VK_SEPARATOR = 108;
+
+ public static final int DOM_VK_SUBTRACT = 109;
+
+ public static final int DOM_VK_DECIMAL = 110;
+
+ public static final int DOM_VK_DIVIDE = 111;
+
+ public static final int DOM_VK_F1 = 112;
+
+ public static final int DOM_VK_F2 = 113;
+
+ public static final int DOM_VK_F3 = 114;
+
+ public static final int DOM_VK_F4 = 115;
+
+ public static final int DOM_VK_F5 = 116;
+
+ public static final int DOM_VK_F6 = 117;
+
+ public static final int DOM_VK_F7 = 118;
+
+ public static final int DOM_VK_F8 = 119;
+
+ public static final int DOM_VK_F9 = 120;
+
+ public static final int DOM_VK_F10 = 121;
+
+ public static final int DOM_VK_F11 = 122;
+
+ public static final int DOM_VK_F12 = 123;
+
+ public static final int DOM_VK_F13 = 124;
+
+ public static final int DOM_VK_F14 = 125;
+
+ public static final int DOM_VK_F15 = 126;
+
+ public static final int DOM_VK_F16 = 127;
+
+ public static final int DOM_VK_F17 = 128;
+
+ public static final int DOM_VK_F18 = 129;
+
+ public static final int DOM_VK_F19 = 130;
+
+ public static final int DOM_VK_F20 = 131;
+
+ public static final int DOM_VK_F21 = 132;
+
+ public static final int DOM_VK_F22 = 133;
+
+ public static final int DOM_VK_F23 = 134;
+
+ public static final int DOM_VK_F24 = 135;
+
+ public static final int DOM_VK_NUM_LOCK = 144;
+
+ public static final int DOM_VK_SCROLL_LOCK = 145;
+
+ public static final int DOM_VK_COMMA = 188;
+
+ public static final int DOM_VK_PERIOD = 190;
+
+ public static final int DOM_VK_SLASH = 191;
+
+ public static final int DOM_VK_BACK_QUOTE = 192;
+
+ public static final int DOM_VK_OPEN_BRACKET = 219;
+
+ public static final int DOM_VK_BACK_SLASH = 220;
+
+ public static final int DOM_VK_CLOSE_BRACKET = 221;
+
+ public static final int DOM_VK_QUOTE = 222;
+
+ public static final int DOM_VK_META = 224;
+
+ public int GetCharCode(int[] aCharCode) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aCharCode);
+ }
+
+ public int GetKeyCode(int[] aKeyCode) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aKeyCode);
+ }
+
+ public int GetAltKey(int[] aAltKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aAltKey);
+ }
+
+ public int GetCtrlKey(int[] aCtrlKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aCtrlKey);
+ }
+
+ public int GetShiftKey(int[] aShiftKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aShiftKey);
+ }
+
+ public int GetMetaKey(int[] aMetaKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aMetaKey);
+ }
+
+ public int InitKeyEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, int keyCodeArg, int charCodeArg) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, keyCodeArg, charCodeArg);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
old mode 100755
new mode 100644
index 5bdb407..71b7a73
--- a/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
@@ -1,87 +1,87 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMMouseEvent extends nsIDOMUIEvent {
-
- static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 11;
-
- public static final String NS_IDOMMOUSEEVENT_IID_STR =
- "ff751edc-8b02-aae7-0010-8301838a3123";
-
- public static final nsID NS_IDOMMOUSEEVENT_IID =
- new nsID(NS_IDOMMOUSEEVENT_IID_STR);
-
- public nsIDOMMouseEvent(int /*long*/ address) {
- super(address);
- }
-
- public int GetScreenX(int[] aScreenX) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aScreenX);
- }
-
- public int GetScreenY(int[] aScreenY) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aScreenY);
- }
-
- public int GetClientX(int[] aClientX) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aClientX);
- }
-
- public int GetClientY(int[] aClientY) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY);
- }
-
- public int GetCtrlKey(int[] aCtrlKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
- }
-
- public int GetShiftKey(int[] aShiftKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
- }
-
- public int GetAltKey(int[] aAltKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);
- }
-
- public int GetMetaKey(int[] aMetaKey) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey);
- }
-
- public int GetButton(short[] aButton) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
- }
-
- public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
- }
-
- public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
- return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMMouseEvent extends nsIDOMUIEvent {
+
+ static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 11;
+
+ public static final String NS_IDOMMOUSEEVENT_IID_STR =
+ "ff751edc-8b02-aae7-0010-8301838a3123";
+
+ public static final nsID NS_IDOMMOUSEEVENT_IID =
+ new nsID(NS_IDOMMOUSEEVENT_IID_STR);
+
+ public nsIDOMMouseEvent(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetScreenX(int[] aScreenX) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 1, getAddress(), aScreenX);
+ }
+
+ public int GetScreenY(int[] aScreenY) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 2, getAddress(), aScreenY);
+ }
+
+ public int GetClientX(int[] aClientX) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aClientX);
+ }
+
+ public int GetClientY(int[] aClientY) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY);
+ }
+
+ public int GetCtrlKey(int[] aCtrlKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey);
+ }
+
+ public int GetShiftKey(int[] aShiftKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey);
+ }
+
+ public int GetAltKey(int[] aAltKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey);
+ }
+
+ public int GetMetaKey(int[] aMetaKey) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey);
+ }
+
+ public int GetButton(short[] aButton) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton);
+ }
+
+ public int GetRelatedTarget(int /*long*/[] aRelatedTarget) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget);
+ }
+
+ public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ relatedTargetArg) {
+ return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java b/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java b/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
old mode 100755
new mode 100644
index 7c06e04..3a35f4b
--- a/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMUIEvent extends nsIDOMEvent {
-
- static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + 3;
-
- public static final String NS_IDOMUIEVENT_IID_STR =
- "a6cf90c3-15b3-11d2-932e-00805f8add32";
-
- public static final nsID NS_IDOMUIEVENT_IID =
- new nsID(NS_IDOMUIEVENT_IID_STR);
-
- public nsIDOMUIEvent(int /*long*/ address) {
- super(address);
- }
-
- public int GetView(int /*long*/[] aView) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
- }
-
- public int GetDetail(int[] aDetail) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
- }
-
- public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
- return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMUIEvent extends nsIDOMEvent {
+
+ static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + 3;
+
+ public static final String NS_IDOMUIEVENT_IID_STR =
+ "a6cf90c3-15b3-11d2-932e-00805f8add32";
+
+ public static final nsID NS_IDOMUIEVENT_IID =
+ new nsID(NS_IDOMUIEVENT_IID_STR);
+
+ public nsIDOMUIEvent(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetView(int /*long*/[] aView) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 1, getAddress(), aView);
+ }
+
+ public int GetDetail(int[] aDetail) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 2, getAddress(), aDetail);
+ }
+
+ public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
+ return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java b/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java b/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
old mode 100755
new mode 100644
index 6926f5a..663688a
--- a/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDOMWindowCollection extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
- public static final String NS_IDOMWINDOWCOLLECTION_IID_STR =
- "a6cf906f-15b3-11d2-932e-00805f8add32";
-
- public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
- new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
-
- public nsIDOMWindowCollection(int /*long*/ address) {
- super(address);
- }
-
- public int GetLength(int[] aLength) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
- }
-
- public int Item(int index, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
- }
-
- public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDOMWindowCollection extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+ public static final String NS_IDOMWINDOWCOLLECTION_IID_STR =
+ "a6cf906f-15b3-11d2-932e-00805f8add32";
+
+ public static final nsID NS_IDOMWINDOWCOLLECTION_IID =
+ new nsID(NS_IDOMWINDOWCOLLECTION_IID_STR);
+
+ public nsIDOMWindowCollection(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetLength(int[] aLength) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aLength);
+ }
+
+ public int Item(int index, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), index, _retval);
+ }
+
+ public int NamedItem(int /*long*/ name, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), name, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDataType.java b/org/eclipse/swt/internal/mozilla/nsIDataType.java
new file mode 100644
index 0000000..88e6093
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIDataType.java
@@ -0,0 +1,73 @@
+package org.eclipse.swt.internal.mozilla;
+
+
+public class nsIDataType extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 0;
+
+ public static final String NS_IDATATYPE_IID_STR =
+ "4d12e540-83d7-11d5-90ed-0010a4e73d9a";
+
+ public static final nsID NS_IDATATYPE_IID =
+ new nsID(NS_IDATATYPE_IID_STR);
+
+ public nsIDataType(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final short VTYPE_INT8 = 0;
+
+ public static final short VTYPE_INT16 = 1;
+
+ public static final short VTYPE_INT32 = 2;
+
+ public static final short VTYPE_INT64 = 3;
+
+ public static final short VTYPE_UINT8 = 4;
+
+ public static final short VTYPE_UINT16 = 5;
+
+ public static final short VTYPE_UINT32 = 6;
+
+ public static final short VTYPE_UINT64 = 7;
+
+ public static final short VTYPE_FLOAT = 8;
+
+ public static final short VTYPE_DOUBLE = 9;
+
+ public static final short VTYPE_BOOL = 10;
+
+ public static final short VTYPE_CHAR = 11;
+
+ public static final short VTYPE_WCHAR = 12;
+
+ public static final short VTYPE_VOID = 13;
+
+ public static final short VTYPE_ID = 14;
+
+ public static final short VTYPE_DOMSTRING = 15;
+
+ public static final short VTYPE_CHAR_STR = 16;
+
+ public static final short VTYPE_WCHAR_STR = 17;
+
+ public static final short VTYPE_INTERFACE = 18;
+
+ public static final short VTYPE_INTERFACE_IS = 19;
+
+ public static final short VTYPE_ARRAY = 20;
+
+ public static final short VTYPE_STRING_SIZE_IS = 21;
+
+ public static final short VTYPE_WSTRING_SIZE_IS = 22;
+
+ public static final short VTYPE_UTF8STRING = 23;
+
+ public static final short VTYPE_CSTRING = 24;
+
+ public static final short VTYPE_ASTRING = 25;
+
+ public static final short VTYPE_EMPTY_ARRAY = 254;
+
+ public static final short VTYPE_EMPTY = 255;
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
old mode 100755
new mode 100644
index a96aadd..58aef5f
--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryService extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
- public static final String NS_IDIRECTORYSERVICE_IID_STR =
- "57a66a60-d43a-11d3-8cc2-00609792278c";
-
- public static final nsID NS_IDIRECTORYSERVICE_IID =
- new nsID(NS_IDIRECTORYSERVICE_IID_STR);
-
- public nsIDirectoryService(int /*long*/ address) {
- super(address);
- }
-
- public int Init() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
- public int RegisterProvider(int /*long*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
- }
-
- public int UnregisterProvider(int /*long*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDirectoryService extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+ public static final String NS_IDIRECTORYSERVICE_IID_STR =
+ "57a66a60-d43a-11d3-8cc2-00609792278c";
+
+ public static final nsID NS_IDIRECTORYSERVICE_IID =
+ new nsID(NS_IDIRECTORYSERVICE_IID_STR);
+
+ public nsIDirectoryService(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Init() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+ public int RegisterProvider(int /*long*/ prov) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
+ }
+
+ public int UnregisterProvider(int /*long*/ prov) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
old mode 100755
new mode 100644
index 9b80511..8998396
--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
@@ -1,47 +1,47 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryServiceProvider extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
- public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =
- "bbf8cab0-d43a-11d3-8cc2-00609792278c";
-
- public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
- new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
-
- public nsIDirectoryServiceProvider(int /*long*/ address) {
- super(address);
- }
-
- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDirectoryServiceProvider extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+
+ public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =
+ "bbf8cab0-d43a-11d3-8cc2-00609792278c";
+
+ public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
+ new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
+
+ public nsIDirectoryServiceProvider(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java b/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/org/eclipse/swt/internal/mozilla/nsIDocShell.java
old mode 100755
new mode 100644
index 6a9f19a..bed487c
--- a/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDocShell.java
@@ -1,269 +1,269 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDocShell extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 51;
-
- public static final String NS_IDOCSHELL_IID_STR =
- "69e5de00-7b8b-11d3-af61-00a024ffc08c";
-
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
- public nsIDocShell(int /*long*/ address) {
- super(address);
- }
-
- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
- public int CreateLoadInfo(int /*long*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
- public int PrepareForNewContentModel() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
- public int SetCurrentURI(int /*long*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
- public int FireUnloadNotification() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
- }
-
- public int GetPresContext(int /*long*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
- public int GetPresShell(int /*long*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
- public int GetContentViewer(int /*long*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
- public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
- }
-
- public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
- }
-
- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
- }
-
- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
- }
-
- public int GetAllowPlugins(int[] aAllowPlugins) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowPlugins);
- }
-
- public int SetAllowPlugins(int aAllowPlugins) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowPlugins);
- }
-
- public int GetAllowJavascript(int[] aAllowJavascript) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);
- }
-
- public int SetAllowJavascript(int aAllowJavascript) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);
- }
-
- public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowMetaRedirects);
- }
-
- public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowMetaRedirects);
- }
-
- public int GetAllowSubframes(int[] aAllowSubframes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowSubframes);
- }
-
- public int SetAllowSubframes(int aAllowSubframes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowSubframes);
- }
-
- public int GetAllowImages(int[] aAllowImages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aAllowImages);
- }
-
- public int SetAllowImages(int aAllowImages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAllowImages);
- }
-
- public static final int ENUMERATE_FORWARDS = 0;
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
- }
-
- public static final int APP_TYPE_UNKNOWN = 0;
-
- public static final int APP_TYPE_MAIL = 1;
-
- public int GetAppType(int[] aAppType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAppType);
- }
-
- public int SetAppType(int aAppType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAppType);
- }
-
- public int GetAllowAuth(int[] aAllowAuth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);
- }
-
- public int SetAllowAuth(int aAllowAuth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);
- }
-
- public int GetZoom(float[] aZoom) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aZoom);
- }
-
- public int SetZoom(float aZoom) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aZoom);
- }
-
- public int GetMarginWidth(int[] aMarginWidth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginWidth);
- }
-
- public int SetMarginWidth(int aMarginWidth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginWidth);
- }
-
- public int GetMarginHeight(int[] aMarginHeight) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aMarginHeight);
- }
-
- public int SetMarginHeight(int aMarginHeight) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);
- }
-
- public int GetHasFocus(int[] aHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aHasFocus);
- }
-
- public int SetHasFocus(int aHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aHasFocus);
- }
-
- public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aCanvasHasFocus);
- }
-
- public int SetCanvasHasFocus(int aCanvasHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aCanvasHasFocus);
- }
-
- public int TabToTreeOwner(int forward, int[] tookFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), forward, tookFocus);
- }
-
- public static final int BUSY_FLAGS_NONE = 0;
-
- public static final int BUSY_FLAGS_BUSY = 1;
-
- public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
-
- public static final int BUSY_FLAGS_PAGE_LOADING = 4;
-
- public static final int LOAD_CMD_NORMAL = 1;
-
- public static final int LOAD_CMD_RELOAD = 2;
-
- public static final int LOAD_CMD_HISTORY = 4;
-
- public int GetBusyFlags(int[] aBusyFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aBusyFlags);
- }
-
- public int GetLoadType(int[] aLoadType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aLoadType);
- }
-
- public int SetLoadType(int aLoadType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aLoadType);
- }
-
- public int IsBeingDestroyed(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);
- }
-
- public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
- }
-
- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
- }
-
- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
- }
-
- public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDocShell extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 51;
+
+ public static final String NS_IDOCSHELL_IID_STR =
+ "69e5de00-7b8b-11d3-af61-00a024ffc08c";
+
+ public static final nsID NS_IDOCSHELL_IID =
+ new nsID(NS_IDOCSHELL_IID_STR);
+
+ public nsIDocShell(int /*long*/ address) {
+ super(address);
+ }
+
+ public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+ }
+
+ public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+ }
+
+ public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aInheritOwner, char[] aWindowTarget, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aInheritOwner, aWindowTarget, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+ }
+
+ public int CreateLoadInfo(int /*long*/[] loadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+ }
+
+ public int PrepareForNewContentModel() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+ public int SetCurrentURI(int /*long*/ aURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+ }
+
+ public int FireUnloadNotification() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress());
+ }
+
+ public int GetPresContext(int /*long*/[] aPresContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+ }
+
+ public int GetPresShell(int /*long*/[] aPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+ }
+
+ public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+ }
+
+ public int GetContentViewer(int /*long*/[] aContentViewer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+ }
+
+ public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+ }
+
+ public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+ }
+
+ public int GetParentURIContentListener(int /*long*/[] aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aParentURIContentListener);
+ }
+
+ public int SetParentURIContentListener(int /*long*/ aParentURIContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aParentURIContentListener);
+ }
+
+ public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aDocumentCharsetInfo);
+ }
+
+ public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aDocumentCharsetInfo);
+ }
+
+ public int GetAllowPlugins(int[] aAllowPlugins) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowPlugins);
+ }
+
+ public int SetAllowPlugins(int aAllowPlugins) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowPlugins);
+ }
+
+ public int GetAllowJavascript(int[] aAllowJavascript) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowJavascript);
+ }
+
+ public int SetAllowJavascript(int aAllowJavascript) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowJavascript);
+ }
+
+ public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowMetaRedirects);
+ }
+
+ public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowMetaRedirects);
+ }
+
+ public int GetAllowSubframes(int[] aAllowSubframes) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowSubframes);
+ }
+
+ public int SetAllowSubframes(int aAllowSubframes) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowSubframes);
+ }
+
+ public int GetAllowImages(int[] aAllowImages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aAllowImages);
+ }
+
+ public int SetAllowImages(int aAllowImages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAllowImages);
+ }
+
+ public static final int ENUMERATE_FORWARDS = 0;
+
+ public static final int ENUMERATE_BACKWARDS = 1;
+
+ public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aItemType, aDirection, _retval);
+ }
+
+ public static final int APP_TYPE_UNKNOWN = 0;
+
+ public static final int APP_TYPE_MAIL = 1;
+
+ public int GetAppType(int[] aAppType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAppType);
+ }
+
+ public int SetAppType(int aAppType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAppType);
+ }
+
+ public int GetAllowAuth(int[] aAllowAuth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aAllowAuth);
+ }
+
+ public int SetAllowAuth(int aAllowAuth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aAllowAuth);
+ }
+
+ public int GetZoom(float[] aZoom) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aZoom);
+ }
+
+ public int SetZoom(float aZoom) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aZoom);
+ }
+
+ public int GetMarginWidth(int[] aMarginWidth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginWidth);
+ }
+
+ public int SetMarginWidth(int aMarginWidth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginWidth);
+ }
+
+ public int GetMarginHeight(int[] aMarginHeight) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aMarginHeight);
+ }
+
+ public int SetMarginHeight(int aMarginHeight) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aMarginHeight);
+ }
+
+ public int GetHasFocus(int[] aHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aHasFocus);
+ }
+
+ public int SetHasFocus(int aHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aHasFocus);
+ }
+
+ public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aCanvasHasFocus);
+ }
+
+ public int SetCanvasHasFocus(int aCanvasHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aCanvasHasFocus);
+ }
+
+ public int TabToTreeOwner(int forward, int[] tookFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), forward, tookFocus);
+ }
+
+ public static final int BUSY_FLAGS_NONE = 0;
+
+ public static final int BUSY_FLAGS_BUSY = 1;
+
+ public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
+
+ public static final int BUSY_FLAGS_PAGE_LOADING = 4;
+
+ public static final int LOAD_CMD_NORMAL = 1;
+
+ public static final int LOAD_CMD_RELOAD = 2;
+
+ public static final int LOAD_CMD_HISTORY = 4;
+
+ public int GetBusyFlags(int[] aBusyFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aBusyFlags);
+ }
+
+ public int GetLoadType(int[] aLoadType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aLoadType);
+ }
+
+ public int SetLoadType(int aLoadType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aLoadType);
+ }
+
+ public int IsBeingDestroyed(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), _retval);
+ }
+
+ public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aIsExecutingOnLoadHandler);
+ }
+
+ public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aLayoutHistoryState);
+ }
+
+ public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aLayoutHistoryState);
+ }
+
+ public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aShouldSaveLayoutState);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java b/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
old mode 100755
new mode 100644
index 098cb25..526c759
--- a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+++ b/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
@@ -1,317 +1,317 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDocShell_1_8 extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 61;
-
- public static final String NS_IDOCSHELL_IID_STR =
- "9f0c7461-b9a4-47f6-b88c-421dce1bce66";
-
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
- public nsIDocShell_1_8(int /*long*/ address) {
- super(address);
- }
-
- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
- public static final int INTERNAL_LOAD_FLAGS_NONE = 0;
-
- public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;
-
- public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
-
- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
- public int CreateLoadInfo(int /*long*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
- public int PrepareForNewContentModel() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
- public int SetCurrentURI(int /*long*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
- public int FirePageHideNotification(int isUnload) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
- }
-
- public int GetPresContext(int /*long*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
- public int GetPresShell(int /*long*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
- public int GetContentViewer(int /*long*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
- }
-
- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
- }
-
- public int GetAllowPlugins(int[] aAllowPlugins) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);
- }
-
- public int SetAllowPlugins(int aAllowPlugins) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);
- }
-
- public int GetAllowJavascript(int[] aAllowJavascript) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);
- }
-
- public int SetAllowJavascript(int aAllowJavascript) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);
- }
-
- public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);
- }
-
- public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);
- }
-
- public int GetAllowSubframes(int[] aAllowSubframes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);
- }
-
- public int SetAllowSubframes(int aAllowSubframes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);
- }
-
- public int GetAllowImages(int[] aAllowImages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);
- }
-
- public int SetAllowImages(int aAllowImages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowImages);
- }
-
- public static final int ENUMERATE_FORWARDS = 0;
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
- }
-
- public static final int APP_TYPE_UNKNOWN = 0;
-
- public static final int APP_TYPE_MAIL = 1;
-
- public static final int APP_TYPE_EDITOR = 2;
-
- public int GetAppType(int[] aAppType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAppType);
- }
-
- public int SetAppType(int aAppType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);
- }
-
- public int GetAllowAuth(int[] aAllowAuth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);
- }
-
- public int SetAllowAuth(int aAllowAuth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAllowAuth);
- }
-
- public int GetZoom(float[] aZoom) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aZoom);
- }
-
- public int SetZoom(float aZoom) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aZoom);
- }
-
- public int GetMarginWidth(int[] aMarginWidth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aMarginWidth);
- }
-
- public int SetMarginWidth(int aMarginWidth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aMarginWidth);
- }
-
- public int GetMarginHeight(int[] aMarginHeight) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginHeight);
- }
-
- public int SetMarginHeight(int aMarginHeight) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);
- }
-
- public int GetHasFocus(int[] aHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);
- }
-
- public int SetHasFocus(int aHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);
- }
-
- public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);
- }
-
- public int SetCanvasHasFocus(int aCanvasHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);
- }
-
- public int TabToTreeOwner(int forward, int[] tookFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), forward, tookFocus);
- }
-
- public static final int BUSY_FLAGS_NONE = 0;
-
- public static final int BUSY_FLAGS_BUSY = 1;
-
- public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
-
- public static final int BUSY_FLAGS_PAGE_LOADING = 4;
-
- public static final int LOAD_CMD_NORMAL = 1;
-
- public static final int LOAD_CMD_RELOAD = 2;
-
- public static final int LOAD_CMD_HISTORY = 4;
-
- public int GetBusyFlags(int[] aBusyFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aBusyFlags);
- }
-
- public int GetLoadType(int[] aLoadType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aLoadType);
- }
-
- public int SetLoadType(int aLoadType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);
- }
-
- public int IsBeingDestroyed(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);
- }
-
- public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
- }
-
- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
- }
-
- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
- }
-
- public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
- }
-
- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
- }
-
- public int SetSecurityUI(int /*long*/ aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
- }
-
- public int SuspendRefreshURIs() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress());
- }
-
- public int ResumeRefreshURIs() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
- }
-
- public int BeginRestore(int /*long*/ viewer, int top) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
- }
-
- public int FinishRestore() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());
- }
-
- public int GetRestoringDocument(int[] aRestoringDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);
- }
-
- public int GetUseErrorPages(int[] aUseErrorPages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);
- }
-
- public int SetUseErrorPages(int aUseErrorPages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aUseErrorPages);
- }
-
- public int GetPreviousTransIndex(int[] aPreviousTransIndex) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aPreviousTransIndex);
- }
-
- public int GetLoadedTransIndex(int[] aLoadedTransIndex) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), aLoadedTransIndex);
- }
-
- public int HistoryPurged(int numEntries) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIDocShell_1_8 extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 61;
+
+ public static final String NS_IDOCSHELL_IID_STR =
+ "9f0c7461-b9a4-47f6-b88c-421dce1bce66";
+
+ public static final nsID NS_IDOCSHELL_IID =
+ new nsID(NS_IDOCSHELL_IID_STR);
+
+ public nsIDocShell_1_8(int /*long*/ address) {
+ super(address);
+ }
+
+ public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
+ }
+
+ public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
+ }
+
+ public static final int INTERNAL_LOAD_FLAGS_NONE = 0;
+
+ public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;
+
+ public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
+
+ public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
+ }
+
+ public int CreateLoadInfo(int /*long*/[] loadInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
+ }
+
+ public int PrepareForNewContentModel() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+ public int SetCurrentURI(int /*long*/ aURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
+ }
+
+ public int FirePageHideNotification(int isUnload) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
+ }
+
+ public int GetPresContext(int /*long*/[] aPresContext) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
+ }
+
+ public int GetPresShell(int /*long*/[] aPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
+ }
+
+ public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
+ }
+
+ public int GetContentViewer(int /*long*/[] aContentViewer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
+ }
+
+ public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
+ }
+
+ public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
+ }
+
+ public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
+ }
+
+ public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
+ }
+
+ public int GetAllowPlugins(int[] aAllowPlugins) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);
+ }
+
+ public int SetAllowPlugins(int aAllowPlugins) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);
+ }
+
+ public int GetAllowJavascript(int[] aAllowJavascript) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);
+ }
+
+ public int SetAllowJavascript(int aAllowJavascript) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);
+ }
+
+ public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);
+ }
+
+ public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);
+ }
+
+ public int GetAllowSubframes(int[] aAllowSubframes) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);
+ }
+
+ public int SetAllowSubframes(int aAllowSubframes) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);
+ }
+
+ public int GetAllowImages(int[] aAllowImages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);
+ }
+
+ public int SetAllowImages(int aAllowImages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowImages);
+ }
+
+ public static final int ENUMERATE_FORWARDS = 0;
+
+ public static final int ENUMERATE_BACKWARDS = 1;
+
+ public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
+ }
+
+ public static final int APP_TYPE_UNKNOWN = 0;
+
+ public static final int APP_TYPE_MAIL = 1;
+
+ public static final int APP_TYPE_EDITOR = 2;
+
+ public int GetAppType(int[] aAppType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAppType);
+ }
+
+ public int SetAppType(int aAppType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);
+ }
+
+ public int GetAllowAuth(int[] aAllowAuth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);
+ }
+
+ public int SetAllowAuth(int aAllowAuth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAllowAuth);
+ }
+
+ public int GetZoom(float[] aZoom) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aZoom);
+ }
+
+ public int SetZoom(float aZoom) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aZoom);
+ }
+
+ public int GetMarginWidth(int[] aMarginWidth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aMarginWidth);
+ }
+
+ public int SetMarginWidth(int aMarginWidth) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aMarginWidth);
+ }
+
+ public int GetMarginHeight(int[] aMarginHeight) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginHeight);
+ }
+
+ public int SetMarginHeight(int aMarginHeight) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);
+ }
+
+ public int GetHasFocus(int[] aHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);
+ }
+
+ public int SetHasFocus(int aHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);
+ }
+
+ public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);
+ }
+
+ public int SetCanvasHasFocus(int aCanvasHasFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);
+ }
+
+ public int TabToTreeOwner(int forward, int[] tookFocus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), forward, tookFocus);
+ }
+
+ public static final int BUSY_FLAGS_NONE = 0;
+
+ public static final int BUSY_FLAGS_BUSY = 1;
+
+ public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
+
+ public static final int BUSY_FLAGS_PAGE_LOADING = 4;
+
+ public static final int LOAD_CMD_NORMAL = 1;
+
+ public static final int LOAD_CMD_RELOAD = 2;
+
+ public static final int LOAD_CMD_HISTORY = 4;
+
+ public int GetBusyFlags(int[] aBusyFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aBusyFlags);
+ }
+
+ public int GetLoadType(int[] aLoadType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aLoadType);
+ }
+
+ public int SetLoadType(int aLoadType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);
+ }
+
+ public int IsBeingDestroyed(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);
+ }
+
+ public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
+ }
+
+ public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
+ }
+
+ public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
+ }
+
+ public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
+ }
+
+ public int GetSecurityUI(int /*long*/[] aSecurityUI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
+ }
+
+ public int SetSecurityUI(int /*long*/ aSecurityUI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
+ }
+
+ public int SuspendRefreshURIs() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress());
+ }
+
+ public int ResumeRefreshURIs() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
+ }
+
+ public int BeginRestore(int /*long*/ viewer, int top) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
+ }
+
+ public int FinishRestore() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());
+ }
+
+ public int GetRestoringDocument(int[] aRestoringDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);
+ }
+
+ public int GetUseErrorPages(int[] aUseErrorPages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);
+ }
+
+ public int SetUseErrorPages(int aUseErrorPages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aUseErrorPages);
+ }
+
+ public int GetPreviousTransIndex(int[] aPreviousTransIndex) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aPreviousTransIndex);
+ }
+
+ public int GetLoadedTransIndex(int[] aLoadedTransIndex) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), aLoadedTransIndex);
+ }
+
+ public int HistoryPurged(int numEntries) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java b/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java
deleted file mode 100755
index b9aafb9..0000000
--- a/org/eclipse/swt/internal/mozilla/nsIDocShell_1_9.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDocShell_1_9 extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 67;
-
- public static final String NS_IDOCSHELL_IID_STR =
- "7d1cf6b9-daa3-476d-8f9f-9eb2a971a95c";
-
- public static final nsID NS_IDOCSHELL_IID =
- new nsID(NS_IDOCSHELL_IID_STR);
-
- public nsIDocShell_1_9(int /*long*/ address) {
- super(address);
- }
-
- public int LoadURI(int /*long*/ uri, int /*long*/ loadInfo, int aLoadFlags, int firstParty) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), uri, loadInfo, aLoadFlags, firstParty);
- }
-
- public int LoadStream(int /*long*/ aStream, int /*long*/ aURI, int /*long*/ aContentType, int /*long*/ aContentCharset, int /*long*/ aLoadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aStream, aURI, aContentType, aContentCharset, aLoadInfo);
- }
-
- public static final int INTERNAL_LOAD_FLAGS_NONE = 0;
-
- public static final int INTERNAL_LOAD_FLAGS_INHERIT_OWNER = 1;
-
- public static final int INTERNAL_LOAD_FLAGS_DONT_SEND_REFERRER = 2;
-
- public static final int INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 4;
-
- public static final int INTERNAL_LOAD_FLAGS_FIRST_LOAD = 8;
-
- public static final int INTERNAL_LOAD_FLAGS_BYPASS_CLASSIFIER = 16;
-
- public int InternalLoad(int /*long*/ aURI, int /*long*/ aReferrer, int /*long*/ aOwner, int aFlags, char[] aWindowTarget, byte[] aTypeHint, int /*long*/ aPostDataStream, int /*long*/ aHeadersStream, int aLoadFlags, int /*long*/ aSHEntry, int firstParty, int /*long*/[] aDocShell, int /*long*/[] aRequest) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aURI, aReferrer, aOwner, aFlags, aWindowTarget, aTypeHint, aPostDataStream, aHeadersStream, aLoadFlags, aSHEntry, firstParty, aDocShell, aRequest);
- }
-
- public int CreateLoadInfo(int /*long*/[] loadInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), loadInfo);
- }
-
- public int PrepareForNewContentModel() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
- public int SetCurrentURI(int /*long*/ aURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aURI);
- }
-
- public int FirePageHideNotification(int isUnload) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), isUnload);
- }
-
- public int GetPresContext(int /*long*/[] aPresContext) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPresContext);
- }
-
- public int GetPresShell(int /*long*/[] aPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPresShell);
- }
-
- public int GetEldestPresShell(int /*long*/[] aEldestPresShell) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aEldestPresShell);
- }
-
- public int GetContentViewer(int /*long*/[] aContentViewer) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aContentViewer);
- }
-
- public int GetChromeEventHandler(int /*long*/[] aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aChromeEventHandler);
- }
-
- public int SetChromeEventHandler(int /*long*/ aChromeEventHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aChromeEventHandler);
- }
-
- public int GetDocumentCharsetInfo(int /*long*/[] aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aDocumentCharsetInfo);
- }
-
- public int SetDocumentCharsetInfo(int /*long*/ aDocumentCharsetInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aDocumentCharsetInfo);
- }
-
- public int GetAllowPlugins(int[] aAllowPlugins) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAllowPlugins);
- }
-
- public int SetAllowPlugins(int aAllowPlugins) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aAllowPlugins);
- }
-
- public int GetAllowJavascript(int[] aAllowJavascript) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aAllowJavascript);
- }
-
- public int SetAllowJavascript(int aAllowJavascript) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aAllowJavascript);
- }
-
- public int GetAllowMetaRedirects(int[] aAllowMetaRedirects) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aAllowMetaRedirects);
- }
-
- public int SetAllowMetaRedirects(int aAllowMetaRedirects) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aAllowMetaRedirects);
- }
-
- public int GetAllowSubframes(int[] aAllowSubframes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aAllowSubframes);
- }
-
- public int SetAllowSubframes(int aAllowSubframes) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aAllowSubframes);
- }
-
- public int GetAllowImages(int[] aAllowImages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAllowImages);
- }
-
- public int SetAllowImages(int aAllowImages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAllowImages);
- }
-
- public static final int ENUMERATE_FORWARDS = 0;
-
- public static final int ENUMERATE_BACKWARDS = 1;
-
- public int GetDocShellEnumerator(int aItemType, int aDirection, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aItemType, aDirection, _retval);
- }
-
- public static final int APP_TYPE_UNKNOWN = 0;
-
- public static final int APP_TYPE_MAIL = 1;
-
- public static final int APP_TYPE_EDITOR = 2;
-
- public int GetAppType(int[] aAppType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aAppType);
- }
-
- public int SetAppType(int aAppType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aAppType);
- }
-
- public int GetAllowAuth(int[] aAllowAuth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aAllowAuth);
- }
-
- public int SetAllowAuth(int aAllowAuth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aAllowAuth);
- }
-
- public int GetZoom(float[] aZoom) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aZoom);
- }
-
- public int SetZoom(float aZoom) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aZoom);
- }
-
- public int GetMarginWidth(int[] aMarginWidth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), aMarginWidth);
- }
-
- public int SetMarginWidth(int aMarginWidth) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aMarginWidth);
- }
-
- public int GetMarginHeight(int[] aMarginHeight) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aMarginHeight);
- }
-
- public int SetMarginHeight(int aMarginHeight) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aMarginHeight);
- }
-
- public int GetHasFocus(int[] aHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aHasFocus);
- }
-
- public int SetHasFocus(int aHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), aHasFocus);
- }
-
- public int GetCanvasHasFocus(int[] aCanvasHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), aCanvasHasFocus);
- }
-
- public int SetCanvasHasFocus(int aCanvasHasFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aCanvasHasFocus);
- }
-
- public int TabToTreeOwner(int forward, int[] tookFocus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), forward, tookFocus);
- }
-
- public static final int BUSY_FLAGS_NONE = 0;
-
- public static final int BUSY_FLAGS_BUSY = 1;
-
- public static final int BUSY_FLAGS_BEFORE_PAGE_LOAD = 2;
-
- public static final int BUSY_FLAGS_PAGE_LOADING = 4;
-
- public static final int LOAD_CMD_NORMAL = 1;
-
- public static final int LOAD_CMD_RELOAD = 2;
-
- public static final int LOAD_CMD_HISTORY = 4;
-
- public int GetBusyFlags(int[] aBusyFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aBusyFlags);
- }
-
- public int GetLoadType(int[] aLoadType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aLoadType);
- }
-
- public int SetLoadType(int aLoadType) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aLoadType);
- }
-
- public int IsBeingDestroyed(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), _retval);
- }
-
- public int GetIsExecutingOnLoadHandler(int[] aIsExecutingOnLoadHandler) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aIsExecutingOnLoadHandler);
- }
-
- public int GetLayoutHistoryState(int /*long*/[] aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), aLayoutHistoryState);
- }
-
- public int SetLayoutHistoryState(int /*long*/ aLayoutHistoryState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aLayoutHistoryState);
- }
-
- public int GetShouldSaveLayoutState(int[] aShouldSaveLayoutState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aShouldSaveLayoutState);
- }
-
- public int GetSecurityUI(int /*long*/[] aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aSecurityUI);
- }
-
- public int SetSecurityUI(int /*long*/ aSecurityUI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), aSecurityUI);
- }
-
- public int SuspendRefreshURIs() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress());
- }
-
- public int ResumeRefreshURIs() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress());
- }
-
- public int BeginRestore(int /*long*/ viewer, int top) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), viewer, top);
- }
-
- public int FinishRestore() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress());
- }
-
- public int GetRestoringDocument(int[] aRestoringDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aRestoringDocument);
- }
-
- public int GetUseErrorPages(int[] aUseErrorPages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aUseErrorPages);
- }
-
- public int SetUseErrorPages(int aUseErrorPages) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aUseErrorPages);
- }
-
- public int GetPreviousTransIndex(int[] aPreviousTransIndex) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aPreviousTransIndex);
- }
-
- public int GetLoadedTransIndex(int[] aLoadedTransIndex) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), aLoadedTransIndex);
- }
-
- public int HistoryPurged(int numEntries) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), numEntries);
- }
-
- public int GetSessionStorageForURI(int /*long*/ uri, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 62, getAddress(), uri, _retval);
- }
-
- public int AddSessionStorage(int /*long*/ aDomain, int /*long*/ storage) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 63, getAddress(), aDomain, storage);
- }
-
- public int GetCurrentDocumentChannel(int /*long*/[] aCurrentDocumentChannel) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 64, getAddress(), aCurrentDocumentChannel);
- }
-
- public int SetChildOffset(int offset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 65, getAddress(), offset);
- }
-
- public int GetIsInUnload(int[] aIsInUnload) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 66, getAddress(), aIsInUnload);
- }
-
- public int GetChannelIsUnsafe(int[] aChannelIsUnsafe) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 67, getAddress(), aChannelIsUnsafe);
- }
-}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIDownload.java b/org/eclipse/swt/internal/mozilla/nsIDownload.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java b/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
old mode 100755
new mode 100644
index b036ae6..3bb3009
--- a/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+++ b/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
@@ -1,81 +1,81 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIEmbeddingSiteWindow extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
- public static final String NS_IEMBEDDINGSITEWINDOW_IID_STR =
- "3e5432cd-9568-4bd1-8cbe-d50aba110743";
-
- public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
- new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
-
- public nsIEmbeddingSiteWindow(int /*long*/ address) {
- super(address);
- }
-
- public static final int DIM_FLAGS_POSITION = 1;
-
- public static final int DIM_FLAGS_SIZE_INNER = 2;
-
- public static final int DIM_FLAGS_SIZE_OUTER = 4;
-
- public int SetDimensions(int flags, int x, int y, int cx, int cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);
- }
-
- public int GetDimensions(int flags, int[] x, int[] y, int[] cx, int[] cy) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);
- }
-
- public int SetFocus() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
- public int GetVisibility(int[] aVisibility) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
- }
-
- public int SetVisibility(int aVisibility) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
- }
-
- public int GetTitle(int /*long*/[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
- }
-
- public int SetTitle(char[] aTitle) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
- }
-
- public int GetSiteWindow(int /*long*/[] aSiteWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIEmbeddingSiteWindow extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+ public static final String NS_IEMBEDDINGSITEWINDOW_IID_STR =
+ "3e5432cd-9568-4bd1-8cbe-d50aba110743";
+
+ public static final nsID NS_IEMBEDDINGSITEWINDOW_IID =
+ new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR);
+
+ public nsIEmbeddingSiteWindow(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int DIM_FLAGS_POSITION = 1;
+
+ public static final int DIM_FLAGS_SIZE_INNER = 2;
+
+ public static final int DIM_FLAGS_SIZE_OUTER = 4;
+
+ public int SetDimensions(int flags, int x, int y, int cx, int cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), flags, x, y, cx, cy);
+ }
+
+ public int GetDimensions(int flags, int[] x, int[] y, int[] cx, int[] cy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), flags, x, y, cx, cy);
+ }
+
+ public int SetFocus() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
+
+ public int GetVisibility(int[] aVisibility) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aVisibility);
+ }
+
+ public int SetVisibility(int aVisibility) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aVisibility);
+ }
+
+ public int GetTitle(int /*long*/[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aTitle);
+ }
+
+ public int SetTitle(char[] aTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aTitle);
+ }
+
+ public int GetSiteWindow(int /*long*/[] aSiteWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIFactory.java b/org/eclipse/swt/internal/mozilla/nsIFactory.java
old mode 100755
new mode 100644
index 5e6f2d4..cd83018
--- a/org/eclipse/swt/internal/mozilla/nsIFactory.java
+++ b/org/eclipse/swt/internal/mozilla/nsIFactory.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIFactory extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
- public static final String NS_IFACTORY_IID_STR =
- "00000001-0000-0000-c000-000000000046";
-
- public static final nsID NS_IFACTORY_IID =
- new nsID(NS_IFACTORY_IID_STR);
-
- public nsIFactory(int /*long*/ address) {
- super(address);
- }
-
- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
- }
-
- public int LockFactory(int lock) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFactory extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
+
+ public static final String NS_IFACTORY_IID_STR =
+ "00000001-0000-0000-c000-000000000046";
+
+ public static final nsID NS_IFACTORY_IID =
+ new nsID(NS_IFACTORY_IID_STR);
+
+ public nsIFactory(int /*long*/ address) {
+ super(address);
+ }
+
+ public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
+ }
+
+ public int LockFactory(int lock) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIFile.java b/org/eclipse/swt/internal/mozilla/nsIFile.java
old mode 100755
new mode 100644
index 0897111..e5d51b0
--- a/org/eclipse/swt/internal/mozilla/nsIFile.java
+++ b/org/eclipse/swt/internal/mozilla/nsIFile.java
@@ -1,227 +1,227 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIFile extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 45;
-
- public static final String NS_IFILE_IID_STR =
- "c8c0a080-0868-11d3-915f-d9d889d48e3c";
-
- public static final nsID NS_IFILE_IID =
- new nsID(NS_IFILE_IID_STR);
-
- public nsIFile(int /*long*/ address) {
- super(address);
- }
-
- public static final int NORMAL_FILE_TYPE = 0;
-
- public static final int DIRECTORY_TYPE = 1;
-
- public int Append(int /*long*/ node) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
- }
-
- public int AppendNative(int /*long*/ node) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
- }
-
- public int Normalize() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
- public int Create(int type, int permissions) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
- }
-
- public int GetLeafName(int /*long*/ aLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
- }
-
- public int SetLeafName(int /*long*/ aLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
- }
-
- public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
- }
-
- public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
- }
-
- public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
- }
-
- public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
- }
-
- public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
- }
-
- public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
- }
-
- public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
- }
-
- public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
- }
-
- public int Remove(int recursive) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), recursive);
- }
-
- public int GetPermissions(int[] aPermissions) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPermissions);
- }
-
- public int SetPermissions(int aPermissions) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPermissions);
- }
-
- public int GetPermissionsOfLink(int[] aPermissionsOfLink) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPermissionsOfLink);
- }
-
- public int SetPermissionsOfLink(int aPermissionsOfLink) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPermissionsOfLink);
- }
-
- public int GetLastModifiedTime(long[] aLastModifiedTime) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLastModifiedTime);
- }
-
- public int SetLastModifiedTime(long aLastModifiedTime) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aLastModifiedTime);
- }
-
- public int GetLastModifiedTimeOfLink(long[] aLastModifiedTimeOfLink) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aLastModifiedTimeOfLink);
- }
-
- public int SetLastModifiedTimeOfLink(long aLastModifiedTimeOfLink) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aLastModifiedTimeOfLink);
- }
-
- public int GetFileSize(long[] aFileSize) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aFileSize);
- }
-
- public int SetFileSize(long aFileSize) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFileSize);
- }
-
- public int GetFileSizeOfLink(long[] aFileSizeOfLink) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
- }
-
- public int GetTarget(int /*long*/ aTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
- }
-
- public int GetNativeTarget(int /*long*/ aNativeTarget) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
- }
-
- public int GetPath(int /*long*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
- }
-
- public int GetNativePath(int /*long*/ aNativePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
- }
-
- public int Exists(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);
- }
-
- public int IsWritable(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);
- }
-
- public int IsReadable(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);
- }
-
- public int IsExecutable(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);
- }
-
- public int IsHidden(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);
- }
-
- public int IsDirectory(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);
- }
-
- public int IsFile(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);
- }
-
- public int IsSymlink(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);
- }
-
- public int IsSpecial(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), _retval);
- }
-
- public int CreateUnique(int type, int permissions) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
- }
-
- public int Clone(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
- }
-
- public int Equals(int /*long*/ inFile, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
- }
-
- public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
- }
-
- public int GetParent(int /*long*/[] aParent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
- }
-
- public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFile extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 45;
+
+ public static final String NS_IFILE_IID_STR =
+ "c8c0a080-0868-11d3-915f-d9d889d48e3c";
+
+ public static final nsID NS_IFILE_IID =
+ new nsID(NS_IFILE_IID_STR);
+
+ public nsIFile(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int NORMAL_FILE_TYPE = 0;
+
+ public static final int DIRECTORY_TYPE = 1;
+
+ public int Append(int /*long*/ node) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), node);
+ }
+
+ public int AppendNative(int /*long*/ node) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), node);
+ }
+
+ public int Normalize() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
+
+ public int Create(int type, int permissions) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), type, permissions);
+ }
+
+ public int GetLeafName(int /*long*/ aLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLeafName);
+ }
+
+ public int SetLeafName(int /*long*/ aLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLeafName);
+ }
+
+ public int GetNativeLeafName(int /*long*/ aNativeLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNativeLeafName);
+ }
+
+ public int SetNativeLeafName(int /*long*/ aNativeLeafName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNativeLeafName);
+ }
+
+ public int CopyTo(int /*long*/ newParentDir, int /*long*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), newParentDir, newName);
+ }
+
+ public int CopyToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), newParentDir, newName);
+ }
+
+ public int CopyToFollowingLinks(int /*long*/ newParentDir, int /*long*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), newParentDir, newName);
+ }
+
+ public int CopyToFollowingLinksNative(int /*long*/ newParentDir, int /*long*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), newParentDir, newName);
+ }
+
+ public int MoveTo(int /*long*/ newParentDir, int /*long*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newParentDir, newName);
+ }
+
+ public int MoveToNative(int /*long*/ newParentDir, int /*long*/ newName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newParentDir, newName);
+ }
+
+ public int Remove(int recursive) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), recursive);
+ }
+
+ public int GetPermissions(int[] aPermissions) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPermissions);
+ }
+
+ public int SetPermissions(int aPermissions) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPermissions);
+ }
+
+ public int GetPermissionsOfLink(int[] aPermissionsOfLink) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPermissionsOfLink);
+ }
+
+ public int SetPermissionsOfLink(int aPermissionsOfLink) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPermissionsOfLink);
+ }
+
+ public int GetLastModifiedTime(long[] aLastModifiedTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLastModifiedTime);
+ }
+
+ public int SetLastModifiedTime(long aLastModifiedTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aLastModifiedTime);
+ }
+
+ public int GetLastModifiedTimeOfLink(long[] aLastModifiedTimeOfLink) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aLastModifiedTimeOfLink);
+ }
+
+ public int SetLastModifiedTimeOfLink(long aLastModifiedTimeOfLink) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aLastModifiedTimeOfLink);
+ }
+
+ public int GetFileSize(long[] aFileSize) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aFileSize);
+ }
+
+ public int SetFileSize(long aFileSize) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFileSize);
+ }
+
+ public int GetFileSizeOfLink(long[] aFileSizeOfLink) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aFileSizeOfLink);
+ }
+
+ public int GetTarget(int /*long*/ aTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aTarget);
+ }
+
+ public int GetNativeTarget(int /*long*/ aNativeTarget) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aNativeTarget);
+ }
+
+ public int GetPath(int /*long*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aPath);
+ }
+
+ public int GetNativePath(int /*long*/ aNativePath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aNativePath);
+ }
+
+ public int Exists(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), _retval);
+ }
+
+ public int IsWritable(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), _retval);
+ }
+
+ public int IsReadable(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), _retval);
+ }
+
+ public int IsExecutable(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), _retval);
+ }
+
+ public int IsHidden(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), _retval);
+ }
+
+ public int IsDirectory(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), _retval);
+ }
+
+ public int IsFile(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), _retval);
+ }
+
+ public int IsSymlink(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 38, getAddress(), _retval);
+ }
+
+ public int IsSpecial(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), _retval);
+ }
+
+ public int CreateUnique(int type, int permissions) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), type, permissions);
+ }
+
+ public int Clone(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), _retval);
+ }
+
+ public int Equals(int /*long*/ inFile, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), inFile, _retval);
+ }
+
+ public int Contains(int /*long*/ inFile, int recur, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), inFile, recur, _retval);
+ }
+
+ public int GetParent(int /*long*/[] aParent) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aParent);
+ }
+
+ public int GetDirectoryEntries(int /*long*/[] aDirectoryEntries) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIFilePicker.java b/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
old mode 100755
new mode 100644
index a7617ec..22b0ed3
--- a/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+++ b/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
@@ -1,118 +1,118 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIFilePicker_1_8 extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 15;
-
- public static final String NS_IFILEPICKER_IID_STR =
- "80faf095-c807-4558-a2cc-185ed70754ea";
-
- public static final nsID NS_IFILEPICKER_IID =
- new nsID(NS_IFILEPICKER_IID_STR);
-
- public nsIFilePicker_1_8(int /*long*/ address) {
- super(address);
- }
-
- public static final int modeOpen = 0;
- public static final int modeSave = 1;
- public static final int modeGetFolder = 2;
- public static final int modeOpenMultiple = 3;
- public static final int returnOK = 0;
- public static final int returnCancel = 1;
- public static final int returnReplace = 2;
- public static final int filterAll = 1;
- public static final int filterHTML = 2;
- public static final int filterText = 4;
- public static final int filterImages = 8;
- public static final int filterXML = 16;
- public static final int filterXUL = 32;
- public static final int filterApps = 64;
-
- public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
- }
-
- public int AppendFilters(int filterMask) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
- }
-
- public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
- }
-
- public int GetDefaultString(int /*long*/ aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
- }
-
- public int SetDefaultString(int /*long*/ aDefaultString) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
- }
-
- public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
- }
-
- public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
- }
-
- public int GetFilterIndex(int[] aFilterIndex) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex);
- }
-
- public int SetFilterIndex(int aFilterIndex) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
- }
-
- public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
- }
-
- public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
- }
-
- public int GetFile(int /*long*/[] aFile) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
- }
-
- public int GetFileURL(int /*long*/[] aFileURL) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
- }
-
- public int GetFiles(int /*long*/[] aFiles) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
- }
-
- public int Show(int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIFilePicker_1_8 extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 15;
+
+ public static final String NS_IFILEPICKER_IID_STR =
+ "80faf095-c807-4558-a2cc-185ed70754ea";
+
+ public static final nsID NS_IFILEPICKER_IID =
+ new nsID(NS_IFILEPICKER_IID_STR);
+
+ public nsIFilePicker_1_8(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int modeOpen = 0;
+ public static final int modeSave = 1;
+ public static final int modeGetFolder = 2;
+ public static final int modeOpenMultiple = 3;
+ public static final int returnOK = 0;
+ public static final int returnCancel = 1;
+ public static final int returnReplace = 2;
+ public static final int filterAll = 1;
+ public static final int filterHTML = 2;
+ public static final int filterText = 4;
+ public static final int filterImages = 8;
+ public static final int filterXML = 16;
+ public static final int filterXUL = 32;
+ public static final int filterApps = 64;
+
+ public int Init(int /*long*/ parent, int /*long*/ title, int mode) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), parent, title, mode);
+ }
+
+ public int AppendFilters(int filterMask) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), filterMask);
+ }
+
+ public int AppendFilter(int /*long*/ title, int /*long*/ filter) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), title, filter);
+ }
+
+ public int GetDefaultString(int /*long*/ aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aDefaultString);
+ }
+
+ public int SetDefaultString(int /*long*/ aDefaultString) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aDefaultString);
+ }
+
+ public int GetDefaultExtension(int /*long*/ aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aDefaultExtension);
+ }
+
+ public int SetDefaultExtension(int /*long*/ aDefaultExtension) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aDefaultExtension);
+ }
+
+ public int GetFilterIndex(int[] aFilterIndex) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFilterIndex);
+ }
+
+ public int SetFilterIndex(int aFilterIndex) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aFilterIndex);
+ }
+
+ public int GetDisplayDirectory(int /*long*/[] aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aDisplayDirectory);
+ }
+
+ public int SetDisplayDirectory(int /*long*/ aDisplayDirectory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDisplayDirectory);
+ }
+
+ public int GetFile(int /*long*/[] aFile) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aFile);
+ }
+
+ public int GetFileURL(int /*long*/[] aFileURL) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aFileURL);
+ }
+
+ public int GetFiles(int /*long*/[] aFiles) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aFiles);
+ }
+
+ public int Show(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
old mode 100755
new mode 100644
index 383669b..c003eb6
--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
@@ -1,79 +1,79 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIHelperAppLauncher extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
- public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
- "9503d0fe-4c9d-11d4-98d0-001083010e9b";
-
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
- public nsIHelperAppLauncher(int /*long*/ address) {
- super(address);
- }
-
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
- public int GetSource(int /*long*/[] aSource) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
- public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
- public int Cancel() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
- }
-
- public int CloseProgressWindow() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
-
- public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+ public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+ "9503d0fe-4c9d-11d4-98d0-001083010e9b";
+
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+ public nsIHelperAppLauncher(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+ public int GetSource(int /*long*/[] aSource) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+ public int GetSuggestedFileName(int /*long*/[] aSuggestedFileName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+ public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+ public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+ public int Cancel() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+ public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aWebProgressListener);
+ }
+
+ public int CloseProgressWindow() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+ }
+
+ public int GetDownloadInfo(int /*long*/[] aSourceUrl, long[] aTimeDownloadStarted, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSourceUrl, aTimeDownloadStarted, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
old mode 100755
new mode 100644
index 104e143..c97f263
--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
@@ -54,4 +54,4 @@ public class nsIHelperAppLauncherDialog_1_9 extends nsISupports {
public int PromptForSaveToFile(int /*long*/ aLauncher, int /*long*/ aWindowContext, char[] aDefaultFileName, char[] aSuggestedFileExtension, int aForcePrompt, int /*long*/[] _retval) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aLauncher, aWindowContext, aDefaultFileName, aSuggestedFileExtension, aForcePrompt, _retval);
}
-}
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
old mode 100755
new mode 100644
index 1bb57c9..1aca93b
--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
@@ -1,79 +1,79 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIHelperAppLauncher_1_8 extends nsICancelable {
-
- static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 9;
-
- public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
- "99a0882d-2ff9-4659-9952-9ac531ba5592";
-
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
- public nsIHelperAppLauncher_1_8(int /*long*/ address) {
- super(address);
- }
-
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
- public int GetSource(int /*long*/[] aSource) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
- }
-
- public int CloseProgressWindow() {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
- }
-
- public int GetTargetFile(int /*long*/[] aTargetFile) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
- }
-
- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher_1_8 extends nsICancelable {
+
+ static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 9;
+
+ public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+ "99a0882d-2ff9-4659-9952-9ac531ba5592";
+
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+ public nsIHelperAppLauncher_1_8(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+ public int GetSource(int /*long*/[] aSource) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+ public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+ public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+ public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+ public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+ }
+
+ public int CloseProgressWindow() {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+ }
+
+ public int GetTargetFile(int /*long*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+ }
+
+ public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTimeDownloadStarted);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
old mode 100755
new mode 100644
index eea4094..d277e75
--- a/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+++ b/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
@@ -1,83 +1,83 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIHelperAppLauncher_1_9 extends nsICancelable {
-
- static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 10;
-
- public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
- "cc75c21a-0a79-4f68-90e1-563253d0c555";
-
- public static final nsID NS_IHELPERAPPLAUNCHER_IID =
- new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
-
- public nsIHelperAppLauncher_1_9(int /*long*/ address) {
- super(address);
- }
-
- public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
- }
-
- public int GetSource(int /*long*/[] aSource) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
- }
-
- public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
- }
-
- public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
- }
-
- public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
- }
-
- public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
- }
-
- public int CloseProgressWindow() {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
- }
-
- public int GetTargetFile(int /*long*/[] aTargetFile) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
- }
-
- public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
- }
-
- public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
- return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIHelperAppLauncher_1_9 extends nsICancelable {
+
+ static final int LAST_METHOD_ID = nsICancelable.LAST_METHOD_ID + 10;
+
+ public static final String NS_IHELPERAPPLAUNCHER_IID_STR =
+ "cc75c21a-0a79-4f68-90e1-563253d0c555";
+
+ public static final nsID NS_IHELPERAPPLAUNCHER_IID =
+ new nsID(NS_IHELPERAPPLAUNCHER_IID_STR);
+
+ public nsIHelperAppLauncher_1_9(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetMIMEInfo(int /*long*/[] aMIMEInfo) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 1, getAddress(), aMIMEInfo);
+ }
+
+ public int GetSource(int /*long*/[] aSource) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 2, getAddress(), aSource);
+ }
+
+ public int GetSuggestedFileName(int /*long*/ aSuggestedFileName) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 3, getAddress(), aSuggestedFileName);
+ }
+
+ public int SaveToDisk(int /*long*/ aNewFileLocation, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 4, getAddress(), aNewFileLocation, aRememberThisPreference);
+ }
+
+ public int LaunchWithApplication(int /*long*/ aApplication, int aRememberThisPreference) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 5, getAddress(), aApplication, aRememberThisPreference);
+ }
+
+ public int SetWebProgressListener(int /*long*/ aWebProgressListener) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 6, getAddress(), aWebProgressListener);
+ }
+
+ public int CloseProgressWindow() {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 7, getAddress());
+ }
+
+ public int GetTargetFile(int /*long*/[] aTargetFile) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 8, getAddress(), aTargetFile);
+ }
+
+ public int GetTargetFileIsExecutable(int[] aTargetFileIsExecutable) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 9, getAddress(), aTargetFileIsExecutable);
+ }
+
+ public int GetTimeDownloadStarted(int /*long*/ aTimeDownloadStarted) {
+ return XPCOM.VtblCall(nsICancelable.LAST_METHOD_ID + 10, getAddress(), aTimeDownloadStarted);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIIOService.java b/org/eclipse/swt/internal/mozilla/nsIIOService.java
old mode 100755
new mode 100644
index 961bdd8..a4b52e1
--- a/org/eclipse/swt/internal/mozilla/nsIIOService.java
+++ b/org/eclipse/swt/internal/mozilla/nsIIOService.java
@@ -1,83 +1,83 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIIOService extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
- public static final String NS_IIOSERVICE_IID_STR =
- "bddeda3f-9020-4d12-8c70-984ee9f7935e";
-
- public static final nsID NS_IIOSERVICE_IID =
- new nsID(NS_IIOSERVICE_IID_STR);
-
- public nsIIOService(int /*long*/ address) {
- super(address);
- }
-
- public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
- }
-
- public int GetProtocolFlags(byte[] aScheme, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
- }
-
- public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
- }
-
- public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
- }
-
- public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
- }
-
- public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
- }
-
- public int GetOffline(int[] aOffline) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);
- }
-
- public int SetOffline(int aOffline) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);
- }
-
- public int AllowPort(int aPort, byte[] aScheme, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
- }
-
- public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIIOService extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+ public static final String NS_IIOSERVICE_IID_STR =
+ "bddeda3f-9020-4d12-8c70-984ee9f7935e";
+
+ public static final nsID NS_IIOSERVICE_IID =
+ new nsID(NS_IIOSERVICE_IID_STR);
+
+ public nsIIOService(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetProtocolHandler(byte[] aScheme, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aScheme, _retval);
+ }
+
+ public int GetProtocolFlags(byte[] aScheme, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScheme, _retval);
+ }
+
+ public int NewURI(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+ }
+
+ public int NewFileURI(int /*long*/ aFile, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aFile, _retval);
+ }
+
+ public int NewChannelFromURI(int /*long*/ aURI, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aURI, _retval);
+ }
+
+ public int NewChannel(int /*long*/ aSpec, byte[] aOriginCharset, int /*long*/ aBaseURI, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aSpec, aOriginCharset, aBaseURI, _retval);
+ }
+
+ public int GetOffline(int[] aOffline) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOffline);
+ }
+
+ public int SetOffline(int aOffline) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOffline);
+ }
+
+ public int AllowPort(int aPort, byte[] aScheme, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPort, aScheme, _retval);
+ }
+
+ public int ExtractScheme(int /*long*/ urlString, int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), urlString, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/org/eclipse/swt/internal/mozilla/nsIInputStream.java
old mode 100755
new mode 100644
index 49dbe03..62959ad
--- a/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+++ b/org/eclipse/swt/internal/mozilla/nsIInputStream.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIInputStream extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
- public static final String NS_IINPUTSTREAM_IID_STR =
- "fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a";
-
- public static final nsID NS_IINPUTSTREAM_IID =
- new nsID(NS_IINPUTSTREAM_IID_STR);
-
- public nsIInputStream(int /*long*/ address) {
- super(address);
- }
-
- public int Close() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
- public int Available(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
- public int Read(byte[] aBuf, int aCount, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
- }
-
- public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
- }
-
- public int IsNonBlocking(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIInputStream extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+ public static final String NS_IINPUTSTREAM_IID_STR =
+ "fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a";
+
+ public static final nsID NS_IINPUTSTREAM_IID =
+ new nsID(NS_IINPUTSTREAM_IID_STR);
+
+ public nsIInputStream(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Close() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ }
+
+ public int Available(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+ public int Read(byte[] aBuf, int aCount, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aBuf, aCount, _retval);
+ }
+
+ public int ReadSegments(int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aWriter, aClosure, aCount, _retval);
+ }
+
+ public int IsNonBlocking(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java b/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java b/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
old mode 100755
new mode 100644
index 4954e44..5dbedbe
--- a/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+++ b/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIJSContextStack extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
- public static final String NS_IJSCONTEXTSTACK_IID_STR =
- "c67d8270-3189-11d3-9885-006008962422";
-
- public static final nsID NS_IJSCONTEXTSTACK_IID =
- new nsID(NS_IJSCONTEXTSTACK_IID_STR);
-
- public nsIJSContextStack(int /*long*/ address) {
- super(address);
- }
-
- public int GetCount(int[] aCount) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
- }
-
- public int Peek(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
- public int Pop(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
- }
-
- public int Push(int /*long*/ cx) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIJSContextStack extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+ public static final String NS_IJSCONTEXTSTACK_IID_STR =
+ "c67d8270-3189-11d3-9885-006008962422";
+
+ public static final nsID NS_IJSCONTEXTSTACK_IID =
+ new nsID(NS_IJSCONTEXTSTACK_IID_STR);
+
+ public nsIJSContextStack(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetCount(int[] aCount) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCount);
+ }
+
+ public int Peek(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+ public int Pop(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+ public int Push(int /*long*/ cx) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), cx);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/org/eclipse/swt/internal/mozilla/nsILocalFile.java
old mode 100755
new mode 100644
index 39f7200..772bec8
--- a/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+++ b/org/eclipse/swt/internal/mozilla/nsILocalFile.java
@@ -1,111 +1,111 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsILocalFile extends nsIFile {
-
- static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + 17;
-
- public static final String NS_ILOCALFILE_IID_STR =
- "aa610f20-a889-11d3-8c81-000064657374";
-
- public static final nsID NS_ILOCALFILE_IID =
- new nsID(NS_ILOCALFILE_IID_STR);
-
- public nsILocalFile(int /*long*/ address) {
- super(address);
- }
-
- public int InitWithPath(int /*long*/ filePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
- }
-
- public int InitWithNativePath(int /*long*/ filePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
- }
-
- public int InitWithFile(int /*long*/ aFile) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
- }
-
- public int GetFollowLinks(int[] aFollowLinks) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);
- }
-
- public int SetFollowLinks(int aFollowLinks) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
- }
-
- public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
- }
-
- public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
- }
-
- public int Load(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
- }
-
- public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
- }
-
- public int AppendRelativePath(int /*long*/ relativeFilePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
- }
-
- public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
- }
-
- public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
- }
-
- public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
- }
-
- public int Reveal() {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 14, getAddress());
- }
-
- public int Launch() {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
- }
-
- public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
- }
-
- public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
- return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsILocalFile extends nsIFile {
+
+ static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + 17;
+
+ public static final String NS_ILOCALFILE_IID_STR =
+ "aa610f20-a889-11d3-8c81-000064657374";
+
+ public static final nsID NS_ILOCALFILE_IID =
+ new nsID(NS_ILOCALFILE_IID_STR);
+
+ public nsILocalFile(int /*long*/ address) {
+ super(address);
+ }
+
+ public int InitWithPath(int /*long*/ filePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath);
+ }
+
+ public int InitWithNativePath(int /*long*/ filePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath);
+ }
+
+ public int InitWithFile(int /*long*/ aFile) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile);
+ }
+
+ public int GetFollowLinks(int[] aFollowLinks) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks);
+ }
+
+ public int SetFollowLinks(int aFollowLinks) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks);
+ }
+
+ public int OpenNSPRFileDesc(int flags, int mode, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval);
+ }
+
+ public int OpenANSIFileDesc(byte[] mode, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval);
+ }
+
+ public int Load(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval);
+ }
+
+ public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable);
+ }
+
+ public int AppendRelativePath(int /*long*/ relativeFilePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath);
+ }
+
+ public int AppendRelativeNativePath(int /*long*/ relativeFilePath) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath);
+ }
+
+ public int GetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor);
+ }
+
+ public int SetPersistentDescriptor(int /*long*/ aPersistentDescriptor) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor);
+ }
+
+ public int Reveal() {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 14, getAddress());
+ }
+
+ public int Launch() {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress());
+ }
+
+ public int GetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval);
+ }
+
+ public int SetRelativeDescriptor(int /*long*/ fromFile, int /*long*/ relativeDesc) {
+ return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIMemory.java b/org/eclipse/swt/internal/mozilla/nsIMemory.java
old mode 100755
new mode 100644
index 4ff830a..641777e
--- a/org/eclipse/swt/internal/mozilla/nsIMemory.java
+++ b/org/eclipse/swt/internal/mozilla/nsIMemory.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIMemory extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
- public static final String NS_IMEMORY_IID_STR =
- "59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";
-
- public static final nsID NS_IMEMORY_IID =
- new nsID(NS_IMEMORY_IID_STR);
-
- public nsIMemory(int /*long*/ address) {
- super(address);
- }
-
- public int Alloc(int size) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), size);
- }
-
- public int Realloc(int /*long*/ ptr, int newSize) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), ptr, newSize);
- }
-
- public int Free(int /*long*/ ptr) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
- }
-
- public int HeapMinimize(int immediate) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
- }
-
- public int IsLowMemory(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIMemory extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+ public static final String NS_IMEMORY_IID_STR =
+ "59e7e77a-38e4-11d4-8cf5-0060b0fc14a3";
+
+ public static final nsID NS_IMEMORY_IID =
+ new nsID(NS_IMEMORY_IID_STR);
+
+ public nsIMemory(int /*long*/ address) {
+ super(address);
+ }
+
+ public int /*long*/ Alloc(int size) {
+ return XPCOM.nsIMemory_Alloc(getAddress(), size);
+ }
+
+ public int /*long*/ Realloc(int /*long*/ ptr, int newSize) {
+ return XPCOM.nsIMemory_Realloc(getAddress(), ptr, newSize);
+ }
+
+ public int Free(int /*long*/ ptr) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), ptr);
+ }
+
+ public int HeapMinimize(int immediate) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), immediate);
+ }
+
+ public int IsLowMemory(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIObserverService.java b/org/eclipse/swt/internal/mozilla/nsIObserverService.java
old mode 100755
new mode 100644
index 61fd23f..5b3775d
--- a/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+++ b/org/eclipse/swt/internal/mozilla/nsIObserverService.java
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIObserverService extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
- public static final String NS_IOBSERVERSERVICE_IID_STR =
- "d07f5192-e3d1-11d2-8acd-00105a1b8860";
-
- public static final nsID NS_IOBSERVERSERVICE_IID =
- new nsID(NS_IOBSERVERSERVICE_IID_STR);
-
- public nsIObserverService(int /*long*/ address) {
- super(address);
- }
-
- public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
- }
-
- public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
- }
-
- public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
- }
-
- public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIObserverService extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+ public static final String NS_IOBSERVERSERVICE_IID_STR =
+ "d07f5192-e3d1-11d2-8acd-00105a1b8860";
+
+ public static final nsID NS_IOBSERVERSERVICE_IID =
+ new nsID(NS_IOBSERVERSERVICE_IID_STR);
+
+ public nsIObserverService(int /*long*/ address) {
+ super(address);
+ }
+
+ public int AddObserver(int /*long*/ anObserver, byte[] aTopic, int ownsWeak) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), anObserver, aTopic, ownsWeak);
+ }
+
+ public int RemoveObserver(int /*long*/ anObserver, byte[] aTopic) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), anObserver, aTopic);
+ }
+
+ public int NotifyObservers(int /*long*/ aSubject, byte[] aTopic, char[] someData) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aSubject, aTopic, someData);
+ }
+
+ public int EnumerateObservers(byte[] aTopic, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aTopic, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
old mode 100755
new mode 100644
index a55aff5..63ed2a3
--- a/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+++ b/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
@@ -1,123 +1,123 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIPrefBranch extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 18;
-
- public static final String NS_IPREFBRANCH_IID_STR =
- "56c35506-f14b-11d3-99d3-ddbfac2ccf65";
-
- public static final nsID NS_IPREFBRANCH_IID =
- new nsID(NS_IPREFBRANCH_IID_STR);
-
- public nsIPrefBranch(int /*long*/ address) {
- super(address);
- }
-
- public static final int PREF_INVALID = 0;
-
- public static final int PREF_STRING = 32;
-
- public static final int PREF_INT = 64;
-
- public static final int PREF_BOOL = 128;
-
- public int GetRoot(int /*long*/[] aRoot) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
- }
-
- public int GetPrefType(byte[] aPrefName, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aPrefName, _retval);
- }
-
- public int GetBoolPref(byte[] aPrefName, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrefName, _retval);
- }
-
- public int SetBoolPref(byte[] aPrefName, int aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
- }
-
- public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
- }
-
- public int SetCharPref(byte[] aPrefName, byte[] aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefName, aValue);
- }
-
- public int GetIntPref(byte[] aPrefName, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPrefName, _retval);
- }
-
- public int SetIntPref(byte[] aPrefName, int aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
- }
-
- public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
- }
-
- public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
- }
-
- public int ClearUserPref(byte[] aPrefName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPrefName);
- }
-
- public int LockPref(byte[] aPrefName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aPrefName);
- }
-
- public int PrefHasUserValue(byte[] aPrefName, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);
- }
-
- public int PrefIsLocked(byte[] aPrefName, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aPrefName, _retval);
- }
-
- public int UnlockPref(byte[] aPrefName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aPrefName);
- }
-
- public int DeleteBranch(byte[] aStartingAt) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
- }
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPrefBranch extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 18;
+
+ public static final String NS_IPREFBRANCH_IID_STR =
+ "56c35506-f14b-11d3-99d3-ddbfac2ccf65";
+
+ public static final nsID NS_IPREFBRANCH_IID =
+ new nsID(NS_IPREFBRANCH_IID_STR);
+
+ public nsIPrefBranch(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int PREF_INVALID = 0;
+
+ public static final int PREF_STRING = 32;
+
+ public static final int PREF_INT = 64;
+
+ public static final int PREF_BOOL = 128;
+
+ public int GetRoot(int /*long*/[] aRoot) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aRoot);
+ }
+
+ public int GetPrefType(byte[] aPrefName, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aPrefName, _retval);
+ }
+
+ public int GetBoolPref(byte[] aPrefName, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrefName, _retval);
+ }
+
+ public int SetBoolPref(byte[] aPrefName, int aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aPrefName, aValue);
+ }
+
+ public int GetCharPref(byte[] aPrefName, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aPrefName, _retval);
+ }
+
+ public int SetCharPref(byte[] aPrefName, byte[] aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aPrefName, aValue);
+ }
+
+ public int GetIntPref(byte[] aPrefName, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aPrefName, _retval);
+ }
+
+ public int SetIntPref(byte[] aPrefName, int aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aPrefName, aValue);
+ }
+
+ public int GetComplexValue(byte[] aPrefName, nsID aType, int /*long*/[] aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPrefName, aType, aValue);
+ }
+
+ public int SetComplexValue(byte[] aPrefName, nsID aType, int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPrefName, aType, aValue);
+ }
+
+ public int ClearUserPref(byte[] aPrefName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPrefName);
+ }
+
+ public int LockPref(byte[] aPrefName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aPrefName);
+ }
+
+ public int PrefHasUserValue(byte[] aPrefName, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aPrefName, _retval);
+ }
+
+ public int PrefIsLocked(byte[] aPrefName, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aPrefName, _retval);
+ }
+
+ public int UnlockPref(byte[] aPrefName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aPrefName);
+ }
+
+ public int DeleteBranch(byte[] aStartingAt) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aStartingAt);
+ }
+
public int GetChildList(byte[] aStartingAt, int[] aCount, int /*long*/[] aChildArray) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aStartingAt, aCount, aChildArray);
- }
-
- public int ResetBranch(byte[] aStartingAt) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aStartingAt);
- }
-}
\ No newline at end of file
+ }
+
+ public int ResetBranch(byte[] aStartingAt) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aStartingAt);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/org/eclipse/swt/internal/mozilla/nsIPrefService.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
new file mode 100644
index 0000000..d8c3419
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
@@ -0,0 +1,143 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPrincipal extends nsISerializable {
+
+ static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + 23;
+
+ public static final String NS_IPRINCIPAL_IID_STR =
+ "b8268b9a-2403-44ed-81e3-614075c92034";
+
+ public static final nsID NS_IPRINCIPAL_IID =
+ new nsID(NS_IPRINCIPAL_IID_STR);
+
+ public nsIPrincipal(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int ENABLE_DENIED = 1;
+
+ public static final int ENABLE_UNKNOWN = 2;
+
+ public static final int ENABLE_WITH_USER_PERMISSION = 3;
+
+ public static final int ENABLE_GRANTED = 4;
+
+ public int GetPreferences(int /*long*/[] prefBranch, int /*long*/[] id, int /*long*/[] subjectName, int /*long*/[] grantedList, int /*long*/[] deniedList, int[] isTrusted) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 1, getAddress(), prefBranch, id, subjectName, grantedList, deniedList, isTrusted);
+ }
+
+ public int Equals(int /*long*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 2, getAddress(), other, _retval);
+ }
+
+ public int GetHashValue(int[] aHashValue) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), aHashValue);
+ }
+
+ public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 4, getAddress(), cx, _retval);
+ }
+
+ public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 5, getAddress(), aSecurityPolicy);
+ }
+
+ public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 6, getAddress(), aSecurityPolicy);
+ }
+
+ public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 7, getAddress(), capability, _retval);
+ }
+
+ public int SetCanEnableCapability(byte[] capability, short canEnable) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 8, getAddress(), capability, canEnable);
+ }
+
+ public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 9, getAddress(), capability, annotation, _retval);
+ }
+
+ public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 10, getAddress(), capability, annotation);
+ }
+
+ public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 11, getAddress(), capability, annotation);
+ }
+
+ public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 12, getAddress(), capability, annotation);
+ }
+
+ public int GetURI(int /*long*/[] aURI) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 13, getAddress(), aURI);
+ }
+
+ public int GetDomain(int /*long*/[] aDomain) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 14, getAddress(), aDomain);
+ }
+
+ public int SetDomain(int /*long*/ aDomain) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 15, getAddress(), aDomain);
+ }
+
+ public int GetOrigin(int /*long*/[] aOrigin) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 16, getAddress(), aOrigin);
+ }
+
+ public int GetHasCertificate(int[] aHasCertificate) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 17, getAddress(), aHasCertificate);
+ }
+
+ public int GetFingerprint(int /*long*/ aFingerprint) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 18, getAddress(), aFingerprint);
+ }
+
+ public int GetPrettyName(int /*long*/ aPrettyName) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 19, getAddress(), aPrettyName);
+ }
+
+ public int Subsumes(int /*long*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+ }
+
+ public int CheckMayLoad(int /*long*/ uri, int report) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 21, getAddress(), uri, report);
+ }
+
+ public int GetSubjectName(int /*long*/ aSubjectName) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 22, getAddress(), aSubjectName);
+ }
+
+ public int GetCertificate(int /*long*/[] aCertificate) {
+ return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 23, getAddress(), aCertificate);
+ }
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java b/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
old mode 100755
new mode 100644
index b9d3ab6..2cc99e4
--- a/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+++ b/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIProgressDialog extends nsIDownload {
-
- static final int LAST_METHOD_ID = nsIDownload.LAST_METHOD_ID + 5;
-
- public static final String NS_IPROGRESSDIALOG_IID_STR =
- "88a478b3-af65-440a-94dc-ed9b154d2990";
-
- public static final nsID NS_IPROGRESSDIALOG_IID =
- new nsID(NS_IPROGRESSDIALOG_IID_STR);
-
- public nsIProgressDialog(int /*long*/ address) {
- super(address);
- }
-
- public int Open(int /*long*/ aParent) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
- }
-
- public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
- }
-
- public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
- }
-
- public int GetDialog(int /*long*/[] aDialog) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
- }
-
- public int SetDialog(int /*long*/ aDialog) {
- return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIProgressDialog extends nsIDownload {
+
+ static final int LAST_METHOD_ID = nsIDownload.LAST_METHOD_ID + 5;
+
+ public static final String NS_IPROGRESSDIALOG_IID_STR =
+ "88a478b3-af65-440a-94dc-ed9b154d2990";
+
+ public static final nsID NS_IPROGRESSDIALOG_IID =
+ new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+ public nsIProgressDialog(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Open(int /*long*/ aParent) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 1, getAddress(), aParent);
+ }
+
+ public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
+ }
+
+ public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+ }
+
+ public int GetDialog(int /*long*/[] aDialog) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 4, getAddress(), aDialog);
+ }
+
+ public int SetDialog(int /*long*/ aDialog) {
+ return XPCOM.VtblCall(nsIDownload.LAST_METHOD_ID + 5, getAddress(), aDialog);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java b/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
old mode 100755
new mode 100644
index 75d2397..13c38f7
--- a/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+++ b/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
@@ -1,71 +1,71 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
public class nsIProgressDialog_1_8 extends nsIDownload_1_8 {
-
+
static final int LAST_METHOD_ID = nsIDownload_1_8.LAST_METHOD_ID + 7;
-
- public static final String NS_IPROGRESSDIALOG_IID_STR =
- "20e790a2-76c6-462d-851a-22ab6cbbe48b";
-
- public static final nsID NS_IPROGRESSDIALOG_IID =
- new nsID(NS_IPROGRESSDIALOG_IID_STR);
-
- public nsIProgressDialog_1_8(int /*long*/ address) {
- super(address);
- }
-
- public int Open(int /*long*/ aParent) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
- }
-
- public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
- }
-
- public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
- }
-
- public int GetObserver(int /*long*/[] aObserver) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
- }
-
- public int SetObserver(int /*long*/ aObserver) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
- }
-
- public int GetDialog(int /*long*/[] aDialog) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
- }
-
- public int SetDialog(int /*long*/ aDialog) {
- return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
- }
-}
\ No newline at end of file
+
+ public static final String NS_IPROGRESSDIALOG_IID_STR =
+ "20e790a2-76c6-462d-851a-22ab6cbbe48b";
+
+ public static final nsID NS_IPROGRESSDIALOG_IID =
+ new nsID(NS_IPROGRESSDIALOG_IID_STR);
+
+ public nsIProgressDialog_1_8(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Open(int /*long*/ aParent) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 1, getAddress(), aParent);
+ }
+
+ public int GetCancelDownloadOnClose(int[] aCancelDownloadOnClose) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 2, getAddress(), aCancelDownloadOnClose);
+ }
+
+ public int SetCancelDownloadOnClose(int aCancelDownloadOnClose) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 3, getAddress(), aCancelDownloadOnClose);
+ }
+
+ public int GetObserver(int /*long*/[] aObserver) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 4, getAddress(), aObserver);
+ }
+
+ public int SetObserver(int /*long*/ aObserver) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 5, getAddress(), aObserver);
+ }
+
+ public int GetDialog(int /*long*/[] aDialog) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 6, getAddress(), aDialog);
+ }
+
+ public int SetDialog(int /*long*/ aDialog) {
+ return XPCOM.VtblCall(nsIDownload_1_8.LAST_METHOD_ID + 7, getAddress(), aDialog);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIPromptService.java b/org/eclipse/swt/internal/mozilla/nsIPromptService.java
old mode 100755
new mode 100644
index 56192d7..92577e4
--- a/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+++ b/org/eclipse/swt/internal/mozilla/nsIPromptService.java
@@ -1,113 +1,113 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIPromptService extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
-
- public static final String NS_IPROMPTSERVICE_IID_STR =
- "1630c61a-325e-49ca-8759-a31b16c47aa5";
-
- public static final nsID NS_IPROMPTSERVICE_IID =
- new nsID(NS_IPROMPTSERVICE_IID_STR);
-
- public nsIPromptService(int /*long*/ address) {
- super(address);
- }
-
- public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
- }
-
- public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
- }
-
- public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
- }
-
- public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
- }
-
- public static final int BUTTON_POS_0 = 1;
-
- public static final int BUTTON_POS_1 = 256;
-
- public static final int BUTTON_POS_2 = 65536;
-
- public static final int BUTTON_TITLE_OK = 1;
-
- public static final int BUTTON_TITLE_CANCEL = 2;
-
- public static final int BUTTON_TITLE_YES = 3;
-
- public static final int BUTTON_TITLE_NO = 4;
-
- public static final int BUTTON_TITLE_SAVE = 5;
-
- public static final int BUTTON_TITLE_DONT_SAVE = 6;
-
- public static final int BUTTON_TITLE_REVERT = 7;
-
- public static final int BUTTON_TITLE_IS_STRING = 127;
-
- public static final int BUTTON_POS_0_DEFAULT = 0;
-
- public static final int BUTTON_POS_1_DEFAULT = 16777216;
-
- public static final int BUTTON_POS_2_DEFAULT = 33554432;
-
- public static final int BUTTON_DELAY_ENABLE = 67108864;
-
- public static final int STD_OK_CANCEL_BUTTONS = 513;
-
- public static final int STD_YES_NO_BUTTONS = 1027;
-
- public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
- }
-
- public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
- }
-
- public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
- }
-
- public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
- }
-
- public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPromptService extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 9;
+
+ public static final String NS_IPROMPTSERVICE_IID_STR =
+ "1630c61a-325e-49ca-8759-a31b16c47aa5";
+
+ public static final nsID NS_IPROMPTSERVICE_IID =
+ new nsID(NS_IPROMPTSERVICE_IID_STR);
+
+ public nsIPromptService(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Alert(int /*long*/ aParent, char[] aDialogTitle, char[] aText) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aParent, aDialogTitle, aText);
+ }
+
+ public int AlertCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState);
+ }
+
+ public int Confirm(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aParent, aDialogTitle, aText, _retval);
+ }
+
+ public int ConfirmCheck(int /*long*/ aParent, char[] aDialogTitle, char[] aText, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aParent, aDialogTitle, aText, aCheckMsg, aCheckState, _retval);
+ }
+
+ public static final int BUTTON_POS_0 = 1;
+
+ public static final int BUTTON_POS_1 = 256;
+
+ public static final int BUTTON_POS_2 = 65536;
+
+ public static final int BUTTON_TITLE_OK = 1;
+
+ public static final int BUTTON_TITLE_CANCEL = 2;
+
+ public static final int BUTTON_TITLE_YES = 3;
+
+ public static final int BUTTON_TITLE_NO = 4;
+
+ public static final int BUTTON_TITLE_SAVE = 5;
+
+ public static final int BUTTON_TITLE_DONT_SAVE = 6;
+
+ public static final int BUTTON_TITLE_REVERT = 7;
+
+ public static final int BUTTON_TITLE_IS_STRING = 127;
+
+ public static final int BUTTON_POS_0_DEFAULT = 0;
+
+ public static final int BUTTON_POS_1_DEFAULT = 16777216;
+
+ public static final int BUTTON_POS_2_DEFAULT = 33554432;
+
+ public static final int BUTTON_DELAY_ENABLE = 67108864;
+
+ public static final int STD_OK_CANCEL_BUTTONS = 513;
+
+ public static final int STD_YES_NO_BUTTONS = 1027;
+
+ public int ConfirmEx(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aButtonFlags, char[] aButton0Title, char[] aButton1Title, char[] aButton2Title, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParent, aDialogTitle, aText, aButtonFlags, aButton0Title, aButton1Title, aButton2Title, aCheckMsg, aCheckState, _retval);
+ }
+
+ public int Prompt(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aValue, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParent, aDialogTitle, aText, aValue, aCheckMsg, aCheckState, _retval);
+ }
+
+ public int PromptUsernameAndPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aUsername, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParent, aDialogTitle, aText, aUsername, aPassword, aCheckMsg, aCheckState, _retval);
+ }
+
+ public int PromptPassword(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int /*long*/[] aPassword, char[] aCheckMsg, int[] aCheckState, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParent, aDialogTitle, aText, aPassword, aCheckMsg, aCheckState, _retval);
+ }
+
+ public int Select(int /*long*/ aParent, char[] aDialogTitle, char[] aText, int aCount, int /*long*/[] aSelectList, int[] aOutSelection, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aParent, aDialogTitle, aText, aCount, aSelectList, aOutSelection, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIPromptService2.java b/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
old mode 100755
new mode 100644
index d740e48..fec6bc5
--- a/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+++ b/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIPromptService2 extends nsIPromptService {
-
- static final int LAST_METHOD_ID = nsIPromptService.LAST_METHOD_ID + 2;
-
- public static final String NS_IPROMPTSERVICE2_IID_STR =
- "cf86d196-dbee-4482-9dfa-3477aa128319";
-
- public static final nsID NS_IPROMPTSERVICE2_IID =
- new nsID(NS_IPROMPTSERVICE2_IID_STR);
-
- public nsIPromptService2(int /*long*/ address) {
- super(address);
- }
-
- public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
- return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
- }
-
- public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIPromptService2 extends nsIPromptService {
+
+ static final int LAST_METHOD_ID = nsIPromptService.LAST_METHOD_ID + 2;
+
+ public static final String NS_IPROMPTSERVICE2_IID_STR =
+ "cf86d196-dbee-4482-9dfa-3477aa128319";
+
+ public static final nsID NS_IPROMPTSERVICE2_IID =
+ new nsID(NS_IPROMPTSERVICE2_IID_STR);
+
+ public nsIPromptService2(int /*long*/ address) {
+ super(address);
+ }
+
+ public int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int[] _retval) {
+ return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 1, getAddress(), aParent, aChannel, level, authInfo, checkboxLabel, checkValue, _retval);
+ }
+
+ public int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, char[] checkboxLabel, int[] checkValue, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIPromptService.LAST_METHOD_ID + 2, getAddress(), aParent, aChannel, aCallback, aContext, level, authInfo, checkboxLabel, checkValue, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIProperties.java b/org/eclipse/swt/internal/mozilla/nsIProperties.java
old mode 100755
new mode 100644
index e854495..6311098
--- a/org/eclipse/swt/internal/mozilla/nsIProperties.java
+++ b/org/eclipse/swt/internal/mozilla/nsIProperties.java
@@ -1,63 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIProperties extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
-
- public static final String NS_IPROPERTIES_IID_STR =
- "78650582-4e93-4b60-8e85-26ebd3eb14ca";
-
- public static final nsID NS_IPROPERTIES_IID =
- new nsID(NS_IPROPERTIES_IID_STR);
-
- public nsIProperties(int /*long*/ address) {
- super(address);
- }
-
- public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
- }
-
- public int Set(byte[] prop, int /*long*/ value) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
- }
-
- public int Has(byte[] prop, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prop, _retval);
- }
-
- public int Undefine(byte[] prop) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
- }
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIProperties extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 5;
+
+ public static final String NS_IPROPERTIES_IID_STR =
+ "78650582-4e93-4b60-8e85-26ebd3eb14ca";
+
+ public static final nsID NS_IPROPERTIES_IID =
+ new nsID(NS_IPROPERTIES_IID_STR);
+
+ public nsIProperties(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Get(byte[] prop, nsID iid, int /*long*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, iid, result);
+ }
+
+ public int Set(byte[] prop, int /*long*/ value) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prop, value);
+ }
+
+ public int Has(byte[] prop, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prop, _retval);
+ }
+
+ public int Undefine(byte[] prop) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), prop);
+ }
+
public int GetKeys(int[] count, int /*long*/[] keys) {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), count, keys);
- }
-}
\ No newline at end of file
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIRequest.java b/org/eclipse/swt/internal/mozilla/nsIRequest.java
old mode 100755
new mode 100644
index 31c9403..909ad0d
--- a/org/eclipse/swt/internal/mozilla/nsIRequest.java
+++ b/org/eclipse/swt/internal/mozilla/nsIRequest.java
@@ -1,101 +1,101 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIRequest extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
- public static final String NS_IREQUEST_IID_STR =
- "ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe";
-
- public static final nsID NS_IREQUEST_IID =
- new nsID(NS_IREQUEST_IID_STR);
-
- public nsIRequest(int /*long*/ address) {
- super(address);
- }
-
- public int GetName(int /*long*/ aName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
- }
-
- public int IsPending(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-
- public int GetStatus(int /*long*/[] aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
- }
-
- public int Cancel(int aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aStatus);
- }
-
- public int Suspend() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
- }
-
- public int Resume() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
- public int GetLoadGroup(int /*long*/[] aLoadGroup) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
- }
-
- public int SetLoadGroup(int /*long*/ aLoadGroup) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
- }
-
- public int GetLoadFlags(int /*long*/[] aLoadFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
- }
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIRequest extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+ public static final String NS_IREQUEST_IID_STR =
+ "ef6bfbd2-fd46-48d8-96b7-9f8f0fd387fe";
+
+ public static final nsID NS_IREQUEST_IID =
+ new nsID(NS_IREQUEST_IID_STR);
+
+ public nsIRequest(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetName(int /*long*/ aName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aName);
+ }
+
+ public int IsPending(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+ public int GetStatus(int /*long*/[] aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aStatus);
+ }
+
+ public int Cancel(int aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aStatus);
+ }
+
+ public int Suspend() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress());
+ }
+
+ public int Resume() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+ public int GetLoadGroup(int /*long*/[] aLoadGroup) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aLoadGroup);
+ }
+
+ public int SetLoadGroup(int /*long*/ aLoadGroup) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLoadGroup);
+ }
+
+ public int GetLoadFlags(int /*long*/[] aLoadFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aLoadFlags);
+ }
+
public int SetLoadFlags(int aLoadFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aLoadFlags);
- }
-
- public static final int LOAD_NORMAL = 0;
-
- public static final int LOAD_BACKGROUND = 1;
-
- public static final int INHIBIT_CACHING = 128;
-
- public static final int INHIBIT_PERSISTENT_CACHING = 256;
-
- public static final int LOAD_BYPASS_CACHE = 512;
-
- public static final int LOAD_FROM_CACHE = 1024;
-
- public static final int VALIDATE_ALWAYS = 2048;
-
- public static final int VALIDATE_NEVER = 4096;
-
- public static final int VALIDATE_ONCE_PER_SESSION = 8192;
-}
\ No newline at end of file
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aLoadFlags);
+ }
+
+ public static final int LOAD_NORMAL = 0;
+
+ public static final int LOAD_BACKGROUND = 1;
+
+ public static final int INHIBIT_CACHING = 128;
+
+ public static final int INHIBIT_PERSISTENT_CACHING = 256;
+
+ public static final int LOAD_BYPASS_CACHE = 512;
+
+ public static final int LOAD_FROM_CACHE = 1024;
+
+ public static final int VALIDATE_ALWAYS = 2048;
+
+ public static final int VALIDATE_NEVER = 4096;
+
+ public static final int VALIDATE_ONCE_PER_SESSION = 8192;
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
old mode 100755
new mode 100644
similarity index 62%
copy from org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
copy to org/eclipse/swt/internal/mozilla/nsISSLStatus.java
index 788f44e..2754d62
--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+++ b/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
@@ -22,54 +22,50 @@
*
* IBM
* - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2005 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
-public class nsIWebBrowserFocus extends nsISupports {
+public class nsISSLStatus extends nsISupports {
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 7;
- public static final String NS_IWEBBROWSERFOCUS_IID_STR =
- "9c5d3c58-1dd1-11b2-a1c9-f3699284657a";
+ public static final String NS_ISSLSTATUS_IID_STR =
+ "cfede939-def1-49be-81ed-d401b3a07d1c";
- public static final nsID NS_IWEBBROWSERFOCUS_IID =
- new nsID(NS_IWEBBROWSERFOCUS_IID_STR);
+ public static final nsID NS_ISSLSTATUS_IID =
+ new nsID(NS_ISSLSTATUS_IID_STR);
- public nsIWebBrowserFocus(int /*long*/ address) {
+ public nsISSLStatus(int /*long*/ address) {
super(address);
}
- public int Activate() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
+ public int GetServerCert(int /*long*/[] aServerCert) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aServerCert);
}
- public int Deactivate() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
+ public int GetCipherName(int /*long*/[] aCipherName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCipherName);
}
- public int SetFocusAtFirstElement() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ public int GetKeyLength(int[] aKeyLength) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aKeyLength);
}
- public int SetFocusAtLastElement() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+ public int GetSecretKeyLength(int[] aSecretKeyLength) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aSecretKeyLength);
}
- public int GetFocusedWindow(int /*long*/[] aFocusedWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aFocusedWindow);
+ public int GetIsDomainMismatch(int[] aIsDomainMismatch) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aIsDomainMismatch);
}
- public int SetFocusedWindow(int /*long*/ aFocusedWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aFocusedWindow);
+ public int GetIsNotValidAtThisTime(int[] aIsNotValidAtThisTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aIsNotValidAtThisTime);
}
- public int GetFocusedElement(int /*long*/[] aFocusedElement) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFocusedElement);
- }
-
- public int SetFocusedElement(int /*long*/ aFocusedElement) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aFocusedElement);
+ public int GetIsUntrusted(int[] aIsUntrusted) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aIsUntrusted);
}
}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
new file mode 100644
index 0000000..b2b7de8
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
@@ -0,0 +1,159 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIScriptSecurityManager_1_9 extends nsIXPCSecurityManager {
+
+ static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + 26;
+
+ public static final String NS_ISCRIPTSECURITYMANAGER_IID_STR =
+ "3fffd8e8-3fea-442e-a0ed-2ba81ae197d5";
+
+ public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+ new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+ public nsIScriptSecurityManager_1_9(int /*long*/ address) {
+ super(address);
+ }
+
+// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+// }
+
+// public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+// }
+
+ public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+ }
+
+ public static final int STANDARD = 0;
+
+ public static final int LOAD_IS_AUTOMATIC_DOCUMENT_REPLACEMENT = 1;
+
+ public static final int ALLOW_CHROME = 2;
+
+ public static final int DISALLOW_INHERIT_PRINCIPAL = 4;
+
+ public static final int DISALLOW_SCRIPT_OR_DATA = 4;
+
+ public static final int DISALLOW_SCRIPT = 8;
+
+ public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+ }
+
+ public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+ }
+
+ public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+ }
+
+ public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+ }
+
+ public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+ }
+
+ public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval);
+ }
+
+ public int GetSubjectPrincipal(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+ public int GetSystemPrincipal(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval);
+// }
+
+ public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval);
+ }
+
+// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval);
+// }
+
+ public int IsCapabilityEnabled(byte[] capability, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 15, getAddress(), capability, _retval);
+ }
+
+ public int EnableCapability(byte[] capability) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 16, getAddress(), capability);
+ }
+
+ public int RevertCapability(byte[] capability) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 17, getAddress(), capability);
+ }
+
+ public int DisableCapability(byte[] capability) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+ }
+
+// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+// }
+
+ public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval);
+ }
+
+ public int SubjectPrincipalIsSystem(int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+ public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+ }
+
+ public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+ }
+
+ public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval);
+ }
+
+ public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval);
+ }
+
+ public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval);
+ }
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
new file mode 100644
index 0000000..25ae481
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
@@ -0,0 +1,159 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIScriptSecurityManager_1_9_1 extends nsIXPCSecurityManager {
+
+ static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + 26;
+
+ public static final String NS_ISCRIPTSECURITYMANAGER_IID_STR =
+ "f8e350b9-9f31-451a-8c8f-d10fea26b780";
+
+ public static final nsID NS_ISCRIPTSECURITYMANAGER_IID =
+ new nsID(NS_ISCRIPTSECURITYMANAGER_IID_STR);
+
+ public nsIScriptSecurityManager_1_9_1(int /*long*/ address) {
+ super(address);
+ }
+
+// public int CheckPropertyAccess(int /*long*/ aJSContext, int /*long*/ aJSObject, byte[] aClassName, !ERROR UNKNOWN C TYPE <jsval >! aProperty, int aAction) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 1, getAddress(), aJSContext, aJSObject, aClassName, aProperty, aAction);
+// }
+
+ public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
+ }
+
+ public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 3, getAddress(), cx, uri);
+ }
+
+ public static final int STANDARD = 0;
+
+ public static final int LOAD_IS_AUTOMATIC_DOCUMENT_REPLACEMENT = 1;
+
+ public static final int ALLOW_CHROME = 2;
+
+ public static final int DISALLOW_INHERIT_PRINCIPAL = 4;
+
+ public static final int DISALLOW_SCRIPT_OR_DATA = 4;
+
+ public static final int DISALLOW_SCRIPT = 8;
+
+ public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 4, getAddress(), aPrincipal, uri, flags);
+ }
+
+ public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 5, getAddress(), from, uri, flags);
+ }
+
+ public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 6, getAddress(), aPrincipal, uri, flags);
+ }
+
+ public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 7, getAddress(), from, uri, flags);
+ }
+
+ public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 8, getAddress(), cx, funObj, targetObj);
+ }
+
+// public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 9, getAddress(), cx, principal, _retval NS_OUTPARAM);
+// }
+
+// public int GetSubjectPrincipal(int /*long*/[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 10, getAddress(), _retval NS_OUTPARAM);
+// }
+
+ public int GetSystemPrincipal(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+// public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 12, getAddress(), aCertFingerprint, aSubjectName, aPrettyName, aCert, aURI, _retval NS_OUTPARAM);
+// }
+
+// public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 13, getAddress(), aURI, _retval NS_OUTPARAM);
+// }
+
+// public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 14, getAddress(), principal, capability, _retval NS_OUTPARAM);
+// }
+
+// public int IsCapabilityEnabled(byte[] capability, int[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 15, getAddress(), capability, _retval NS_OUTPARAM);
+// }
+
+ public int EnableCapability(byte[] capability) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 16, getAddress(), capability);
+ }
+
+ public int RevertCapability(byte[] capability) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 17, getAddress(), capability);
+ }
+
+ public int DisableCapability(byte[] capability) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 18, getAddress(), capability);
+ }
+
+// public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 19, getAddress(), certificateFingerprint, capability, canEnable);
+// }
+
+// public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 20, getAddress(), cx, obj, _retval NS_OUTPARAM);
+// }
+
+// public int SubjectPrincipalIsSystem(int[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 21, getAddress(), _retval NS_OUTPARAM);
+// }
+
+ public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 22, getAddress(), aJSContext, aTargetURI);
+ }
+
+ public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
+ return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 23, getAddress(), aSourceURI, aTargetURI, reportError);
+ }
+
+// public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 24, getAddress(), cx, _retval NS_OUTPARAM);
+// }
+
+// public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 25, getAddress(), aChannel, _retval NS_OUTPARAM);
+// }
+
+// public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval NS_OUTPARAM) {
+// return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), aPrincipal, _retval NS_OUTPARAM);
+// }
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java b/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
new file mode 100644
index 0000000..bc58ffa
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
@@ -0,0 +1,33 @@
+package org.eclipse.swt.internal.mozilla;
+
+
+public class nsISecurityCheckedComponent extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+ public static final String NS_ISECURITYCHECKEDCOMPONENT_IID_STR =
+ "0dad9e8c-a12d-4dcb-9a6f-7d09839356e1";
+
+ public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
+ new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
+
+ public nsISecurityCheckedComponent(int /*long*/ address) {
+ super(address);
+ }
+
+ public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);
+ }
+
+ public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);
+ }
+
+ public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);
+ }
+
+ public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIFactory.java b/org/eclipse/swt/internal/mozilla/nsISerializable.java
old mode 100755
new mode 100644
similarity index 72%
copy from org/eclipse/swt/internal/mozilla/nsIFactory.java
copy to org/eclipse/swt/internal/mozilla/nsISerializable.java
index 5e6f2d4..6e2fed1
--- a/org/eclipse/swt/internal/mozilla/nsIFactory.java
+++ b/org/eclipse/swt/internal/mozilla/nsISerializable.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIFactory extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
- public static final String NS_IFACTORY_IID_STR =
- "00000001-0000-0000-c000-000000000046";
-
- public static final nsID NS_IFACTORY_IID =
- new nsID(NS_IFACTORY_IID_STR);
-
- public nsIFactory(int /*long*/ address) {
- super(address);
- }
-
- public int CreateInstance(int /*long*/ aOuter, nsID iid, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aOuter, iid, result);
- }
-
- public int LockFactory(int lock) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), lock);
- }
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsISerializable extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
+
+ public static final String NS_ISERIALIZABLE_IID_STR =
+ "91cca981-c26d-44a8-bebe-d9ed4891503a";
+
+ public static final nsID NS_ISERIALIZABLE_IID =
+ new nsID(NS_ISERIALIZABLE_IID_STR);
+
+ public nsISerializable(int /*long*/ address) {
+ super(address);
+ }
+
+ public int Read(int /*long*/ aInputStream) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aInputStream);
+ }
+
+ public int Write(int /*long*/ aOutputStream) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aOutputStream);
+ }
}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java b/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
old mode 100755
new mode 100644
index 9a09f90..2f46a69
--- a/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+++ b/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
@@ -1,59 +1,59 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIServiceManager extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
- public static final String NS_ISERVICEMANAGER_IID_STR =
- "8bb35ed9-e332-462d-9155-4a002ab5c958";
-
- public static final nsID NS_ISERVICEMANAGER_IID =
- new nsID(NS_ISERVICEMANAGER_IID_STR);
-
- public nsIServiceManager(int /*long*/ address) {
- super(address);
- }
-
- public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
- }
-
- public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
- }
-
- public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
- }
-
- public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIServiceManager extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+ public static final String NS_ISERVICEMANAGER_IID_STR =
+ "8bb35ed9-e332-462d-9155-4a002ab5c958";
+
+ public static final nsID NS_ISERVICEMANAGER_IID =
+ new nsID(NS_ISERVICEMANAGER_IID_STR);
+
+ public nsIServiceManager(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetService(nsID aClass, nsID aIID, int /*long*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClass, aIID, result);
+ }
+
+ public int GetServiceByContractID(byte[] aContractID, nsID aIID, int /*long*/[] result) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContractID, aIID, result);
+ }
+
+ public int IsServiceInstantiated(nsID aClass, nsID aIID, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aClass, aIID, _retval);
+ }
+
+ public int IsServiceInstantiatedByContractID(byte[] aContractID, nsID aIID, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContractID, aIID, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java b/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
old mode 100755
new mode 100644
index 0052864..9f29e75
--- a/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+++ b/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
@@ -1,51 +1,51 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsISimpleEnumerator extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
-
- public static final String NS_ISIMPLEENUMERATOR_IID_STR =
- "d1899240-f9d2-11d2-bdd6-000064657374";
-
- public static final nsID NS_ISIMPLEENUMERATOR_IID =
- new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
-
- public nsISimpleEnumerator(int /*long*/ address) {
- super(address);
- }
-
- public int HasMoreElements(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
- }
-
- public int GetNext(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsISimpleEnumerator extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 2;
+
+ public static final String NS_ISIMPLEENUMERATOR_IID_STR =
+ "d1899240-f9d2-11d2-bdd6-000064657374";
+
+ public static final nsID NS_ISIMPLEENUMERATOR_IID =
+ new nsID(NS_ISIMPLEENUMERATOR_IID_STR);
+
+ public nsISimpleEnumerator(int /*long*/ address) {
+ super(address);
+ }
+
+ public int HasMoreElements(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), _retval);
+ }
+
+ public int GetNext(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsISupports.java b/org/eclipse/swt/internal/mozilla/nsISupports.java
old mode 100755
new mode 100644
index 5efb3ee..e5d3d7c
--- a/org/eclipse/swt/internal/mozilla/nsISupports.java
+++ b/org/eclipse/swt/internal/mozilla/nsISupports.java
@@ -29,8 +29,15 @@ package org.eclipse.swt.internal.mozilla;
public class nsISupports {
- static final int LAST_METHOD_ID = 2;
-
+ static final boolean IsSolaris;
+ static {
+ String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
+ IsSolaris = osName.startsWith ("sunos") || osName.startsWith("solaris"); //$NON-NLS-1$
+ }
+
+ static final int FIRST_METHOD_ID = IsSolaris ? 2 : 0;
+ static final int LAST_METHOD_ID = FIRST_METHOD_ID + 2;
+
public static final String NS_ISUPPORTS_IID_STR =
"00000000-0000-0000-c000-000000000046";
@@ -48,14 +55,14 @@ public class nsISupports {
}
public int QueryInterface(nsID uuid, int /*long*/[] result) {
- return XPCOM.VtblCall(0, getAddress(), uuid, result);
+ return XPCOM.VtblCall(FIRST_METHOD_ID, getAddress(), uuid, result);
}
public int AddRef() {
- return XPCOM.VtblCall(1, getAddress());
+ return XPCOM.VtblCall(FIRST_METHOD_ID + 1, getAddress());
}
public int Release() {
- return XPCOM.VtblCall(2, getAddress());
+ return XPCOM.VtblCall(FIRST_METHOD_ID + 2, getAddress());
}
}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java b/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsITooltipListener.java b/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsITransfer.java b/org/eclipse/swt/internal/mozilla/nsITransfer.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIURI.java b/org/eclipse/swt/internal/mozilla/nsIURI.java
old mode 100755
new mode 100644
index 773db9a..6c4bc12
--- a/org/eclipse/swt/internal/mozilla/nsIURI.java
+++ b/org/eclipse/swt/internal/mozilla/nsIURI.java
@@ -1,147 +1,147 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIURI extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
-
- public static final String NS_IURI_IID_STR =
- "07a22cc0-0ce5-11d3-9331-00104ba0fd40";
-
- public static final nsID NS_IURI_IID =
- new nsID(NS_IURI_IID_STR);
-
- public nsIURI(int /*long*/ address) {
- super(address);
- }
-
- public int GetSpec(int /*long*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
- public int SetSpec(int /*long*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
- public int GetPrePath(int /*long*/ aPrePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
- }
-
- public int GetScheme(int /*long*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
- }
-
- public int SetScheme(int /*long*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
- }
-
- public int GetUserPass(int /*long*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
- }
-
- public int SetUserPass(int /*long*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
- }
-
- public int GetUsername(int /*long*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
- }
-
- public int SetUsername(int /*long*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
- }
-
- public int GetPassword(int /*long*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
- }
-
- public int SetPassword(int /*long*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
- }
-
- public int GetHostPort(int /*long*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
- }
-
- public int SetHostPort(int /*long*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
- }
-
- public int GetHost(int /*long*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
- }
-
- public int SetHost(int /*long*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
- }
-
- public int GetPort(int[] aPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort);
- }
-
- public int SetPort(int aPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
- }
-
- public int GetPath(int /*long*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
- }
-
- public int SetPath(int /*long*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
- }
-
- public int Equals(int /*long*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
- }
-
- public int SchemeIs(byte[] scheme, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
- }
-
- public int Clone(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
- }
-
- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
- }
-
- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
- }
-
- public int GetAsciiHost(int /*long*/ aAsciiHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
- }
-
- public int GetOriginCharset(int /*long*/ aOriginCharset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIURI extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
+
+ public static final String NS_IURI_IID_STR =
+ "07a22cc0-0ce5-11d3-9331-00104ba0fd40";
+
+ public static final nsID NS_IURI_IID =
+ new nsID(NS_IURI_IID_STR);
+
+ public nsIURI(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetSpec(int /*long*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
+ }
+
+ public int SetSpec(int /*long*/ aSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
+ }
+
+ public int GetPrePath(int /*long*/ aPrePath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
+ }
+
+ public int GetScheme(int /*long*/ aScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
+ }
+
+ public int SetScheme(int /*long*/ aScheme) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
+ }
+
+ public int GetUserPass(int /*long*/ aUserPass) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
+ }
+
+ public int SetUserPass(int /*long*/ aUserPass) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
+ }
+
+ public int GetUsername(int /*long*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
+ }
+
+ public int SetUsername(int /*long*/ aUsername) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
+ }
+
+ public int GetPassword(int /*long*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
+ }
+
+ public int SetPassword(int /*long*/ aPassword) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
+ }
+
+ public int GetHostPort(int /*long*/ aHostPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
+ }
+
+ public int SetHostPort(int /*long*/ aHostPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
+ }
+
+ public int GetHost(int /*long*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
+ }
+
+ public int SetHost(int /*long*/ aHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
+ }
+
+ public int GetPort(int[] aPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort);
+ }
+
+ public int SetPort(int aPort) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
+ }
+
+ public int GetPath(int /*long*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
+ }
+
+ public int SetPath(int /*long*/ aPath) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
+ }
+
+ public int Equals(int /*long*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
+ }
+
+ public int SchemeIs(byte[] scheme, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
+ }
+
+ public int Clone(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+ }
+
+ public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
+ }
+
+ public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
+ }
+
+ public int GetAsciiHost(int /*long*/ aAsciiHost) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
+ }
+
+ public int GetOriginCharset(int /*long*/ aOriginCharset) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java b/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
old mode 100755
new mode 100644
index ca9a722..aa6378e
--- a/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+++ b/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
@@ -1,75 +1,75 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIURIContentListener extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
- public static final String NS_IURICONTENTLISTENER_IID_STR =
- "94928ab3-8b63-11d3-989d-001083010e9b";
-
- public static final nsID NS_IURICONTENTLISTENER_IID =
- new nsID(NS_IURICONTENTLISTENER_IID_STR);
-
- public nsIURIContentListener(int /*long*/ address) {
- super(address);
- }
-
- public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
- }
-
- public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
- }
-
- public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
- }
-
- public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
- }
-
- public int GetLoadCookie(int /*long*/[] aLoadCookie) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
- }
-
- public int SetLoadCookie(int /*long*/ aLoadCookie) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
- }
-
- public int GetParentContentListener(int /*long*/[] aParentContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
- }
-
- public int SetParentContentListener(int /*long*/ aParentContentListener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIURIContentListener extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+ public static final String NS_IURICONTENTLISTENER_IID_STR =
+ "94928ab3-8b63-11d3-989d-001083010e9b";
+
+ public static final nsID NS_IURICONTENTLISTENER_IID =
+ new nsID(NS_IURICONTENTLISTENER_IID_STR);
+
+ public nsIURIContentListener(int /*long*/ address) {
+ super(address);
+ }
+
+ public int OnStartURIOpen(int /*long*/ aURI, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aURI, _retval);
+ }
+
+ public int DoContent(byte[] aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/[] aContentHandler, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aContentType, aIsContentPreferred, aRequest, aContentHandler, _retval);
+ }
+
+ public int IsPreferred(byte[] aContentType, int /*long*/[] aDesiredContentType, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aContentType, aDesiredContentType, _retval);
+ }
+
+ public int CanHandleContent(byte[] aContentType, int aIsContentPreferred, int /*long*/[] aDesiredContentType, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aContentType, aIsContentPreferred, aDesiredContentType, _retval);
+ }
+
+ public int GetLoadCookie(int /*long*/[] aLoadCookie) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aLoadCookie);
+ }
+
+ public int SetLoadCookie(int /*long*/ aLoadCookie) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLoadCookie);
+ }
+
+ public int GetParentContentListener(int /*long*/[] aParentContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aParentContentListener);
+ }
+
+ public int SetParentContentListener(int /*long*/ aParentContentListener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aParentContentListener);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIURI.java b/org/eclipse/swt/internal/mozilla/nsIVariant.java
old mode 100755
new mode 100644
similarity index 58%
copy from org/eclipse/swt/internal/mozilla/nsIURI.java
copy to org/eclipse/swt/internal/mozilla/nsIVariant.java
index 773db9a..2de3baf
--- a/org/eclipse/swt/internal/mozilla/nsIURI.java
+++ b/org/eclipse/swt/internal/mozilla/nsIVariant.java
@@ -1,147 +1,147 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIURI extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
-
- public static final String NS_IURI_IID_STR =
- "07a22cc0-0ce5-11d3-9331-00104ba0fd40";
-
- public static final nsID NS_IURI_IID =
- new nsID(NS_IURI_IID_STR);
-
- public nsIURI(int /*long*/ address) {
- super(address);
- }
-
- public int GetSpec(int /*long*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aSpec);
- }
-
- public int SetSpec(int /*long*/ aSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSpec);
- }
-
- public int GetPrePath(int /*long*/ aPrePath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aPrePath);
- }
-
- public int GetScheme(int /*long*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aScheme);
- }
-
- public int SetScheme(int /*long*/ aScheme) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aScheme);
- }
-
- public int GetUserPass(int /*long*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aUserPass);
- }
-
- public int SetUserPass(int /*long*/ aUserPass) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aUserPass);
- }
-
- public int GetUsername(int /*long*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aUsername);
- }
-
- public int SetUsername(int /*long*/ aUsername) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aUsername);
- }
-
- public int GetPassword(int /*long*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPassword);
- }
-
- public int SetPassword(int /*long*/ aPassword) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aPassword);
- }
-
- public int GetHostPort(int /*long*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aHostPort);
- }
-
- public int SetHostPort(int /*long*/ aHostPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aHostPort);
- }
-
- public int GetHost(int /*long*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aHost);
- }
-
- public int SetHost(int /*long*/ aHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aHost);
- }
-
- public int GetPort(int[] aPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aPort);
- }
-
- public int SetPort(int aPort) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aPort);
- }
-
- public int GetPath(int /*long*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aPath);
- }
-
- public int SetPath(int /*long*/ aPath) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aPath);
- }
-
- public int Equals(int /*long*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), other, _retval);
- }
-
- public int SchemeIs(byte[] scheme, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), scheme, _retval);
- }
-
- public int Clone(int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
- }
-
- public int Resolve(int /*long*/ relativePath, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), relativePath, _retval);
- }
-
- public int GetAsciiSpec(int /*long*/ aAsciiSpec) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aAsciiSpec);
- }
-
- public int GetAsciiHost(int /*long*/ aAsciiHost) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aAsciiHost);
- }
-
- public int GetOriginCharset(int /*long*/ aOriginCharset) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aOriginCharset);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIVariant extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
+
+ public static final String NS_IVARIANT_IID_STR =
+ "6c9eb060-8c6a-11d5-90f3-0010a4e73d9a";
+
+ public static final nsID NS_IVARIANT_IID =
+ new nsID(NS_IVARIANT_IID_STR);
+
+ public nsIVariant(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetDataType(short[] aDataType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aDataType);
+ }
+
+ public int GetAsInt8(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), _retval);
+ }
+
+ public int GetAsInt16(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), _retval);
+ }
+
+ public int GetAsInt32(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), _retval);
+ }
+
+ public int GetAsInt64(long[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), _retval);
+ }
+
+ public int GetAsUint8(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), _retval);
+ }
+
+ public int GetAsUint16(short[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), _retval);
+ }
+
+ public int GetAsUint32(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), _retval);
+ }
+
+ public int GetAsUint64(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+ public int GetAsFloat(float[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), _retval);
+ }
+
+ public int GetAsDouble(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), _retval);
+ }
+
+ public int GetAsBool(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), _retval);
+ }
+
+ public int GetAsChar(byte[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), _retval);
+ }
+
+ public int GetAsWChar(char[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), _retval);
+ }
+
+ public int GetAsID(int /*long*/ retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), retval);
+ }
+
+ public int GetAsAString(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), _retval);
+ }
+
+ public int GetAsDOMString(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);
+ }
+
+ public int GetAsACString(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), _retval);
+ }
+
+ public int GetAsAUTF8String(int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), _retval);
+ }
+
+ public int GetAsString(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), _retval);
+ }
+
+ public int GetAsWString(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+ public int GetAsISupports(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
+ }
+
+ public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);
+ }
+
+ public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);
+ }
+
+ public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);
+ }
+
+ public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWeakReference.java b/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
old mode 100755
new mode 100644
index 140d7b5..823c4a6
--- a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
@@ -1,137 +1,137 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIWebBrowserChrome extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
-
- public static final String NS_IWEBBROWSERCHROME_IID_STR =
- "ba434c60-9d52-11d3-afb0-00a024ffc08c";
-
- public static final nsID NS_IWEBBROWSERCHROME_IID =
- new nsID(NS_IWEBBROWSERCHROME_IID_STR);
-
- public nsIWebBrowserChrome(int /*long*/ address) {
- super(address);
- }
-
- public static final int STATUS_SCRIPT = 1;
-
- public static final int STATUS_SCRIPT_DEFAULT = 2;
-
- public static final int STATUS_LINK = 3;
-
- public int SetStatus(int statusType, char[] status) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
- }
-
- public int GetWebBrowser(int /*long*/[] aWebBrowser) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
- }
-
- public int SetWebBrowser(int /*long*/ aWebBrowser) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
- }
-
- public static final int CHROME_DEFAULT = 1;
-
- public static final int CHROME_WINDOW_BORDERS = 2;
-
- public static final int CHROME_WINDOW_CLOSE = 4;
-
- public static final int CHROME_WINDOW_RESIZE = 8;
-
- public static final int CHROME_MENUBAR = 16;
-
- public static final int CHROME_TOOLBAR = 32;
-
- public static final int CHROME_LOCATIONBAR = 64;
-
- public static final int CHROME_STATUSBAR = 128;
-
- public static final int CHROME_PERSONAL_TOOLBAR = 256;
-
- public static final int CHROME_SCROLLBARS = 512;
-
- public static final int CHROME_TITLEBAR = 1024;
-
- public static final int CHROME_EXTRA = 2048;
-
- public static final int CHROME_WITH_SIZE = 4096;
-
- public static final int CHROME_WITH_POSITION = 8192;
-
- public static final int CHROME_WINDOW_MIN = 16384;
-
- public static final int CHROME_WINDOW_POPUP = 32768;
-
- public static final int CHROME_WINDOW_RAISED = 33554432;
-
- public static final int CHROME_WINDOW_LOWERED = 67108864;
-
- public static final int CHROME_CENTER_SCREEN = 134217728;
-
- public static final int CHROME_DEPENDENT = 268435456;
-
- public static final int CHROME_MODAL = 536870912;
-
- public static final int CHROME_OPENAS_DIALOG = 1073741824;
-
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserChrome extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 10;
+
+ public static final String NS_IWEBBROWSERCHROME_IID_STR =
+ "ba434c60-9d52-11d3-afb0-00a024ffc08c";
+
+ public static final nsID NS_IWEBBROWSERCHROME_IID =
+ new nsID(NS_IWEBBROWSERCHROME_IID_STR);
+
+ public nsIWebBrowserChrome(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int STATUS_SCRIPT = 1;
+
+ public static final int STATUS_SCRIPT_DEFAULT = 2;
+
+ public static final int STATUS_LINK = 3;
+
+ public int SetStatus(int statusType, char[] status) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), statusType, status);
+ }
+
+ public int GetWebBrowser(int /*long*/[] aWebBrowser) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWebBrowser);
+ }
+
+ public int SetWebBrowser(int /*long*/ aWebBrowser) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aWebBrowser);
+ }
+
+ public static final int CHROME_DEFAULT = 1;
+
+ public static final int CHROME_WINDOW_BORDERS = 2;
+
+ public static final int CHROME_WINDOW_CLOSE = 4;
+
+ public static final int CHROME_WINDOW_RESIZE = 8;
+
+ public static final int CHROME_MENUBAR = 16;
+
+ public static final int CHROME_TOOLBAR = 32;
+
+ public static final int CHROME_LOCATIONBAR = 64;
+
+ public static final int CHROME_STATUSBAR = 128;
+
+ public static final int CHROME_PERSONAL_TOOLBAR = 256;
+
+ public static final int CHROME_SCROLLBARS = 512;
+
+ public static final int CHROME_TITLEBAR = 1024;
+
+ public static final int CHROME_EXTRA = 2048;
+
+ public static final int CHROME_WITH_SIZE = 4096;
+
+ public static final int CHROME_WITH_POSITION = 8192;
+
+ public static final int CHROME_WINDOW_MIN = 16384;
+
+ public static final int CHROME_WINDOW_POPUP = 32768;
+
+ public static final int CHROME_WINDOW_RAISED = 33554432;
+
+ public static final int CHROME_WINDOW_LOWERED = 67108864;
+
+ public static final int CHROME_CENTER_SCREEN = 134217728;
+
+ public static final int CHROME_DEPENDENT = 268435456;
+
+ public static final int CHROME_MODAL = 536870912;
+
+ public static final int CHROME_OPENAS_DIALOG = 1073741824;
+
public static final int CHROME_OPENAS_CHROME = -2147483648;
-
- public static final int CHROME_ALL = 4094;
-
- public int GetChromeFlags(int[] aChromeFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aChromeFlags);
- }
-
- public int SetChromeFlags(int aChromeFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aChromeFlags);
- }
-
- public int DestroyBrowserWindow() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
- }
-
- public int SizeBrowserTo(int aCX, int aCY) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aCX, aCY);
- }
-
- public int ShowAsModal() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
-
- public int IsWindowModal(int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
- }
-
- public int ExitModalEventLoop(int aStatus) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aStatus);
- }
-}
\ No newline at end of file
+
+ public static final int CHROME_ALL = 4094;
+
+ public int GetChromeFlags(int[] aChromeFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aChromeFlags);
+ }
+
+ public int SetChromeFlags(int aChromeFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aChromeFlags);
+ }
+
+ public int DestroyBrowserWindow() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress());
+ }
+
+ public int SizeBrowserTo(int aCX, int aCY) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aCX, aCY);
+ }
+
+ public int ShowAsModal() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
+ }
+
+ public int IsWindowModal(int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), _retval);
+ }
+
+ public int ExitModalEventLoop(int aStatus) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aStatus);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
old mode 100755
new mode 100644
similarity index 60%
copy from org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
copy to org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
index 9b80511..6ea241f
--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
@@ -1,47 +1,63 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryServiceProvider extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
-
- public static final String NS_IDIRECTORYSERVICEPROVIDER_IID_STR =
- "bbf8cab0-d43a-11d3-8cc2-00609792278c";
-
- public static final nsID NS_IDIRECTORYSERVICEPROVIDER_IID =
- new nsID(NS_IDIRECTORYSERVICEPROVIDER_IID_STR);
-
- public nsIDirectoryServiceProvider(int /*long*/ address) {
- super(address);
- }
-
- public int GetFile(byte[] prop, int[] persistent, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), prop, persistent, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserSetup extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 1;
+
+ public static final String NS_IWEBBROWSERSETUP_IID_STR =
+ "f15398a0-8018-11d3-af70-00a024ffc08c";
+
+ public static final nsID NS_IWEBBROWSERSETUP_IID =
+ new nsID(NS_IWEBBROWSERSETUP_IID_STR);
+
+ public nsIWebBrowserSetup(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int SETUP_ALLOW_PLUGINS = 1;
+
+ public static final int SETUP_ALLOW_JAVASCRIPT = 2;
+
+ public static final int SETUP_ALLOW_META_REDIRECTS = 3;
+
+ public static final int SETUP_ALLOW_SUBFRAMES = 4;
+
+ public static final int SETUP_ALLOW_IMAGES = 5;
+
+ public static final int SETUP_FOCUS_DOC_BEFORE_CONTENT = 6;
+
+ public static final int SETUP_USE_GLOBAL_HISTORY = 256;
+
+ public static final int SETUP_IS_CHROME_WRAPPER = 7;
+
+ public int SetProperty(int aId, int aValue) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aId, aValue);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java b/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
old mode 100755
new mode 100644
similarity index 69%
copy from org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
copy to org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
index a96aadd..740ab4c
--- a/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+++ b/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
@@ -1,55 +1,55 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIDirectoryService extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-
- public static final String NS_IDIRECTORYSERVICE_IID_STR =
- "57a66a60-d43a-11d3-8cc2-00609792278c";
-
- public static final nsID NS_IDIRECTORYSERVICE_IID =
- new nsID(NS_IDIRECTORYSERVICE_IID_STR);
-
- public nsIDirectoryService(int /*long*/ address) {
- super(address);
- }
-
- public int Init() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress());
- }
-
- public int RegisterProvider(int /*long*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), prov);
- }
-
- public int UnregisterProvider(int /*long*/ prov) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), prov);
- }
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebBrowserStream extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
+
+ public static final String NS_IWEBBROWSERSTREAM_IID_STR =
+ "86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
+
+ public static final nsID NS_IWEBBROWSERSTREAM_IID =
+ new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
+
+ public nsIWebBrowserStream(int /*long*/ address) {
+ super(address);
+ }
+
+ public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
+ }
+
+ public int AppendToStream(int /*long*/ aData, int aLen) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
+ }
+
+ public int CloseStream() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java b/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
old mode 100755
new mode 100644
index a22736f..24248d2
--- a/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+++ b/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
@@ -1,119 +1,119 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIWebNavigation extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 13;
-
- public static final String NS_IWEBNAVIGATION_IID_STR =
- "f5d9e7b0-d930-11d3-b057-00a024ffc08c";
-
- public static final nsID NS_IWEBNAVIGATION_IID =
- new nsID(NS_IWEBNAVIGATION_IID_STR);
-
- public nsIWebNavigation(int /*long*/ address) {
- super(address);
- }
-
- public int GetCanGoBack(int[] aCanGoBack) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
- }
-
- public int GetCanGoForward(int[] aCanGoForward) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);
- }
-
- public int GoBack() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
- public int GoForward() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
- }
-
- public int GotoIndex(int index) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), index);
- }
-
- public static final int LOAD_FLAGS_MASK = 65535;
-
- public static final int LOAD_FLAGS_NONE = 0;
-
- public static final int LOAD_FLAGS_IS_REFRESH = 16;
-
- public static final int LOAD_FLAGS_IS_LINK = 32;
-
- public static final int LOAD_FLAGS_BYPASS_HISTORY = 64;
-
- public static final int LOAD_FLAGS_REPLACE_HISTORY = 128;
-
- public static final int LOAD_FLAGS_BYPASS_CACHE = 256;
-
- public static final int LOAD_FLAGS_BYPASS_PROXY = 512;
-
- public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
-
- public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
- }
-
- public int Reload(int reloadFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), reloadFlags);
- }
-
- public static final int STOP_NETWORK = 1;
-
- public static final int STOP_CONTENT = 2;
-
- public static final int STOP_ALL = 3;
-
- public int Stop(int stopFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
- }
-
- public int GetDocument(int /*long*/[] aDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
- }
-
- public int GetCurrentURI(int /*long*/[] aCurrentURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
- }
-
- public int GetReferringURI(int /*long*/[] aReferringURI) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
- }
-
- public int GetSessionHistory(int /*long*/[] aSessionHistory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
- }
-
- public int SetSessionHistory(int /*long*/ aSessionHistory) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebNavigation extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 13;
+
+ public static final String NS_IWEBNAVIGATION_IID_STR =
+ "f5d9e7b0-d930-11d3-b057-00a024ffc08c";
+
+ public static final nsID NS_IWEBNAVIGATION_IID =
+ new nsID(NS_IWEBNAVIGATION_IID_STR);
+
+ public nsIWebNavigation(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetCanGoBack(int[] aCanGoBack) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aCanGoBack);
+ }
+
+ public int GetCanGoForward(int[] aCanGoForward) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aCanGoForward);
+ }
+
+ public int GoBack() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
+ }
+
+ public int GoForward() {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
+ }
+
+ public int GotoIndex(int index) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), index);
+ }
+
+ public static final int LOAD_FLAGS_MASK = 65535;
+
+ public static final int LOAD_FLAGS_NONE = 0;
+
+ public static final int LOAD_FLAGS_IS_REFRESH = 16;
+
+ public static final int LOAD_FLAGS_IS_LINK = 32;
+
+ public static final int LOAD_FLAGS_BYPASS_HISTORY = 64;
+
+ public static final int LOAD_FLAGS_REPLACE_HISTORY = 128;
+
+ public static final int LOAD_FLAGS_BYPASS_CACHE = 256;
+
+ public static final int LOAD_FLAGS_BYPASS_PROXY = 512;
+
+ public static final int LOAD_FLAGS_CHARSET_CHANGE = 1024;
+
+ public int LoadURI(char[] uri, int loadFlags, int /*long*/ referrer, int /*long*/ postData, int /*long*/ headers) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), uri, loadFlags, referrer, postData, headers);
+ }
+
+ public int Reload(int reloadFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), reloadFlags);
+ }
+
+ public static final int STOP_NETWORK = 1;
+
+ public static final int STOP_CONTENT = 2;
+
+ public static final int STOP_ALL = 3;
+
+ public int Stop(int stopFlags) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), stopFlags);
+ }
+
+ public int GetDocument(int /*long*/[] aDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aDocument);
+ }
+
+ public int GetCurrentURI(int /*long*/[] aCurrentURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aCurrentURI);
+ }
+
+ public int GetReferringURI(int /*long*/[] aReferringURI) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aReferringURI);
+ }
+
+ public int GetSessionHistory(int /*long*/[] aSessionHistory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aSessionHistory);
+ }
+
+ public int SetSessionHistory(int /*long*/ aSessionHistory) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSessionHistory);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java b/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgress.java b/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
old mode 100755
new mode 100644
index d211bf5..05fd351
--- a/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+++ b/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
@@ -1,79 +1,79 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIWebProgress extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
- public static final String NS_IWEBPROGRESS_IID_STR =
- "570f39d0-efd0-11d3-b093-00a024ffc08c";
-
- public static final nsID NS_IWEBPROGRESS_IID =
- new nsID(NS_IWEBPROGRESS_IID_STR);
-
- public nsIWebProgress(int /*long*/ address) {
- super(address);
- }
-
- public static final int NOTIFY_STATE_REQUEST = 1;
-
- public static final int NOTIFY_STATE_DOCUMENT = 2;
-
- public static final int NOTIFY_STATE_NETWORK = 4;
-
- public static final int NOTIFY_STATE_WINDOW = 8;
-
- public static final int NOTIFY_STATE_ALL = 15;
-
- public static final int NOTIFY_PROGRESS = 16;
-
- public static final int NOTIFY_STATUS = 32;
-
- public static final int NOTIFY_SECURITY = 64;
-
- public static final int NOTIFY_LOCATION = 128;
-
- public static final int NOTIFY_ALL = 255;
-
- public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
- }
-
- public int RemoveProgressListener(int /*long*/ listener) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
- }
-
- public int GetDOMWindow(int /*long*/[] aDOMWindow) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
- }
-
- public int GetIsLoadingDocument(int[] aIsLoadingDocument) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWebProgress extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+ public static final String NS_IWEBPROGRESS_IID_STR =
+ "570f39d0-efd0-11d3-b093-00a024ffc08c";
+
+ public static final nsID NS_IWEBPROGRESS_IID =
+ new nsID(NS_IWEBPROGRESS_IID_STR);
+
+ public nsIWebProgress(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int NOTIFY_STATE_REQUEST = 1;
+
+ public static final int NOTIFY_STATE_DOCUMENT = 2;
+
+ public static final int NOTIFY_STATE_NETWORK = 4;
+
+ public static final int NOTIFY_STATE_WINDOW = 8;
+
+ public static final int NOTIFY_STATE_ALL = 15;
+
+ public static final int NOTIFY_PROGRESS = 16;
+
+ public static final int NOTIFY_STATUS = 32;
+
+ public static final int NOTIFY_SECURITY = 64;
+
+ public static final int NOTIFY_LOCATION = 128;
+
+ public static final int NOTIFY_ALL = 255;
+
+ public int AddProgressListener(int /*long*/ listener, int aNotifyMask) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), listener, aNotifyMask);
+ }
+
+ public int RemoveProgressListener(int /*long*/ listener) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), listener);
+ }
+
+ public int GetDOMWindow(int /*long*/[] aDOMWindow) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aDOMWindow);
+ }
+
+ public int GetIsLoadingDocument(int[] aIsLoadingDocument) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aIsLoadingDocument);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java b/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java b/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java b/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
old mode 100755
new mode 100644
index be52820..4bfec46
--- a/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+++ b/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
@@ -1,49 +1,49 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIWindowCreator2 extends nsIWindowCreator {
-
- static final int LAST_METHOD_ID = nsIWindowCreator.LAST_METHOD_ID + 1;
-
- public static final String NS_IWINDOWCREATOR2_IID_STR =
- "f673ec81-a4b0-11d6-964b-eb5a2bf216fc";
-
- public static final nsID NS_IWINDOWCREATOR2_IID =
- new nsID(NS_IWINDOWCREATOR2_IID_STR);
-
- public nsIWindowCreator2(int /*long*/ address) {
- super(address);
- }
-
- public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
-
- public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
- }
-}
\ No newline at end of file
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIWindowCreator2 extends nsIWindowCreator {
+
+ static final int LAST_METHOD_ID = nsIWindowCreator.LAST_METHOD_ID + 1;
+
+ public static final String NS_IWINDOWCREATOR2_IID_STR =
+ "f673ec81-a4b0-11d6-964b-eb5a2bf216fc";
+
+ public static final nsID NS_IWINDOWCREATOR2_IID =
+ new nsID(NS_IWINDOWCREATOR2_IID_STR);
+
+ public nsIWindowCreator2(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int PARENT_IS_LOADING_OR_RUNNING_TIMEOUT = 1;
+
+ public int CreateChromeWindow2(int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int[] cancel, int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsIWindowCreator.LAST_METHOD_ID + 1, getAddress(), parent, chromeFlags, contextFlags, uri, cancel, _retval);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java b/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java b/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
new file mode 100644
index 0000000..30b340c
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
@@ -0,0 +1,141 @@
+package org.eclipse.swt.internal.mozilla;
+
+
+public class nsIWritableVariant extends nsIVariant {
+
+ static final int LAST_METHOD_ID = nsIVariant.LAST_METHOD_ID + 31;
+
+ public static final String NS_IWRITABLEVARIANT_IID_STR =
+ "5586a590-8c82-11d5-90f3-0010a4e73d9a";
+
+ public static final nsID NS_IWRITABLEVARIANT_IID =
+ new nsID(NS_IWRITABLEVARIANT_IID_STR);
+
+ public nsIWritableVariant(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetWritable(int[] aWritable) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 1, getAddress(), aWritable);
+ }
+
+ public int SetWritable(int aWritable) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 2, getAddress(), aWritable);
+ }
+
+// public int SetAsInt8(!ERROR UNKNOWN C TYPE <PRUint8 >! aValue) {
+// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 3, getAddress(), aValue);
+// }
+//
+// public int SetAsInt16(!ERROR UNKNOWN C TYPE <PRInt16 >! aValue) {
+// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 4, getAddress(), aValue);
+// }
+
+ public int SetAsInt32(int aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 5, getAddress(), aValue);
+ }
+
+ public int SetAsInt64(long aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 6, getAddress(), aValue);
+ }
+
+// public int SetAsUint8(!ERROR UNKNOWN C TYPE <PRUint8 >! aValue) {
+// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 7, getAddress(), aValue);
+// }
+
+ public int SetAsUint16(short aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 8, getAddress(), aValue);
+ }
+
+ public int SetAsUint32(int aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 9, getAddress(), aValue);
+ }
+
+// public int SetAsUint64(!ERROR UNKNOWN C TYPE <PRUint64 >! aValue) {
+// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 10, getAddress(), aValue);
+// }
+
+ public int SetAsFloat(float aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 11, getAddress(), aValue);
+ }
+
+ public int SetAsDouble(double aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 12, getAddress(), aValue);
+ }
+
+ public int SetAsBool(int aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 13, getAddress(), aValue);
+ }
+
+// public int SetAsChar(!ERROR UNKNOWN C TYPE <char >! aValue) {
+// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 14, getAddress(), aValue);
+// }
+//
+// public int SetAsWChar(!ERROR UNKNOWN C TYPE <PRUnichar >! aValue) {
+// return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 15, getAddress(), aValue);
+// }
+
+ public int SetAsID(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 16, getAddress(), aValue);
+ }
+
+ public int SetAsAString(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 17, getAddress(), aValue);
+ }
+
+ public int SetAsDOMString(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 18, getAddress(), aValue);
+ }
+
+ public int SetAsACString(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 19, getAddress(), aValue);
+ }
+
+ public int SetAsAUTF8String(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 20, getAddress(), aValue);
+ }
+
+ public int SetAsString(byte[] aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 21, getAddress(), aValue);
+ }
+
+ public int SetAsWString(char[] aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 22, getAddress(), aValue);
+ }
+
+ public int SetAsISupports(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 23, getAddress(), aValue);
+ }
+
+ public int SetAsInterface(nsID iid, int /*long*/ iface) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 24, getAddress(), iid, iface);
+ }
+
+ public int SetAsArray(short type, int /*long*/ iid, int count, int /*long*/ ptr) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 25, getAddress(), type, iid, count, ptr);
+ }
+
+ public int SetAsStringWithSize(int size, byte[] str) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 26, getAddress(), size, str);
+ }
+
+ public int SetAsWStringWithSize(int size, char[] str) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 27, getAddress(), size, str);
+ }
+
+ public int SetAsVoid() {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 28, getAddress());
+ }
+
+ public int SetAsEmpty() {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 29, getAddress());
+ }
+
+ public int SetAsEmptyArray() {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 30, getAddress());
+ }
+
+ public int SetFromVariant(int /*long*/ aValue) {
+ return XPCOM.VtblCall(nsIVariant.LAST_METHOD_ID + 31, getAddress(), aValue);
+ }
+}
diff --git a/org/eclipse/swt/internal/mozilla/nsIX509Cert.java b/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
new file mode 100644
index 0000000..6023055
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
@@ -0,0 +1,203 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIX509Cert extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 27;
+
+ public static final String NS_IX509CERT_IID_STR =
+ "f0980f60-ee3d-11d4-998b-00b0d02354a0";
+
+ public static final nsID NS_IX509CERT_IID =
+ new nsID(NS_IX509CERT_IID_STR);
+
+ public nsIX509Cert(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetNickname(int /*long*/ aNickname) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNickname);
+ }
+
+ public int GetEmailAddress(int /*long*/ aEmailAddress) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aEmailAddress);
+ }
+
+ public int GetEmailAddresses(int[] length, int /*long*/[] addresses) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), length, addresses);
+ }
+
+ public int ContainsEmailAddress(int /*long*/ aEmailAddress, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aEmailAddress, _retval);
+ }
+
+ public int GetSubjectName(int /*long*/ aSubjectName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aSubjectName);
+ }
+
+ public int GetCommonName(int /*long*/ aCommonName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aCommonName);
+ }
+
+ public int GetOrganization(int /*long*/ aOrganization) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aOrganization);
+ }
+
+ public int GetOrganizationalUnit(int /*long*/ aOrganizationalUnit) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aOrganizationalUnit);
+ }
+
+ public int GetSha1Fingerprint(int /*long*/ aSha1Fingerprint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aSha1Fingerprint);
+ }
+
+ public int GetMd5Fingerprint(int /*long*/ aMd5Fingerprint) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aMd5Fingerprint);
+ }
+
+ public int GetTokenName(int /*long*/ aTokenName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aTokenName);
+ }
+
+ public int GetIssuerName(int /*long*/ aIssuerName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aIssuerName);
+ }
+
+ public int GetSerialNumber(int /*long*/ aSerialNumber) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aSerialNumber);
+ }
+
+ public int GetIssuerCommonName(int /*long*/ aIssuerCommonName) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aIssuerCommonName);
+ }
+
+ public int GetIssuerOrganization(int /*long*/ aIssuerOrganization) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aIssuerOrganization);
+ }
+
+ public int GetIssuerOrganizationUnit(int /*long*/ aIssuerOrganizationUnit) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aIssuerOrganizationUnit);
+ }
+
+ public int GetIssuer(int /*long*/[] aIssuer) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aIssuer);
+ }
+
+ public int GetValidity(int /*long*/[] aValidity) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aValidity);
+ }
+
+ public int GetDbKey(int /*long*/[] aDbKey) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aDbKey);
+ }
+
+ public int GetWindowTitle(int /*long*/[] aWindowTitle) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aWindowTitle);
+ }
+
+ public static final int UNKNOWN_CERT = 0;
+
+ public static final int CA_CERT = 1;
+
+ public static final int USER_CERT = 2;
+
+ public static final int EMAIL_CERT = 4;
+
+ public static final int SERVER_CERT = 8;
+
+ public static final int VERIFIED_OK = 0;
+
+ public static final int NOT_VERIFIED_UNKNOWN = 1;
+
+ public static final int CERT_REVOKED = 2;
+
+ public static final int CERT_EXPIRED = 4;
+
+ public static final int CERT_NOT_TRUSTED = 8;
+
+ public static final int ISSUER_NOT_TRUSTED = 16;
+
+ public static final int ISSUER_UNKNOWN = 32;
+
+ public static final int INVALID_CA = 64;
+
+ public static final int USAGE_NOT_ALLOWED = 128;
+
+ public static final int CERT_USAGE_SSLClient = 0;
+
+ public static final int CERT_USAGE_SSLServer = 1;
+
+ public static final int CERT_USAGE_SSLServerWithStepUp = 2;
+
+ public static final int CERT_USAGE_SSLCA = 3;
+
+ public static final int CERT_USAGE_EmailSigner = 4;
+
+ public static final int CERT_USAGE_EmailRecipient = 5;
+
+ public static final int CERT_USAGE_ObjectSigner = 6;
+
+ public static final int CERT_USAGE_UserCertImport = 7;
+
+ public static final int CERT_USAGE_VerifyCA = 8;
+
+ public static final int CERT_USAGE_ProtectedObjectSigner = 9;
+
+ public static final int CERT_USAGE_StatusResponder = 10;
+
+ public static final int CERT_USAGE_AnyCA = 11;
+
+ public int GetChain(int /*long*/[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), _retval);
+ }
+
+ public int GetUsagesArray(int ignoreOcsp, int[] verified, int[] count, int /*long*/[] usages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), ignoreOcsp, verified, count, usages);
+ }
+
+ public int GetUsagesString(int ignoreOcsp, int[] verified, int /*long*/ usages) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), ignoreOcsp, verified, usages);
+ }
+
+ public int VerifyForUsage(int usage, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), usage, _retval);
+ }
+
+ public int GetASN1Structure(int /*long*/[] aASN1Structure) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aASN1Structure);
+ }
+
+ public int GetRawDER(int[] length, int /*long*/[] data) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), length, data);
+ }
+
+ public int Equals(int /*long*/ other, int[] _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
+ }
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
old mode 100755
new mode 100644
similarity index 61%
copy from org/eclipse/swt/internal/mozilla/nsIAppShell.java
copy to org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
index 71942b2..2357b4d
--- a/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+++ b/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
@@ -1,75 +1,75 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2008 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIAppShell extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
-
- public static final String NS_IAPPSHELL_IID_STR =
- "a0757c31-eeac-11d1-9ec1-00aa002fb821";
-
- public static final nsID NS_IAPPSHELL_IID =
- new nsID(NS_IAPPSHELL_IID_STR);
-
- public nsIAppShell(int /*long*/ address) {
- super(address);
- }
-
- public int Create(int /*long*/ argc, int /*long*/[] argv) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), argc, argv);
- }
-
- public int Run() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress());
- }
-
- public int Spinup() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
- }
-
- public int Spindown() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress());
- }
-
- public int ListenToEventQueue(int /*long*/ aQueue, int aListen) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aQueue, aListen);
- }
-
- public int GetNativeEvent(int /*long*/ aRealEvent, int /*long*/[] aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aRealEvent, aEvent);
- }
-
- public int DispatchNativeEvent(int aRealEvent, int /*long*/ aEvent) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aRealEvent, aEvent);
- }
-
- public int Exit() {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress());
- }
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIX509CertValidity extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8;
+
+ public static final String NS_IX509CERTVALIDITY_IID_STR =
+ "e701dfd8-1dd1-11b2-a172-ffa6cc6156ad";
+
+ public static final nsID NS_IX509CERTVALIDITY_IID =
+ new nsID(NS_IX509CERTVALIDITY_IID_STR);
+
+ public nsIX509CertValidity(int /*long*/ address) {
+ super(address);
+ }
+
+ public int GetNotBefore(int /*long*/ aNotBefore) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aNotBefore);
+ }
+
+ public int GetNotBeforeLocalTime(int /*long*/ aNotBeforeLocalTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aNotBeforeLocalTime);
+ }
+
+ public int GetNotBeforeLocalDay(int /*long*/ aNotBeforeLocalDay) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aNotBeforeLocalDay);
+ }
+
+ public int GetNotBeforeGMT(int /*long*/ aNotBeforeGMT) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aNotBeforeGMT);
+ }
+
+ public int GetNotAfter(int /*long*/ aNotAfter) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aNotAfter);
+ }
+
+ public int GetNotAfterLocalTime(int /*long*/ aNotAfterLocalTime) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aNotAfterLocalTime);
+ }
+
+ public int GetNotAfterLocalDay(int /*long*/ aNotAfterLocalDay) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aNotAfterLocalDay);
+ }
+
+ public int GetNotAfterGMT(int /*long*/ aNotAfterGMT) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aNotAfterGMT);
+ }
}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java b/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
new file mode 100644
index 0000000..884b6d9
--- /dev/null
+++ b/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
@@ -0,0 +1,79 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by Netscape are Copyright (C) 1998-1999
+ * Netscape Communications Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * IBM
+ * - Binding to permit interfacing between Mozilla and SWT
+ * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package org.eclipse.swt.internal.mozilla;
+
+public class nsIXPCSecurityManager extends nsISupports {
+
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
+
+ public static final String NS_IXPCSECURITYMANAGER_IID_STR =
+ "31431440-f1ce-11d2-985a-006008962422";
+
+ public static final nsID NS_IXPCSECURITYMANAGER_IID =
+ new nsID(NS_IXPCSECURITYMANAGER_IID_STR);
+
+ public nsIXPCSecurityManager(int /*long*/ address) {
+ super(address);
+ }
+
+ public static final int HOOK_CREATE_WRAPPER = 1;
+
+ public static final int HOOK_CREATE_INSTANCE = 2;
+
+ public static final int HOOK_GET_SERVICE = 4;
+
+ public static final int HOOK_CALL_METHOD = 8;
+
+ public static final int HOOK_GET_PROPERTY = 16;
+
+ public static final int HOOK_SET_PROPERTY = 32;
+
+ public static final int HOOK_ALL = 63;
+
+ public int CanCreateWrapper(int /*long*/ aJSContext, nsID aIID, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/[] aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aJSContext, aIID, aObj, aClassInfo, aPolicy);
+ }
+
+ public int CanCreateInstance(int /*long*/ aJSContext, nsID aCID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aJSContext, aCID);
+ }
+
+ public int CanGetService(int /*long*/ aJSContext, nsID aCID) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), aJSContext, aCID);
+ }
+
+ public static final int ACCESS_CALL_METHOD = 0;
+
+ public static final int ACCESS_GET_PROPERTY = 1;
+
+ public static final int ACCESS_SET_PROPERTY = 2;
+
+ public int CanAccess(int aAction, int /*long*/ aCallContext, int /*long*/ aJSContext, int /*long*/ aJSObject, int /*long*/ aObj, int /*long*/ aClassInfo, int /*long*/ aName, int /*long*/[] aPolicy) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), aAction, aCallContext, aJSContext, aJSObject, aObj, aClassInfo, aName, aPolicy);
+ }
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/internal/opengl/glx/GLX.java b/org/eclipse/swt/internal/opengl/glx/GLX.java
old mode 100755
new mode 100644
index ebdae92..4f1d979
--- a/org/eclipse/swt/internal/opengl/glx/GLX.java
+++ b/org/eclipse/swt/internal/opengl/glx/GLX.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -202,6 +202,10 @@ public class GLX extends Platform {
public static final int GL_VIEWPORT = 0x0BA2;
public static final native int XVisualInfo_sizeof();
+/**
+ * @param pname cast=(GLenum)
+ * @param params cast=(GLint *),flags=no_in
+ */
public static final native void _glGetIntegerv(int pname, int[] params);
public static final void glGetIntegerv(int pname, int[] params) {
lock.lock();
@@ -211,6 +215,12 @@ public static final void glGetIntegerv(int pname, int[] params) {
lock.unlock();
}
}
+/**
+ * @param x cast=(GLint)
+ * @param y cast=(GLint)
+ * @param width cast=(GLsizei)
+ * @param height cast=(GLsizei)
+ */
public static final native void _glViewport(int x, int y, int width, int height);
public static final void glViewport(int x, int y, int width, int height) {
lock.lock();
@@ -220,6 +230,7 @@ public static final void glViewport(int x, int y, int width, int height) {
lock.unlock();
}
}
+/** @param dpy cast=(Display *) */
public static final native int /*long*/ _glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList);
public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, int[] attribList) {
lock.lock();
@@ -229,6 +240,11 @@ public static final int /*long*/ glXChooseVisual(int /*long*/ dpy, int screen, i
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param src cast=(GLXContext)
+ * @param dst cast=(GLXContext)
+ */
public static final native void _glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask);
public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int /*long*/ dst, int mask) {
lock.lock();
@@ -238,6 +254,10 @@ public static final void glXCopyContext(int /*long*/ dpy, int /*long*/ src, int
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param shareList cast=(GLXContext)
+ */
public static final native int /*long*/ _glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct);
public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo vis, int /*long*/ shareList, boolean direct) {
lock.lock();
@@ -247,6 +267,10 @@ public static final int /*long*/ glXCreateContext(int /*long*/ dpy, XVisualInfo
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param pixmap cast=(Pixmap)
+ */
public static final native int /*long*/ _glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap);
public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInfo vis, int /*long*/ pixmap) {
lock.lock();
@@ -256,6 +280,10 @@ public static final int /*long*/ glXCreateGLXPixmap(int /*long*/ dpy, XVisualInf
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param ctx cast=(GLXContext)
+ */
public static final native void _glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx);
public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {
lock.lock();
@@ -265,6 +293,10 @@ public static final void glXDestroyContext(int /*long*/ dpy, int /*long*/ ctx) {
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param pix cast=(GLXPixmap)
+ */
public static final native void _glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix);
public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix) {
lock.lock();
@@ -274,6 +306,7 @@ public static final void glXDestroyGLXPixmap(int /*long*/ dpy, int /*long*/ pix)
lock.unlock();
}
}
+/** @param dpy cast=(Display *) */
public static final native int /*long*/ _glXGetClientString(int /*long*/ dpy, int name);
public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name) {
lock.lock();
@@ -283,6 +316,7 @@ public static final int /*long*/ glXGetClientString(int /*long*/ dpy, int name)
lock.unlock();
}
}
+/** @param dpy cast=(Display *) */
public static final native int _glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value);
public static final int glXGetConfig(int /*long*/ dpy, XVisualInfo vis, int attrib, int[] value) {
lock.lock();
@@ -310,6 +344,10 @@ public static final int /*long*/ glXGetCurrentDrawable() {
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param ctx cast=(GLXContext)
+ */
public static final native boolean _glXIsDirect(int /*long*/ dpy, int /*long*/ ctx);
public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {
lock.lock();
@@ -319,6 +357,11 @@ public static final boolean glXIsDirect(int /*long*/ dpy, int /*long*/ ctx) {
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param drawable cast=(GLXDrawable)
+ * @param ctx cast=(GLXContext)
+ */
public static final native boolean _glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx);
public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawable, int /*long*/ ctx) {
lock.lock();
@@ -328,6 +371,7 @@ public static final boolean glXMakeCurrent(int /*long*/ dpy, int /*long*/ drawab
lock.unlock();
}
}
+/** @param dpy cast=(Display *) */
public static final native boolean _glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase);
public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase, int[] eventBase) {
lock.lock();
@@ -337,6 +381,7 @@ public static final boolean glXQueryExtension(int /*long*/ dpy, int[] errorBase,
lock.unlock();
}
}
+/** @param dpy cast=(Display *) */
public static final native int /*long*/ _glXQueryExtensionsString(int /*long*/ dpy, int screen);
public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int screen) {
lock.lock();
@@ -346,6 +391,7 @@ public static final int /*long*/ glXQueryExtensionsString(int /*long*/ dpy, int
lock.unlock();
}
}
+/** @param dpy cast=(Display *) */
public static final native int /*long*/ _glXQueryServerString(int /*long*/ dpy, int screen, int name);
public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int screen, int name) {
lock.lock();
@@ -355,6 +401,11 @@ public static final int /*long*/ glXQueryServerString(int /*long*/ dpy, int scre
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param major flags=no_in
+ * @param minor flags=no_in
+ */
public static final native boolean _glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor);
public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[] minor) {
lock.lock();
@@ -364,6 +415,10 @@ public static final boolean glXQueryVersion(int /*long*/ dpy, int[] major, int[]
lock.unlock();
}
}
+/**
+ * @param dpy cast=(Display *)
+ * @param drawable cast=(GLXDrawable)
+ */
public static final native void _glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable);
public static final void glXSwapBuffers(int /*long*/ dpy, int /*long*/ drawable) {
lock.lock();
@@ -391,5 +446,9 @@ public static final void glXWaitX() {
lock.unlock();
}
}
+/**
+ * @param src cast=(const void *)
+ * @param size cast=(size_t)
+ */
public static final native void memmove(XVisualInfo dest, int /*long*/ src, int size);
}
diff --git a/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
old mode 100755
new mode 100644
index 4cd59e4..8faa6cf
--- a/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
+++ b/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,10 +11,12 @@
package org.eclipse.swt.internal.opengl.glx;
public class XVisualInfo {
+ /** @field cast=(Visual *) */
public int /*long*/ visual;
public int visualid;
public int screen;
public int depth;
+ /** @field accessor=class */
public int cclass;
public int red_mask, green_mask, blue_mask;
public int colormap_size;
diff --git a/org/eclipse/swt/internal/theme/ButtonDrawData.java b/org/eclipse/swt/internal/theme/ButtonDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ComboDrawData.java b/org/eclipse/swt/internal/theme/ComboDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/DrawData.java b/org/eclipse/swt/internal/theme/DrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/org/eclipse/swt/internal/theme/ExpanderDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/GroupDrawData.java b/org/eclipse/swt/internal/theme/GroupDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/RangeDrawData.java b/org/eclipse/swt/internal/theme/RangeDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ScaleDrawData.java b/org/eclipse/swt/internal/theme/ScaleDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ScrollBarDrawData.java b/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/org/eclipse/swt/internal/theme/TabFolderDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/TabItemDrawData.java b/org/eclipse/swt/internal/theme/TabItemDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/Theme.java b/org/eclipse/swt/internal/theme/Theme.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ToolBarDrawData.java b/org/eclipse/swt/internal/theme/ToolBarDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/org/eclipse/swt/internal/theme/ToolItemDrawData.java
old mode 100755
new mode 100644
diff --git a/org/eclipse/swt/opengl/GLCanvas.java b/org/eclipse/swt/opengl/GLCanvas.java
index bb9cc57..af4b7a6 100644
--- a/org/eclipse/swt/opengl/GLCanvas.java
+++ b/org/eclipse/swt/opengl/GLCanvas.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -116,9 +116,8 @@ public GLCanvas (Composite parent, int style, GLData data) {
OS.XFree (infoPtr);
int /*long*/ screen = OS.gdk_screen_get_default ();
int /*long*/ gdkvisual = OS.gdk_x11_screen_lookup_visual (screen, vinfo.visualid);
- //FIXME- share lists
- //context = GLX.glXCreateContext (xDisplay, info, share == null ? 0 : share.context, true);
- context = GLX.glXCreateContext (xDisplay, vinfo, 0, true);
+ int /*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 ();
attrs.width = 1;
diff --git a/org/eclipse/swt/opengl/GLData.java b/org/eclipse/swt/opengl/GLData.java
index 895831c..a2fe9cd 100644
--- a/org/eclipse/swt/opengl/GLData.java
+++ b/org/eclipse/swt/opengl/GLData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -122,6 +122,14 @@ public class GLData {
*/
public int samples;
+ /**
+ * Another GLCanvas whose texture namespace and display lists
+ * should be shared.
+ *
+ * @since 3.5
+ */
+ public GLCanvas shareContext;
+
/**
* Returns a string containing a concise, human-readable
* description of the receiver.
diff --git a/org/eclipse/swt/printing/PrintDialog.java b/org/eclipse/swt/printing/PrintDialog.java
index 8562301..f8bc7cb 100644
--- a/org/eclipse/swt/printing/PrintDialog.java
+++ b/org/eclipse/swt/printing/PrintDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,12 +29,10 @@ import org.eclipse.swt.widgets.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#printing">Printing snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class PrintDialog extends Dialog {
- PrinterData printerData;
- int scope = PrinterData.ALL_PAGES;
- int startPage = 1, endPage = 1;
- boolean printToFile = false;
+ PrinterData printerData = new PrinterData();
int /*long*/ handle;
int index;
@@ -95,15 +93,19 @@ public PrintDialog (Shell parent) {
* @see Widget#getStyle
*/
public PrintDialog (Shell parent, int style) {
- super (parent, parent == null? style : checkStyleBit (parent, style));
+ super (parent, checkStyleBit (parent, style));
checkSubclass ();
}
/**
* Sets the printer data that will be used when the dialog
* is opened.
+ * <p>
+ * Setting the printer data to null is equivalent to
+ * resetting all data fields to their default values.
+ * </p>
*
- * @param data the data that will be used when the dialog is opened
+ * @param data the data that will be used when the dialog is opened or null to use default data
*
* @since 3.4
*/
@@ -136,6 +138,16 @@ static int checkBits (int style, int int0, int int1, int int2, int int3, int int
}
static int checkStyleBit (Shell parent, int style) {
+ int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
+ if ((style & SWT.SHEET) != 0) {
+ style &= ~SWT.SHEET;
+ if ((style & mask) == 0) {
+ style |= parent == null ? SWT.APPLICATION_MODAL : SWT.PRIMARY_MODAL;
+ }
+ }
+ if ((style & mask) == 0) {
+ style |= SWT.APPLICATION_MODAL;
+ }
style &= ~SWT.MIRRORED;
if ((style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT)) == 0) {
if (parent != null) {
@@ -165,7 +177,7 @@ protected void checkSubclass() {
* @return the scope setting that the user selected
*/
public int getScope() {
- return scope;
+ return printerData.scope;
}
/**
@@ -184,7 +196,7 @@ public int getScope() {
* @param scope the scope setting when the dialog is opened
*/
public void setScope(int scope) {
- this.scope = scope;
+ printerData.scope = scope;
}
/**
@@ -198,7 +210,7 @@ public void setScope(int scope) {
* @return the start page setting that the user selected
*/
public int getStartPage() {
- return startPage;
+ return printerData.startPage;
}
/**
@@ -212,7 +224,7 @@ public int getStartPage() {
* @param startPage the startPage setting when the dialog is opened
*/
public void setStartPage(int startPage) {
- this.startPage = startPage;
+ printerData.startPage = startPage;
}
/**
@@ -226,7 +238,7 @@ public void setStartPage(int startPage) {
* @return the end page setting that the user selected
*/
public int getEndPage() {
- return endPage;
+ return printerData.endPage;
}
/**
@@ -240,7 +252,7 @@ public int getEndPage() {
* @param endPage the end page setting when the dialog is opened
*/
public void setEndPage(int endPage) {
- this.endPage = endPage;
+ printerData.endPage = endPage;
}
/**
@@ -250,7 +262,7 @@ public void setEndPage(int endPage) {
* @return the 'Print to file' setting that the user selected
*/
public boolean getPrintToFile() {
- return printToFile;
+ return printerData.printToFile;
}
/**
@@ -260,14 +272,15 @@ public boolean getPrintToFile() {
* @param printToFile the 'Print to file' setting when the dialog is opened
*/
public void setPrintToFile(boolean printToFile) {
- this.printToFile = printToFile;
+ printerData.printToFile = printToFile;
}
/**
* Makes the receiver visible and brings it to the front
* of the display.
*
- * @return a printer data object describing the desired print job parameters
+ * @return a printer data object describing the desired print job parameters,
+ * or null if the dialog was canceled, no printers were found, or an error occurred
*
* @exception SWTException <ul>
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -295,35 +308,54 @@ public PrinterData open() {
int /*long*/ settings = OS.gtk_print_settings_new();
int /*long*/ page_setup = OS.gtk_page_setup_new();
- if (printerData != null) {
- if (printerData.otherData != null) {
- Printer.restore(printerData.otherData, settings, page_setup);
- }
- /* Set values of settings from PrinterData. */
- Printer.setScope(settings, printerData.scope, printerData.startPage, printerData.endPage);
+ if (printerData.otherData != null) {
+ Printer.restore(printerData.otherData, settings, page_setup);
+ }
+ /* Set values of print_settings and page_setup from PrinterData. */
+ switch (printerData.scope) {
+ case PrinterData.ALL_PAGES:
+ OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
+ break;
+ case PrinterData.PAGE_RANGE:
+ OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_RANGES);
+ int [] pageRange = new int[2];
+ pageRange[0] = printerData.startPage - 1;
+ pageRange[1] = printerData.endPage - 1;
+ OS.gtk_print_settings_set_page_ranges(settings, pageRange, 1);
+ break;
+ case PrinterData.SELECTION:
+ //TODO: Not correctly implemented. May need new API. For now, set to ALL. (see gtk bug 344519)
+ OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
+ break;
+ }
+ if (printerData.fileName != null) {
//TODO: Should we look at printToFile, or driver/name for "Print to File", or both? (see gtk bug 345590)
if (printerData.printToFile) {
byte [] buffer = Converter.wcsToMbcs (null, printerData.fileName, true);
OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, buffer);
}
- if (printerData.driver.equals("GtkPrintBackendFile") && printerData.name.equals("Print to File")) { //$NON-NLS-1$ //$NON-NLS-2$
- byte [] buffer = Converter.wcsToMbcs (null, printerData.fileName, true);
- OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, buffer);
+ if (printerData.driver != null && printerData.name != null) {
+ if (printerData.driver.equals("GtkPrintBackendFile") && printerData.name.equals("Print to File")) { //$NON-NLS-1$ //$NON-NLS-2$
+ byte [] buffer = Converter.wcsToMbcs (null, printerData.fileName, true);
+ OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, buffer);
+ }
}
- OS.gtk_print_settings_set_n_copies(settings, printerData.copyCount);
- OS.gtk_print_settings_set_collate(settings, printerData.collate);
}
-
- Printer.setScope(settings, scope, startPage, endPage);
- if (printToFile) {
+ if (printerData.printToFile) {
byte [] buffer = Converter.wcsToMbcs (null, "Print to File", true); //$NON-NLS-1$
OS.gtk_print_settings_set_printer(settings, buffer);
}
+ OS.gtk_print_settings_set_n_copies(settings, printerData.copyCount);
+ OS.gtk_print_settings_set_collate(settings, printerData.collate);
+ int orientation = printerData.orientation == PrinterData.LANDSCAPE ? OS.GTK_PAGE_ORIENTATION_LANDSCAPE : OS.GTK_PAGE_ORIENTATION_PORTRAIT;
+ OS.gtk_print_settings_set_orientation(settings, orientation);
+ OS.gtk_page_setup_set_orientation(page_setup, orientation);
+
OS.gtk_print_unix_dialog_set_settings(handle, settings);
OS.gtk_print_unix_dialog_set_page_setup(handle, page_setup);
OS.g_object_unref(settings);
- OS.g_object_unref(page_setup);
-
+ OS.g_object_unref(page_setup);
+ OS.gtk_window_set_modal(handle, true);
PrinterData data = null;
//TODO: Handle 'Print Preview' (GTK_RESPONSE_APPLY).
Display display = getParent() != null ? getParent().getDisplay (): Display.getCurrent ();
@@ -357,10 +389,10 @@ public PrinterData open() {
int print_pages = OS.gtk_print_settings_get_print_pages(settings);
switch (print_pages) {
case OS.GTK_PRINT_PAGES_ALL:
- scope = PrinterData.ALL_PAGES;
+ data.scope = PrinterData.ALL_PAGES;
break;
case OS.GTK_PRINT_PAGES_RANGES:
- scope = PrinterData.PAGE_RANGE;
+ data.scope = PrinterData.PAGE_RANGE;
int[] num_ranges = new int[1];
int /*long*/ page_ranges = OS.gtk_print_settings_get_page_ranges(settings, num_ranges);
int [] pageRange = new int[2];
@@ -372,18 +404,18 @@ public PrinterData open() {
max = Math.max(max, pageRange[1] + 1);
}
OS.g_free(page_ranges);
- startPage = min == Integer.MAX_VALUE ? 1 : min;
- endPage = max == 0 ? 1 : max;
+ data.startPage = min == Integer.MAX_VALUE ? 1 : min;
+ data.endPage = max == 0 ? 1 : max;
break;
case OS.GTK_PRINT_PAGES_CURRENT:
//TODO: Disabled in dialog (see above). This code will not run. (see gtk bug 344519)
- scope = PrinterData.SELECTION;
- startPage = endPage = OS.gtk_print_unix_dialog_get_current_page(handle);
+ data.scope = PrinterData.SELECTION;
+ data.startPage = data.endPage = OS.gtk_print_unix_dialog_get_current_page(handle);
break;
}
- printToFile = data.name.equals("Print to File"); //$NON-NLS-1$
- if (printToFile) {
+ data.printToFile = data.name.equals("Print to File"); //$NON-NLS-1$
+ if (data.printToFile) {
int /*long*/ address = OS.gtk_print_settings_get(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI);
int length = OS.strlen (address);
byte [] buffer = new byte [length];
@@ -391,12 +423,9 @@ public PrinterData open() {
data.fileName = new String (Converter.mbcsToWcs (null, buffer));
}
- data.scope = scope;
- data.startPage = startPage;
- data.endPage = endPage;
- data.printToFile = printToFile;
data.copyCount = OS.gtk_print_settings_get_n_copies(settings);
data.collate = OS.gtk_print_settings_get_collate(settings);
+ data.orientation = OS.gtk_page_setup_get_orientation(page_setup) == OS.GTK_PAGE_ORIENTATION_LANDSCAPE ? PrinterData.LANDSCAPE : PrinterData.PORTRAIT;
/* Save other print_settings data as key/value pairs in otherData. */
Callback printSettingsCallback = new Callback(this, "GtkPrintSettingsFunc", 3); //$NON-NLS-1$
@@ -425,6 +454,7 @@ public PrinterData open() {
store("paper_size_is_custom", OS.gtk_paper_size_is_custom(paper_size)); //$NON-NLS-1$
data.otherData = settingsData;
OS.g_object_unref(settings);
+ printerData = data;
}
}
display.setData (REMOVE_IDLE_PROC_KEY, null);
diff --git a/org/eclipse/swt/printing/Printer.java b/org/eclipse/swt/printing/Printer.java
index 35e57ae..8ff2500 100644
--- a/org/eclipse/swt/printing/Printer.java
+++ b/org/eclipse/swt/printing/Printer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,8 +15,10 @@ import org.eclipse.swt.*;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.Callback;
import org.eclipse.swt.internal.Converter;
+import org.eclipse.swt.internal.gtk.GdkVisual;
import org.eclipse.swt.internal.gtk.OS;
import org.eclipse.swt.internal.cairo.Cairo;
+import org.eclipse.swt.printing.PrinterData;
/**
* Instances of this class are used to print to a printer.
@@ -66,9 +68,10 @@ public final class Printer extends Device {
/**
* Returns an array of <code>PrinterData</code> objects
- * representing all available printers.
+ * representing all available printers. If there are no
+ * printers, the array will be empty.
*
- * @return the list of available printers
+ * @return an array of PrinterData objects representing the available printers
*/
public static PrinterData[] getPrinterList() {
printerList = new PrinterData [0];
@@ -111,7 +114,7 @@ static int /*long*/ GtkPrinterFunc_List (int /*long*/ printer, int /*long*/ user
/**
* Returns a <code>PrinterData</code> object representing
* the default printer or <code>null</code> if there is no
- * printer available on the System.
+ * default printer.
*
* @return the default printer data or null
*
@@ -236,25 +239,6 @@ static void restore(byte [] data, int /*long*/ settings, int /*long*/ page_setup
OS.gtk_paper_size_free(paper_size);
}
-static void setScope(int /*long*/ settings, int scope, int startPage, int endPage) {
- switch (scope) {
- case PrinterData.ALL_PAGES:
- OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
- break;
- case PrinterData.PAGE_RANGE:
- OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_RANGES);
- int [] pageRange = new int[2];
- pageRange[0] = startPage - 1;
- pageRange[1] = endPage - 1;
- OS.gtk_print_settings_set_page_ranges(settings, pageRange, 1);
- break;
- case PrinterData.SELECTION:
- //TODO: Not correctly implemented. May need new API. For now, set to ALL. (see gtk bug 344519)
- OS.gtk_print_settings_set_print_pages(settings, OS.GTK_PRINT_PAGES_ALL);
- break;
- }
-}
-
static DeviceData checkNull (PrinterData data) {
if (data == null) data = new PrinterData();
if (data.driver == null || data.name == null) {
@@ -269,7 +253,7 @@ static DeviceData checkNull (PrinterData data) {
/**
* Constructs a new printer representing the default printer.
* <p>
- * You must dispose the printer when it is no longer required.
+ * Note: You must dispose the printer when it is no longer required.
* </p>
*
* @exception SWTError <ul>
@@ -284,12 +268,13 @@ public Printer() {
/**
* Constructs a new printer given a <code>PrinterData</code>
- * object representing the desired printer.
+ * object representing the desired printer. If the argument
+ * is null, then the default printer will be used.
* <p>
- * You must dispose the printer when it is no longer required.
+ * Note: You must dispose the printer when it is no longer required.
* </p>
*
- * @param data the printer data for the specified printer
+ * @param data the printer data for the specified printer, or null to use the default printer
*
* @exception IllegalArgumentException <ul>
* <li>ERROR_INVALID_ARGUMENT - if the specified printer data does not represent a valid printer
@@ -384,7 +369,9 @@ public Font getSystemFont () {
* @return the platform specific GC handle
*/
public int /*long*/ internal_new_GC(GCData data) {
- int /*long*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, 1);
+ GdkVisual visual = new GdkVisual ();
+ OS.memmove (visual, OS.gdk_visual_get_system());
+ int /*long*/ drawable = OS.gdk_pixmap_new(OS.GDK_ROOT_PARENT(), 1, 1, visual.depth);
int /*long*/ gdkGC = OS.gdk_gc_new (drawable);
if (gdkGC == 0) SWT.error (SWT.ERROR_NO_HANDLES);
if (data != null) {
@@ -599,8 +586,8 @@ public Point getDPI() {
if (DEBUG) System.out.println("print_settings.resolution=" + resolution);
//TODO: Return 72 (1/72 inch = 1 point) until gtk bug 346245 is fixed
//TODO: Fix this: gtk_print_settings_get_resolution returns 0? (see gtk bug 346252)
- if (true || resolution == 0) return new Point(72, 72);
- return new Point(resolution, resolution);
+ /*if (resolution == 0)*/ return new Point(72, 72);
+// return new Point(resolution, resolution);
}
/**
@@ -733,19 +720,21 @@ protected void init() {
restore(data.otherData, settings, pageSetup);
}
- /* Set values of settings from PrinterData. */
- setScope(settings, data.scope, data.startPage, data.endPage);
+ /* Set values of print_settings and page_setup from PrinterData. */
//TODO: Should we look at printToFile, or driver/name for "Print to File", or both? (see gtk bug 345590)
- if (data.printToFile) {
+ if (data.printToFile && data.fileName != null) {
byte [] buffer = Converter.wcsToMbcs (null, data.fileName, true);
OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, buffer);
}
- if (data.driver.equals("GtkPrintBackendFile") && data.name.equals("Print to File")) { //$NON-NLS-1$ //$NON-NLS-2$
+ if (data.driver.equals("GtkPrintBackendFile") && data.name.equals("Print to File") && data.fileName != null) { //$NON-NLS-1$ //$NON-NLS-2$
byte [] buffer = Converter.wcsToMbcs (null, data.fileName, true);
OS.gtk_print_settings_set(settings, OS.GTK_PRINT_SETTINGS_OUTPUT_URI, buffer);
}
OS.gtk_print_settings_set_n_copies(settings, data.copyCount);
OS.gtk_print_settings_set_collate(settings, data.collate);
+ int orientation = data.orientation == PrinterData.LANDSCAPE ? OS.GTK_PAGE_ORIENTATION_LANDSCAPE : OS.GTK_PAGE_ORIENTATION_PORTRAIT;
+ OS.gtk_page_setup_set_orientation(pageSetup, orientation);
+ OS.gtk_print_settings_set_orientation(settings, orientation);
}
/**
diff --git a/org/eclipse/swt/printing/PrinterData.java b/org/eclipse/swt/printing/PrinterData.java
index ed8d5b3..c9930c8 100644
--- a/org/eclipse/swt/printing/PrinterData.java
+++ b/org/eclipse/swt/printing/PrinterData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -105,6 +105,14 @@ public final class PrinterData extends DeviceData {
public boolean collate = false;
/**
+ * The orientation of the paper, which can be either PORTRAIT
+ * or LANDSCAPE.
+ *
+ * @since 3.5
+ */
+ public int orientation = PORTRAIT;
+
+ /**
* <code>scope</code> field value indicating that
* all pages should be printed
*/
@@ -122,6 +130,22 @@ public final class PrinterData extends DeviceData {
* the current selection should be printed
*/
public static final int SELECTION = 2;
+
+ /**
+ * <code>orientation</code> field value indicating
+ * portrait paper orientation
+ *
+ * @since 3.5
+ */
+ public static final int PORTRAIT = 1;
+
+ /**
+ * <code>orientation</code> field value indicating
+ * landscape paper orientation
+ *
+ * @since 3.5
+ */
+ public static final int LANDSCAPE = 2;
/**
* private, platform-specific data
diff --git a/org/eclipse/swt/widgets/Button.java b/org/eclipse/swt/widgets/Button.java
index 931d129..41802dc 100644
--- a/org/eclipse/swt/widgets/Button.java
+++ b/org/eclipse/swt/widgets/Button.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#button">Button snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Button extends Control {
int /*long*/ boxHandle, labelHandle, imageHandle, arrowHandle, groupHandle;
@@ -81,6 +82,8 @@ public class Button extends Control {
* @see SWT#RADIO
* @see SWT#TOGGLE
* @see SWT#FLAT
+ * @see SWT#UP
+ * @see SWT#DOWN
* @see SWT#LEFT
* @see SWT#RIGHT
* @see SWT#CENTER
diff --git a/org/eclipse/swt/widgets/Caret.java b/org/eclipse/swt/widgets/Caret.java
index 5109146..8bfa82f 100644
--- a/org/eclipse/swt/widgets/Caret.java
+++ b/org/eclipse/swt/widgets/Caret.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#caret">Caret snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Canvas tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Caret extends Widget {
Canvas parent;
diff --git a/org/eclipse/swt/widgets/ColorDialog.java b/org/eclipse/swt/widgets/ColorDialog.java
index 13d69f3..257f07a 100644
--- a/org/eclipse/swt/widgets/ColorDialog.java
+++ b/org/eclipse/swt/widgets/ColorDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.swt.graphics.*;
*
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ColorDialog extends Dialog {
RGB rgb;
@@ -124,6 +125,7 @@ public RGB open () {
OS.g_list_free (pixbufs);
}
}
+ OS.gtk_window_set_modal (handle, true);
GtkColorSelectionDialog dialog = new GtkColorSelectionDialog ();
OS.memmove (dialog, handle);
GdkColor color = new GdkColor();
diff --git a/org/eclipse/swt/widgets/Combo.java b/org/eclipse/swt/widgets/Combo.java
index c194081..6e526d3 100644
--- a/org/eclipse/swt/widgets/Combo.java
+++ b/org/eclipse/swt/widgets/Combo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -54,6 +54,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#combo">Combo snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Combo extends Composite {
int /*long*/ buttonHandle, entryHandle, listHandle, textRenderer, cellHandle, popupHandle;
@@ -63,8 +64,6 @@ public class Combo extends Composite {
String [] items = new String [0];
boolean ignoreSelect, lockText;
- static final int INNER_BORDER = 2;
-
/**
* the operating system limit for the number of characters
* that the text field in an instance of this class can hold
@@ -372,7 +371,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
OS.gtk_widget_realize (entryHandle);
int /*long*/ layout = OS.gtk_entry_get_layout (entryHandle);
OS.pango_layout_get_size (layout, w, h);
- int xborder = INNER_BORDER, yborder = INNER_BORDER;
+ int xborder = Display.INNER_BORDER, yborder = Display.INNER_BORDER;
int /*long*/ style = OS.gtk_widget_get_style (entryHandle);
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
@@ -1397,9 +1396,7 @@ int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ event) {
break;
}
if (newIndex != oldIndex) {
- OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_combo_box_set_active (handle, newIndex);
- OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
return 1;
}
}
@@ -2068,6 +2065,10 @@ public void setSelection (Point selection) {
* Sets the contents of the receiver's text field to the
* given string.
* <p>
+ * This call is ignored when the receiver is read only and
+ * the given string is not in the receiver's list.
+ * </p>
+ * <p>
* Note: The text field in a <code>Combo</code> is typically
* only capable of displaying a single line of text. Thus,
* setting the text to a string containing line breaks or
@@ -2185,6 +2186,10 @@ public void setVisibleItemCount (int count) {
visibleCount = count;
}
+boolean checkSubwindow () {
+ return false;
+}
+
boolean translateTraversal (GdkEventKey keyEvent) {
int key = keyEvent.keyval;
switch (key) {
diff --git a/org/eclipse/swt/widgets/Composite.java b/org/eclipse/swt/widgets/Composite.java
index 24659c8..62cda31 100644
--- a/org/eclipse/swt/widgets/Composite.java
+++ b/org/eclipse/swt/widgets/Composite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,10 +33,9 @@ import org.eclipse.swt.graphics.*;
* than <code>Canvas</code>.
* </p><p>
* Note: The <code>CENTER</code> style, although undefined for composites, has the
- * same value as <code>EMBEDDED</code> (which is used to embed widgets from other
- * widget toolkits into SWT). On some operating systems (GTK, Motif), this may cause
- * the children of this composite to be obscured. The <code>EMBEDDED</code> style
- * is for use by other widget toolkits and should normally never be used.
+ * same value as <code>EMBEDDED</code> which is used to embed widgets from other
+ * widget toolkits into SWT. On some operating systems (GTK, Motif), this may cause
+ * the children of this composite to be obscured.
* </p><p>
* This class may be subclassed by custom control implementors
* who are building controls that are constructed from aggregates
@@ -88,6 +87,8 @@ Composite () {
* @see SWT#NO_MERGE_PAINTS
* @see SWT#NO_REDRAW_RESIZE
* @see SWT#NO_RADIO_GROUP
+ * @see SWT#EMBEDDED
+ * @see SWT#DOUBLE_BUFFERED
* @see Widget#getStyle
*/
public Composite (Composite parent, int style) {
@@ -231,15 +232,15 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return new Point (trim.width, trim.height);
}
-Control [] computeTabList () {
- Control result [] = super.computeTabList ();
+Widget [] computeTabList () {
+ Widget result [] = super.computeTabList ();
if (result.length == 0) return result;
Control [] list = tabList != null ? _getTabList () : _getChildren ();
for (int i=0; i<list.length; i++) {
Control child = list [i];
- Control [] childList = child.computeTabList ();
+ Widget [] childList = child.computeTabList ();
if (childList.length != 0) {
- Control [] newResult = new Control [result.length + childList.length];
+ Widget [] newResult = new Widget [result.length + childList.length];
System.arraycopy (result, 0, newResult, 0, result.length);
System.arraycopy (childList, 0, newResult, result.length, childList.length);
result = newResult;
@@ -1378,6 +1379,10 @@ void showWidget () {
if (scrolledHandle == 0) fixStyle (handle);
}
+boolean checkSubwindow () {
+ return true;
+}
+
boolean translateMnemonic (Event event, Control control) {
if (super.translateMnemonic (event, control)) return true;
if (control != null) {
diff --git a/org/eclipse/swt/widgets/Control.java b/org/eclipse/swt/widgets/Control.java
index 25bf337..cabd66b 100644
--- a/org/eclipse/swt/widgets/Control.java
+++ b/org/eclipse/swt/widgets/Control.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,12 +12,13 @@ package org.eclipse.swt.widgets;
import org.eclipse.swt.*;
-import org.eclipse.swt.internal.Converter;
-import org.eclipse.swt.internal.accessibility.gtk.ATK;
-import org.eclipse.swt.internal.gtk.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.events.*;
import org.eclipse.swt.accessibility.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.internal.*;
+import org.eclipse.swt.internal.accessibility.gtk.*;
+import org.eclipse.swt.internal.cairo.*;
+import org.eclipse.swt.internal.gtk.*;
/**
* Control is the abstract superclass of all windowed user interface classes.
@@ -40,6 +41,7 @@ import org.eclipse.swt.accessibility.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#control">Control snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Control extends Widget implements Drawable {
int /*long*/ fixedHandle;
@@ -54,6 +56,8 @@ public abstract class Control extends Widget implements Drawable {
String toolTipText;
Object layoutData;
Accessible accessible;
+
+ static final String IS_ACTIVE = "org.eclipse.swt.internal.control.isactive"; //$NON-NLS-1$
Control () {
}
@@ -83,6 +87,8 @@ Control () {
* </ul>
*
* @see SWT#BORDER
+ * @see SWT#LEFT_TO_RIGHT
+ * @see SWT#RIGHT_TO_LEFT
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
@@ -161,11 +167,12 @@ void fixStyle (int /*long*/ handle) {
* should not override the application background.
*/
if ((state & BACKGROUND) != 0) return;
+ if ((state & THEME_BACKGROUND) == 0) return;
int /*long*/ childStyle = parent.childStyle ();
- if (childStyle != 0) {
+ if (childStyle != 0) {
GdkColor color = new GdkColor();
OS.gtk_style_get_bg (childStyle, 0, color);
- OS.gtk_widget_modify_bg (handle, 0, color);
+ setBackgroundColor (color);
}
}
@@ -318,11 +325,11 @@ void printWidget (GC gc, int /*long*/ drawable, int depth, int x, int y) {
state &= ~OBSCURED;
int /*long*/ topHandle = topHandle ();
int /*long*/ window = OS.GTK_WIDGET_WINDOW (topHandle);
- printWindow (true, this, gc.handle, drawable, depth, window, x, y);
+ printWindow (true, this, gc, drawable, depth, window, x, y);
if (obscured) state |= OBSCURED;
}
-void printWindow (boolean first, Control control, int /*long*/ gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) {
+void printWindow (boolean first, Control control, GC gc, int /*long*/ drawable, int depth, int /*long*/ window, int x, int y) {
if (OS.gdk_drawable_get_depth (window) != depth) return;
GdkRectangle rect = new GdkRectangle ();
int [] width = new int [1], height = new int [1];
@@ -362,7 +369,33 @@ void printWindow (boolean first, Control control, int /*long*/ gc, int /*long*/
destWidth = Math.min (cX [0] + width [0], pW [0]);
destHeight = Math.min (cY [0] + height [0], pH [0]);
}
- OS.gdk_draw_drawable (drawable, gc, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
+ GCData gcData = gc.getGCData();
+ int /*long*/ cairo = gcData.cairo;
+ if (cairo != 0) {
+ int /*long*/ xDisplay = OS.GDK_DISPLAY();
+ int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system());
+ int /*long*/ xDrawable = OS.GDK_PIXMAP_XID(real_drawable [0]);
+ int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width [0], height [0]);
+ if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ Cairo.cairo_save(cairo);
+ Cairo.cairo_rectangle(cairo, destX , destY, destWidth, destHeight);
+ Cairo.cairo_clip(cairo);
+ Cairo.cairo_translate(cairo, destX, destY);
+ int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(surface);
+ if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ Cairo.cairo_pattern_set_filter(pattern, Cairo.CAIRO_FILTER_BEST);
+ Cairo.cairo_set_source(cairo, pattern);
+ if (gcData.alpha != 0xFF) {
+ Cairo.cairo_paint_with_alpha(cairo, gcData.alpha / (float)0xFF);
+ } else {
+ Cairo.cairo_paint(cairo);
+ }
+ Cairo.cairo_restore(cairo);
+ Cairo.cairo_pattern_destroy(pattern);
+ Cairo.cairo_surface_destroy(surface);
+ } else {
+ OS.gdk_draw_drawable (drawable, gc.handle, real_drawable [0], srcX, srcY, destX, destY, destWidth, destHeight);
+ }
OS.gdk_window_end_paint (window);
int /*long*/ children = OS.gdk_window_get_children (window);
if (children != 0) {
@@ -418,18 +451,18 @@ public Point computeSize (int wHint, int hHint) {
return computeSize (wHint, hHint, true);
}
-Control computeTabGroup () {
+Widget computeTabGroup () {
if (isTabGroup()) return this;
return parent.computeTabGroup ();
}
-Control[] computeTabList() {
+Widget[] computeTabList() {
if (isTabGroup()) {
if (getVisible() && getEnabled()) {
- return new Control[] {this};
+ return new Widget[] {this};
}
}
- return new Control[0];
+ return new Widget[0];
}
Control computeTabRoot () {
@@ -1012,6 +1045,11 @@ public void setSize (int width, int height) {
setBounds (0, 0, Math.max (0, width), Math.max (0, height), false, true);
}
+
+boolean isActive () {
+ return getShell ().getModalShell () == null && display.getModalDialog () == null;
+}
+
/*
* Answers a boolean indicating whether a Label that precedes the receiver in
* a layout should be read by screen readers as the recevier's label.
@@ -1985,7 +2023,13 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
boolean quit = false, dragging = false;
while (!quit) {
int /*long*/ eventPtr = 0;
- while (true) {
+ /*
+ * There should be an event on the queue already, but
+ * in cases where there isn't one, stop trying after
+ * half a second.
+ */
+ long timeout = System.currentTimeMillis() + 500;
+ while (System.currentTimeMillis() < timeout) {
eventPtr = OS.gdk_event_get ();
if (eventPtr != 0) {
break;
@@ -1993,6 +2037,7 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
try {Thread.sleep(50);} catch (Exception ex) {}
}
}
+ if (eventPtr == 0) return false;
switch (OS.GDK_EVENT_TYPE (eventPtr)) {
case OS.GDK_MOTION_NOTIFY: {
GdkEventMotion gdkMotionEvent = new GdkEventMotion ();
@@ -2102,6 +2147,7 @@ public boolean forceFocus () {
}
boolean forceFocus (int /*long*/ focusHandle) {
+ if (OS.GTK_WIDGET_HAS_FOCUS (focusHandle)) return true;
/* When the control is zero sized it must be realized */
OS.gtk_widget_realize (focusHandle);
OS.gtk_widget_grab_focus (focusHandle);
@@ -2109,7 +2155,11 @@ boolean forceFocus (int /*long*/ focusHandle) {
int /*long*/ shellHandle = shell.shellHandle;
int /*long*/ handle = OS.gtk_window_get_focus (shellHandle);
while (handle != 0) {
- if (handle == focusHandle) return true;
+ if (handle == focusHandle) {
+ /* Cancel any previous ignoreFocus requests */
+ display.ignoreFocus = false;
+ return true;
+ }
Widget widget = display.getWidget (handle);
if (widget != null && widget instanceof Control) {
return widget == this;
@@ -2121,7 +2171,11 @@ boolean forceFocus (int /*long*/ focusHandle) {
/**
* Returns the receiver's background color.
- *
+ * <p>
+ * Note: This operation is a hint and may be overridden by the platform.
+ * For example, on some versions of Windows the background of a TabFolder,
+ * is a gradient rather than a solid color.
+ * </p>
* @return the background color
*
* @exception SWTException <ul>
@@ -2215,6 +2269,11 @@ public Cursor getCursor () {
return cursor;
}
+public Object getData(String key) {
+ if (key.equals(IS_ACTIVE)) return new Boolean(isActive ());
+ return super.getData(key);
+}
+
/**
* Returns <code>true</code> if the receiver is detecting
* drag gestures, and <code>false</code> otherwise.
@@ -2619,6 +2678,13 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
if (display.currentControl == this) return 0;
GdkEventCrossing gdkEvent = new GdkEventCrossing ();
OS.memmove (gdkEvent, event, GdkEventCrossing.sizeof);
+ /*
+ * It is possible to send out too many enter/exit events if entering a
+ * control through a subwindow. The fix is to return without sending any
+ * events if the GdkEventCrossing subwindow field is set and the control
+ * requests to check the field.
+ */
+ if (gdkEvent.subwindow != 0 && checkSubwindow ()) return 0;
if (gdkEvent.mode != OS.GDK_CROSSING_NORMAL && gdkEvent.mode != OS.GDK_CROSSING_UNGRAB) return 0;
if ((gdkEvent.state & (OS.GDK_BUTTON1_MASK | OS.GDK_BUTTON2_MASK | OS.GDK_BUTTON3_MASK)) != 0) return 0;
if (display.currentControl != null && !display.currentControl.isDisposed ()) {
@@ -2632,6 +2698,10 @@ int /*long*/ gtk_enter_notify_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
+boolean checkSubwindow () {
+ return false;
+}
+
int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
GdkEvent event = new GdkEvent ();
OS.memmove (event, gdkEvent, GdkEvent.sizeof);
@@ -2663,6 +2733,8 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
* box to lose focus when focus is received for the menu. The
* fix is to check the current grab handle and see if it is a GTK_MENU
* and ignore the focus event when the menu is both shown and hidden.
+ *
+ * NOTE: This code runs for all menus.
*/
Display display = this.display;
if (gdkEventFocus.in != 0) {
@@ -3820,6 +3892,7 @@ public boolean setParent (Composite parent) {
if (parent.isDisposed()) SWT.error (SWT.ERROR_INVALID_ARGUMENT);
if (this.parent == parent) return true;
if (!isReparentable ()) return false;
+ OS.gtk_widget_realize (parent.handle);
int /*long*/ topHandle = topHandle ();
int x = OS.GTK_WIDGET_X (topHandle);
int width = (state & ZERO_WIDTH) != 0 ? 0 : OS.GTK_WIDGET_WIDTH (topHandle);
@@ -3921,9 +3994,6 @@ public void setRedraw (boolean redraw) {
}
}
-boolean setTabGroupFocus (boolean next) {
- return setTabItemFocus (next);
-}
boolean setTabItemFocus (boolean next) {
if (!isShowing ()) return false;
return forceFocus ();
@@ -3931,8 +4001,17 @@ boolean setTabItemFocus (boolean next) {
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
- *
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
+ * <p>
+ * The mnemonic indicator (character '&') is not displayed in a tool tip.
+ * To display a single '&' in the tool tip, the character '&' can be
+ * escaped by doubling it in the string.
+ * </p>
+ *
* @param string the new tool tip text (or null)
*
* @exception SWTException <ul>
@@ -4175,6 +4254,8 @@ boolean showMenu (int x, int y) {
event.x = x;
event.y = y;
sendEvent (SWT.MenuDetect, event);
+ //widget could be disposed at this point
+ if (isDisposed ()) return false;
if (event.doit) {
if (menu != null && !menu.isDisposed ()) {
boolean hooksKeys = hooks (SWT.KeyDown) || hooks (SWT.KeyUp);
@@ -4369,8 +4450,8 @@ boolean traverseEscape () {
boolean traverseGroup (boolean next) {
Control root = computeTabRoot ();
- Control group = computeTabGroup ();
- Control [] list = root.computeTabList ();
+ Widget group = computeTabGroup ();
+ Widget [] list = root.computeTabList ();
int length = list.length;
int index = 0;
while (index < length) {
@@ -4386,8 +4467,8 @@ boolean traverseGroup (boolean next) {
if (index == length) return false;
int start = index, offset = (next) ? 1 : -1;
while ((index = ((index + offset + length) % length)) != start) {
- Control control = list [index];
- if (!control.isDisposed () && control.setTabGroupFocus (next)) {
+ Widget widget = list [index];
+ if (!widget.isDisposed () && widget.setTabGroupFocus (next)) {
return true;
}
}
diff --git a/org/eclipse/swt/widgets/CoolBar.java b/org/eclipse/swt/widgets/CoolBar.java
index 486e9e3..8abac1a 100644
--- a/org/eclipse/swt/widgets/CoolBar.java
+++ b/org/eclipse/swt/widgets/CoolBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#coolbar">CoolBar snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class CoolBar extends Composite {
CoolItem[][] items = new CoolItem[0][0];
@@ -79,6 +80,9 @@ public class CoolBar extends Composite {
* </ul>
*
* @see SWT
+ * @see SWT#FLAT
+ * @see SWT#HORIZONTAL
+ * @see SWT#VERTICAL
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
@@ -150,10 +154,11 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
wrapItems(getWidth());
if (width == 0) width = DEFAULT_COOLBAR_WIDTH;
if (height == 0) height = DEFAULT_COOLBAR_HEIGHT;
- if (wHint != SWT.DEFAULT) width = wHint;
- if (hHint != SWT.DEFAULT) height = hHint;
- Rectangle trim = computeTrim(0, 0, width, height);
- return fixPoint(trim.width, trim.height);
+ Point size = fixPoint(width, height);
+ if (wHint != SWT.DEFAULT) size.x = wHint;
+ if (hHint != SWT.DEFAULT) size.y = hHint;
+ Rectangle trim = computeTrim(0, 0, size.x, size.y);
+ return new Point(trim.width, trim.height);
}
CoolItem getGrabbedItem(int x, int y) {
for (int row = 0; row < items.length; row++) {
@@ -304,9 +309,24 @@ public int indexOf (CoolItem item) {
* Insert the item into the row. Adjust the x and width values
* appropriately.
*/
-void insertItemIntoRow(CoolItem item, int rowIndex, int x_root) {
+boolean insertItemIntoRow(CoolItem item, int rowIndex, int x_root) {
+ if (rowIndex < 0 || rowIndex >= items.length) {
+ /* Create a new row for the item. */
+ boolean bottom = rowIndex >= items.length;
+ CoolItem[][] newRows = new CoolItem[items.length + 1][];
+ System.arraycopy(items, 0, newRows, bottom ? 0 : 1, items.length);
+ int row = bottom ? items.length : 0;
+ newRows[row] = new CoolItem[1];
+ newRows[row][0] = item;
+ items = newRows;
+ item.wrap = true;
+ return true;
+ }
+
int barWidth = getWidth();
- int rowY = items[rowIndex][0].internalGetBounds().y;
+ Rectangle bounds = items[rowIndex][0].internalGetBounds();
+ int rowY = bounds.y;
+ int oldRowHeight = bounds.height;
int x = Math.max(0, Math.abs(x_root - toDisplay(new Point(0, 0)).x));
/* Find the insertion index and add the item. */
@@ -339,7 +359,7 @@ void insertItemIntoRow(CoolItem item, int rowIndex, int x_root) {
}
/* Set the item's bounds. */
- int width = 0, height = item.internalGetBounds().height;
+ int width = 0, height = item.preferredHeight;
if (index < items[rowIndex].length - 1) {
CoolItem right = items[rowIndex][index + 1];
width = right.internalGetBounds().x - x;
@@ -354,9 +374,10 @@ void insertItemIntoRow(CoolItem item, int rowIndex, int x_root) {
item.setBounds(x, rowY, width, height);
if (x + width > barWidth) moveLeft(item, x + width - barWidth);
}
- Rectangle bounds = item.internalGetBounds();
+ bounds = item.internalGetBounds();
item.requestedWidth = bounds.width;
internalRedraw(bounds.x, bounds.y, item.internalGetMinimumWidth(), bounds.height);
+ return height > oldRowHeight;
}
void internalRedraw (int x, int y, int width, int height) {
if ((style & SWT.VERTICAL) != 0) {
@@ -440,29 +461,15 @@ void destroyItem(CoolItem item) {
}
void moveDown(CoolItem item, int x_root) {
int oldRowIndex = findItem(item).y;
- boolean resize = false;
if (items[oldRowIndex].length == 1) {
- resize = true;
/* If this is the only item in the bottom row, don't move it. */
if (oldRowIndex == items.length - 1) return;
}
int newRowIndex = (items[oldRowIndex].length == 1) ? oldRowIndex : oldRowIndex + 1;
- removeItemFromRow(item, oldRowIndex, false);
+ boolean resize = removeItemFromRow(item, oldRowIndex, false);
Rectangle old = item.internalGetBounds();
internalRedraw(old.x, old.y, CoolItem.MINIMUM_WIDTH, old.height);
- if (newRowIndex == items.length) {
- /* Create a new bottom row for the item. */
- CoolItem[][] newRows = new CoolItem[items.length + 1][];
- System.arraycopy(items, 0, newRows, 0, items.length);
- int row = items.length;
- newRows[row] = new CoolItem[1];
- newRows[row][0] = item;
- items = newRows;
- resize = true;
- item.wrap = true;
- } else {
- insertItemIntoRow(item, newRowIndex, x_root);
- }
+ resize |= insertItemIntoRow(item, newRowIndex, x_root);
if (resize) {
relayout();
} else {
@@ -540,28 +547,15 @@ void moveRight(CoolItem item, int pixels) {
void moveUp(CoolItem item, int x_root) {
Point point = findItem(item);
int oldRowIndex = point.y;
- boolean resize = false;
if (items[oldRowIndex].length == 1) {
- resize = true;
/* If this is the only item in the top row, don't move it. */
if (oldRowIndex == 0) return;
}
- removeItemFromRow(item, oldRowIndex, false);
+ boolean resize = removeItemFromRow(item, oldRowIndex, false);
Rectangle old = item.internalGetBounds();
internalRedraw(old.x, old.y, CoolItem.MINIMUM_WIDTH, old.height);
- int newRowIndex = Math.max(0, oldRowIndex - 1);
- if (oldRowIndex == 0) {
- /* Create a new top row for the item. */
- CoolItem[][] newRows = new CoolItem[items.length + 1][];
- System.arraycopy(items, 0, newRows, 1, items.length);
- newRows[0] = new CoolItem[1];
- newRows[0][0] = item;
- items = newRows;
- resize = true;
- item.wrap = true;
- } else {
- insertItemIntoRow(item, newRowIndex, x_root);
- }
+ int newRowIndex = oldRowIndex - 1;
+ resize |= insertItemIntoRow(item, newRowIndex, x_root);
if (resize) {
relayout();
} else {
@@ -631,8 +625,13 @@ void onMouseMove(Event event) {
fixEvent(event);
}
void onMouseUp(Event event) {
- _setCursor(null);
dragging = null;
+ CoolItem grabbed = getGrabbedItem(event.x, event.y);
+ if (grabbed != null) {
+ _setCursor(hoverCursor);
+ } else {
+ _setCursor(null);
+ }
}
void onMouseDoubleClick(Event event) {
if (isLocked) return;
@@ -776,10 +775,11 @@ void removeControl (Control control) {
* Remove the item from the row. Adjust the x and width values
* appropriately.
*/
-void removeItemFromRow(CoolItem item, int rowIndex, boolean disposed) {
+boolean removeItemFromRow(CoolItem item, int rowIndex, boolean disposed) {
int index = findItem(item).x;
int newLength = items[rowIndex].length - 1;
Rectangle itemBounds = item.internalGetBounds();
+ int oldRowHeight = itemBounds.height;
item.wrap = false;
if (newLength > 0) {
CoolItem[] newRow = new CoolItem[newLength];
@@ -792,7 +792,7 @@ void removeItemFromRow(CoolItem item, int rowIndex, boolean disposed) {
System.arraycopy(items, 0, newRows, 0, rowIndex);
System.arraycopy(items, rowIndex + 1, newRows, rowIndex, newRows.length - rowIndex);
items = newRows;
- return;
+ return true;
}
if (!disposed) {
if (index == 0) {
@@ -810,6 +810,11 @@ void removeItemFromRow(CoolItem item, int rowIndex, boolean disposed) {
previous.requestedWidth = width;
}
}
+ int newRowHeight = 0;
+ for (int i = 0; i < newLength; i++) {
+ newRowHeight = Math.max(newRowHeight, items[rowIndex][i].preferredHeight);
+ }
+ return newRowHeight != oldRowHeight;
}
/**
* Return the height of the bar after it has
@@ -833,7 +838,7 @@ int layoutItems () {
int available = width;
for (int i = 0; i < count; i++) {
CoolItem item = items[row][i];
- rowHeight = Math.max(rowHeight, item.internalGetBounds().height);
+ rowHeight = Math.max(rowHeight, item.preferredHeight);
available -= item.internalGetMinimumWidth();
}
if (row > 0) y += rowSpacing;
diff --git a/org/eclipse/swt/widgets/CoolItem.java b/org/eclipse/swt/widgets/CoolItem.java
index defc605..2681e09 100644
--- a/org/eclipse/swt/widgets/CoolItem.java
+++ b/org/eclipse/swt/widgets/CoolItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ import org.eclipse.swt.graphics.*;
* </p>
*
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class CoolItem extends Item {
Control control;
@@ -435,7 +436,11 @@ void setBounds (int x, int y, int width, int height) {
if ((style & SWT.DROP_DOWN) != 0 && width < preferredWidth) {
controlWidth -= CHEVRON_IMAGE_WIDTH + CHEVRON_HORIZONTAL_TRIM + CHEVRON_LEFT_MARGIN;
}
- control.setBounds (parent.fixRectangle(x + MINIMUM_WIDTH, y, controlWidth, height));
+ if (height > preferredHeight) {
+ y += (height - preferredHeight) / 2;
+ height = preferredHeight;
+ }
+ control.setBounds (parent.fixRectangle(x + MINIMUM_WIDTH, y, controlWidth, height));
}
updateChevron();
}
diff --git a/org/eclipse/swt/widgets/DateTime.java b/org/eclipse/swt/widgets/DateTime.java
index cb30f20..11248e3 100644
--- a/org/eclipse/swt/widgets/DateTime.java
+++ b/org/eclipse/swt/widgets/DateTime.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,13 +28,14 @@ import org.eclipse.swt.internal.gtk.OS;
* </p>
* <dl>
* <dt><b>Styles:</b></dt>
- * <dd>DATE, TIME, CALENDAR, SHORT, MEDIUM, LONG</dd>
+ * <dd>DATE, TIME, CALENDAR, SHORT, MEDIUM, LONG, DROP_DOWN</dd>
* <dt><b>Events:</b></dt>
- * <dd>Selection</dd>
+ * <dd>DefaultSelection, Selection</dd>
* </dl>
* <p>
* Note: Only one of the styles DATE, TIME, or CALENDAR may be specified,
* and only one of the styles SHORT, MEDIUM, or LONG may be specified.
+ * The DROP_DOWN style is a <em>HINT</em>, and it is only valid with the DATE style.
* </p><p>
* IMPORTANT: This class is <em>not</em> intended to be subclassed.
* </p>
@@ -44,6 +45,7 @@ import org.eclipse.swt.internal.gtk.OS;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.3
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class DateTime extends Composite {
int day, month, year, hours, minutes, seconds;
@@ -95,6 +97,10 @@ public class DateTime extends Composite {
* @see SWT#DATE
* @see SWT#TIME
* @see SWT#CALENDAR
+ * @see SWT#SHORT
+ * @see SWT#MEDIUM
+ * @see SWT#LONG
+ * @see SWT#DROP_DOWN
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
@@ -175,7 +181,7 @@ static int checkStyle (int style) {
* interface.
* <p>
* <code>widgetSelected</code> is called when the user changes the control's value.
- * <code>widgetDefaultSelected</code> is not called.
+ * <code>widgetDefaultSelected</code> is typically called when ENTER is pressed.
* </p>
*
* @param listener the listener which should be notified
@@ -251,6 +257,10 @@ void createHandle (int index) {
}
}
+boolean checkSubwindow () {
+ return false;
+}
+
void createWidget (int index) {
super.createWidget (index);
if ((style & SWT.CALENDAR) != 0) {
@@ -478,6 +488,11 @@ int /*long*/ gtk_day_selected (int /*long*/ widget) {
return 0;
}
+int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {
+ postEvent(SWT.DefaultSelection);
+ return 0;
+}
+
int /*long*/ gtk_month_changed (int /*long*/ widget) {
sendSelectionEvent ();
return 0;
@@ -487,16 +502,15 @@ void hookEvents () {
super.hookEvents();
if ((style & SWT.CALENDAR) != 0) {
OS.g_signal_connect_closure (handle, OS.day_selected, display.closures [DAY_SELECTED], false);
+ OS.g_signal_connect_closure (handle, OS.day_selected_double_click, display.closures [DAY_SELECTED_DOUBLE_CLICK], false);
OS.g_signal_connect_closure (handle, OS.month_changed, display.closures [MONTH_CHANGED], false);
}
}
-boolean isValid(int fieldName, int value) {
+boolean isValidTime(int fieldName, int value) {
Calendar validCalendar;
if ((style & SWT.CALENDAR) != 0) {
validCalendar = Calendar.getInstance();
- validCalendar.set(Calendar.YEAR, year);
- validCalendar.set(Calendar.MONTH, month);
} else {
validCalendar = calendar;
}
@@ -505,10 +519,13 @@ boolean isValid(int fieldName, int value) {
return value >= min && value <= max;
}
-boolean isValid(int year, int month, int day) {
+boolean isValidDate(int year, int month, int day) {
+ if (year < MIN_YEAR || year > MAX_YEAR) return false;
Calendar valid = Calendar.getInstance();
valid.set(year, month, day);
- return valid.get(Calendar.YEAR) == year && valid.get(Calendar.MONTH) == month && valid.get(Calendar.DAY_OF_MONTH) == day;
+ return valid.get(Calendar.YEAR) == year
+ && valid.get(Calendar.MONTH) == month
+ && valid.get(Calendar.DAY_OF_MONTH) == day;
}
void incrementField(int amount) {
@@ -562,6 +579,9 @@ void onKeyDown(Event event) {
fieldName = fieldNames[currentField];
setTextField(fieldName, calendar.getActualMaximum(fieldName), true, true);
break;
+ case SWT.CR:
+ postEvent(SWT.DefaultSelection);
+ break;
default:
switch (event.character) {
case '/':
@@ -587,12 +607,11 @@ void onMouseClick(Event event) {
if (event.button != 1) return;
Point sel = text.getSelection();
for (int i = 0; i < fieldCount; i++) {
- if (sel.x >= fieldIndices[i].x && sel.x <= fieldIndices[i].y) {
- currentField = i;
+ if (fieldIndices[i].x <= sel.x && sel.x <= fieldIndices[i].y) {
+ selectField(i);
break;
}
}
- selectField(currentField);
}
void onResize(Event event) {
@@ -855,7 +874,7 @@ void setTextField(int fieldName, int value, boolean commit, boolean adjust) {
*/
public void setDate (int year, int month, int day) {
checkWidget ();
- if (!isValid(year, month, day)) return;
+ if (!isValidDate(year, month, day)) return;
if ((style & SWT.CALENDAR) != 0) {
this.year = year;
this.month = month;
@@ -863,9 +882,7 @@ public void setDate (int year, int month, int day) {
OS.gtk_calendar_select_month(handle, month, year);
OS.gtk_calendar_select_day(handle, day);
} else {
- calendar.set(Calendar.YEAR, year);
- calendar.set(Calendar.MONTH, month);
- calendar.set(Calendar.DAY_OF_MONTH, day);
+ calendar.set(year, month, day);
updateControl();
}
}
@@ -874,6 +891,7 @@ public void setDate (int year, int month, int day) {
* Sets the receiver's date, or day of the month, to the specified day.
* <p>
* The first day of the month is 1, and the last day depends on the month and year.
+ * If the specified day is not valid for the receiver's month and year, then it is ignored.
* </p>
*
* @param day a positive integer beginning with 1
@@ -882,10 +900,12 @@ public void setDate (int year, int month, int day) {
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
+ *
+ * @see #setDate
*/
public void setDay (int day) {
checkWidget ();
- if (!isValid(Calendar.DAY_OF_MONTH, day)) return;
+ if (!isValidDate(getYear(), getMonth(), day)) return;
if ((style & SWT.CALENDAR) != 0) {
this.day = day;
OS.gtk_calendar_select_day(handle, day);
@@ -910,7 +930,7 @@ public void setDay (int day) {
*/
public void setHours (int hours) {
checkWidget ();
- if (!isValid(Calendar.HOUR_OF_DAY, hours)) return;
+ if (!isValidTime(Calendar.HOUR_OF_DAY, hours)) return;
if ((style & SWT.CALENDAR) != 0) {
this.hours = hours;
} else {
@@ -934,7 +954,7 @@ public void setHours (int hours) {
*/
public void setMinutes (int minutes) {
checkWidget ();
- if (!isValid(Calendar.MINUTE, minutes)) return;
+ if (!isValidTime(Calendar.MINUTE, minutes)) return;
if ((style & SWT.CALENDAR) != 0) {
this.minutes = minutes;
} else {
@@ -947,6 +967,7 @@ public void setMinutes (int minutes) {
* Sets the receiver's month.
* <p>
* The first month of the year is 0, and the last month is 11.
+ * If the specified month is not valid for the receiver's day and year, then it is ignored.
* </p>
*
* @param month an integer between 0 and 11
@@ -955,10 +976,12 @@ public void setMinutes (int minutes) {
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
+ *
+ * @see #setDate
*/
public void setMonth (int month) {
checkWidget ();
- if (!isValid(Calendar.MONTH, month)) return;
+ if (!isValidDate(getYear(), month, getDay())) return;
if ((style & SWT.CALENDAR) != 0) {
this.month = month;
OS.gtk_calendar_select_month(handle, month, year);
@@ -983,7 +1006,7 @@ public void setMonth (int month) {
*/
public void setSeconds (int seconds) {
checkWidget ();
- if (!isValid(Calendar.SECOND, seconds)) return;
+ if (!isValidTime(Calendar.SECOND, seconds)) return;
if ((style & SWT.CALENDAR) != 0) {
this.seconds = seconds;
} else {
@@ -1008,9 +1031,9 @@ public void setSeconds (int seconds) {
*/
public void setTime (int hours, int minutes, int seconds) {
checkWidget ();
- if (!isValid(Calendar.HOUR_OF_DAY, hours)) return;
- if (!isValid(Calendar.MINUTE, minutes)) return;
- if (!isValid(Calendar.SECOND, seconds)) return;
+ if (!isValidTime(Calendar.HOUR_OF_DAY, hours)) return;
+ if (!isValidTime(Calendar.MINUTE, minutes)) return;
+ if (!isValidTime(Calendar.SECOND, seconds)) return;
if ((style & SWT.CALENDAR) != 0) {
this.hours = hours;
this.minutes = minutes;
@@ -1027,6 +1050,7 @@ public void setTime (int hours, int minutes, int seconds) {
* Sets the receiver's year.
* <p>
* The first year is 1752 and the last year is 9999.
+ * If the specified year is not valid for the receiver's day and month, then it is ignored.
* </p>
*
* @param year an integer between 1752 and 9999
@@ -1035,11 +1059,12 @@ public void setTime (int hours, int minutes, int seconds) {
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
* </ul>
+ *
+ * @see #setDate
*/
public void setYear (int year) {
checkWidget ();
- //if (!isValid(Calendar.YEAR, year)) return;
- if (year < MIN_YEAR || year > MAX_YEAR) return;
+ if (!isValidDate(year, getMonth(), getDay())) return;
if ((style & SWT.CALENDAR) != 0) {
this.year = year;
OS.gtk_calendar_select_month(handle, month, year);
diff --git a/org/eclipse/swt/widgets/Decorations.java b/org/eclipse/swt/widgets/Decorations.java
index 95e9db2..38ed5a2 100644
--- a/org/eclipse/swt/widgets/Decorations.java
+++ b/org/eclipse/swt/widgets/Decorations.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -91,6 +91,7 @@ import org.eclipse.swt.graphics.*;
* @see Shell
* @see SWT
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Decorations extends Canvas {
String text;
@@ -218,7 +219,7 @@ int compare (ImageData data1, ImageData data2) {
return data1.width > data2.width || data1.height > data2.height ? -1 : 1;
}
-Control computeTabGroup () {
+Widget computeTabGroup () {
return this;
}
diff --git a/org/eclipse/swt/widgets/Dialog.java b/org/eclipse/swt/widgets/Dialog.java
index 7a6caf1..95de81f 100644
--- a/org/eclipse/swt/widgets/Dialog.java
+++ b/org/eclipse/swt/widgets/Dialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -61,7 +61,7 @@ import org.eclipse.swt.*;
* and behavior of the instance, including its modality.
* <dl>
* <dt><b>Styles:</b></dt>
- * <dd>APPLICATION_MODAL, PRIMARY_MODAL, SYSTEM_MODAL</dd>
+ * <dd>APPLICATION_MODAL, PRIMARY_MODAL, SYSTEM_MODAL, SHEET</dd>
* <dt><b>Events:</b></dt>
* <dd>(none)</dd>
* </dl>
@@ -166,7 +166,14 @@ void checkParent (Shell parent) {
}
static int checkStyle (Shell parent, int style) {
- if ((style & (SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) == 0) {
+ int mask = SWT.PRIMARY_MODAL | SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL;
+ if ((style & SWT.SHEET) != 0) {
+ style &= ~SWT.SHEET;
+ if ((style & mask) == 0) {
+ style |= parent == null ? SWT.APPLICATION_MODAL : SWT.PRIMARY_MODAL;
+ }
+ }
+ if ((style & mask) == 0) {
style |= SWT.APPLICATION_MODAL;
}
style &= ~SWT.MIRRORED;
diff --git a/org/eclipse/swt/widgets/DirectoryDialog.java b/org/eclipse/swt/widgets/DirectoryDialog.java
index bb8f8e7..8b31222 100644
--- a/org/eclipse/swt/widgets/DirectoryDialog.java
+++ b/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#directorydialog">DirectoryDialog snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class DirectoryDialog extends Dialog {
String message = "", filterPath = "";
@@ -125,13 +126,14 @@ public String open () {
String openChooserDialog () {
byte [] titleBytes = Converter.wcsToMbcs (null, title, true);
int /*long*/ shellHandle = parent.topHandle ();
- int /*long*/ handle = OS.gtk_file_chooser_dialog_new (
- titleBytes,
- shellHandle,
- OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL,
- OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK,
- 0);
+ Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
+ int /*long*/ handle = 0;
+ if (display.getDismissalAlignment() == SWT.RIGHT) {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
+ } else {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, OS.GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
+ }
+ OS.gtk_window_set_modal (handle, true);
int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
@@ -169,7 +171,6 @@ String openChooserDialog () {
OS.gtk_file_chooser_set_extra_widget (handle, box);
}
String answer = null;
- Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
display.addIdleProc ();
Dialog oldModal = null;
if (OS.gtk_window_get_modal (handle)) {
@@ -225,6 +226,7 @@ String openClassicDialog () {
OS.g_list_free (pixbufs);
}
}
+ OS.gtk_window_set_modal (handle, true);
String answer = null;
if (filterPath != null) {
String path = filterPath;
diff --git a/org/eclipse/swt/widgets/Display.java b/org/eclipse/swt/widgets/Display.java
index ca87570..0e1945f 100644
--- a/org/eclipse/swt/widgets/Display.java
+++ b/org/eclipse/swt/widgets/Display.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,6 +92,7 @@ import org.eclipse.swt.graphics.*;
* @see Device#dispose
* @see <a href="http://www.eclipse.org/swt/snippets/#display">Display snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Display extends Device {
@@ -272,9 +273,16 @@ public class Display extends Device {
/* Click count*/
int clickCount = 1;
+ /* Entry inner border */
+ static final int INNER_BORDER = 2;
+
/* Timestamp of the Last Received Events */
int lastEventTime, lastUserEventTime;
+ /* Pango layout constructor */
+ int /*long*/ pangoLayoutNewProc, pangoLayoutNewDefaultProc;
+ Callback pangoLayoutNewCallback;
+
/* Fixed Subclass */
static int /*long*/ fixed_type;
static int /*long*/ fixed_info_ptr;
@@ -396,8 +404,8 @@ public class Display extends Device {
/* GTK Version */
static final int MAJOR = 2;
- static final int MINOR = 0;
- static final int MICRO = 6;
+ static final int MINOR = 2;
+ static final int MICRO = 0;
/* Display Data */
Object data;
@@ -1432,6 +1440,29 @@ public Control getCursorControl () {
return null;
}
+static GtkBorder getEntryInnerBorder (int /*long*/ handle) {
+ GtkBorder gtkBorder = new GtkBorder();
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ int /*long*/ border = OS.gtk_entry_get_inner_border (handle);
+ if (border != 0) {
+ OS.memmove (gtkBorder, border, GtkBorder.sizeof);
+ return gtkBorder;
+ }
+ int /*long*/ [] borderPtr = new int /*long*/ [1];
+ OS.gtk_widget_style_get (handle, OS.inner_border, borderPtr,0);
+ if (borderPtr[0] != 0) {
+ OS.memmove (gtkBorder, borderPtr[0], GtkBorder.sizeof);
+ OS.gtk_border_free(borderPtr[0]);
+ return gtkBorder;
+ }
+ }
+ gtkBorder.left = INNER_BORDER;
+ gtkBorder.top = INNER_BORDER;
+ gtkBorder.right = INNER_BORDER;
+ gtkBorder.bottom = INNER_BORDER;
+ return gtkBorder;
+}
+
boolean filterEvent (Event event) {
if (filterTable != null) filterTable.sendEvent (event);
return false;
@@ -1654,7 +1685,12 @@ static boolean isValidClass (Class clazz) {
*/
public int getDismissalAlignment () {
checkDevice ();
- return SWT.RIGHT;
+ int [] buffer = new int [1];
+ if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+ int /*long*/ settings = OS.gtk_settings_get_default ();
+ OS.g_object_get (settings, OS.gtk_alternative_button_order, buffer, 0);
+ }
+ return buffer [0] == 1 ? SWT.LEFT : SWT.RIGHT;
}
/**
@@ -2300,6 +2336,7 @@ int /*long*/ idleProc (int /*long*/ data) {
protected void init () {
super.init ();
initializeCallbacks ();
+ initializeSubclasses ();
initializeSystemColors ();
initializeSystemSettings ();
initializeWidgetTable ();
@@ -2353,6 +2390,7 @@ void initializeCallbacks () {
closures [Widget.CHANGED] = OS.g_cclosure_new (windowProc2, Widget.CHANGED, 0);
closures [Widget.CLICKED] = OS.g_cclosure_new (windowProc2, Widget.CLICKED, 0);
closures [Widget.DAY_SELECTED] = OS.g_cclosure_new (windowProc2, Widget.DAY_SELECTED, 0);
+ closures [Widget.DAY_SELECTED_DOUBLE_CLICK] = OS.g_cclosure_new (windowProc2, Widget.DAY_SELECTED_DOUBLE_CLICK, 0);
closures [Widget.HIDE] = OS.g_cclosure_new (windowProc2, Widget.HIDE, 0);
closures [Widget.GRAB_FOCUS] = OS.g_cclosure_new (windowProc2, Widget.GRAB_FOCUS, 0);
closures [Widget.MAP] = OS.g_cclosure_new (windowProc2, Widget.MAP, 0);
@@ -2404,6 +2442,7 @@ void initializeCallbacks () {
closures [Widget.UNMAP_EVENT] = OS.g_cclosure_new (windowProc3, Widget.UNMAP_EVENT, 0);
closures [Widget.VISIBILITY_NOTIFY_EVENT] = OS.g_cclosure_new (windowProc3, Widget.VISIBILITY_NOTIFY_EVENT, 0);
closures [Widget.WINDOW_STATE_EVENT] = OS.g_cclosure_new (windowProc3, Widget.WINDOW_STATE_EVENT, 0);
+ closures [Widget.ROW_DELETED] = OS.g_cclosure_new (windowProc3, Widget.ROW_DELETED, 0);
windowCallback4 = new Callback (this, "windowProc", 4); //$NON-NLS-1$
windowProc4 = windowCallback4.getAddress ();
@@ -2413,9 +2452,11 @@ void initializeCallbacks () {
closures [Widget.DELETE_TEXT] = OS.g_cclosure_new (windowProc4, Widget.DELETE_TEXT, 0);
closures [Widget.ROW_ACTIVATED] = OS.g_cclosure_new (windowProc4, Widget.ROW_ACTIVATED, 0);
closures [Widget.SCROLL_CHILD] = OS.g_cclosure_new (windowProc4, Widget.SCROLL_CHILD, 0);
+ closures [Widget.STATUS_ICON_POPUP_MENU] = OS.g_cclosure_new (windowProc4, Widget.STATUS_ICON_POPUP_MENU, 0);
closures [Widget.SWITCH_PAGE] = OS.g_cclosure_new (windowProc4, Widget.SWITCH_PAGE, 0);
closures [Widget.TEST_COLLAPSE_ROW] = OS.g_cclosure_new (windowProc4, Widget.TEST_COLLAPSE_ROW, 0);
closures [Widget.TEST_EXPAND_ROW] = OS.g_cclosure_new (windowProc4, Widget.TEST_EXPAND_ROW, 0);
+ closures [Widget.ROW_INSERTED] = OS.g_cclosure_new (windowProc4, Widget.ROW_INSERTED, 0);
windowCallback5 = new Callback (this, "windowProc", 5); //$NON-NLS-1$
windowProc5 = windowCallback5.getAddress ();
@@ -2494,6 +2535,19 @@ void initializeCallbacks () {
if (idleProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
}
+void initializeSubclasses () {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
+ pangoLayoutNewCallback = new Callback (this, "pangoLayoutNewProc", 3); //$NON-NLS-1$
+ pangoLayoutNewProc = pangoLayoutNewCallback.getAddress ();
+ if (pangoLayoutNewProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
+ int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+ int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+ pangoLayoutNewDefaultProc = OS.G_OBJECT_CLASS_CONSTRUCTOR (pangoLayoutClass);
+ OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewProc);
+ OS.g_type_class_unref (pangoLayoutClass);
+ }
+}
+
void initializeSystemSettings () {
styleSetCallback = new Callback (this, "styleSetProc", 3); //$NON-NLS-1$
styleSetProc = styleSetCallback.getAddress ();
@@ -2843,6 +2897,12 @@ int /*long*/ mouseHoverProc (int /*long*/ handle) {
return widget.hoverProc (handle);
}
+int /*long*/ pangoLayoutNewProc (int /*long*/ type, int /*long*/ n_construct_properties, int /*long*/ construct_properties) {
+ int /*long*/ layout = OS.Call (pangoLayoutNewDefaultProc, type, (int)/*64*/n_construct_properties, construct_properties);
+ OS.pango_layout_set_auto_dir (layout, false);
+ return layout;
+}
+
/**
* Generate a low level system event.
*
@@ -2880,6 +2940,13 @@ int /*long*/ mouseHoverProc (int /*long*/ handle) {
* <li>(in) x the x coordinate to move the mouse pointer to in screen coordinates
* <li>(in) y the y coordinate to move the mouse pointer to in screen coordinates
* </ul>
+ * <p>MouseWheel</p>
+ * <p>The following fields in the <code>Event</code> apply:
+ * <ul>
+ * <li>(in) type MouseWheel
+ * <li>(in) detail either SWT.SCROLL_LINE or SWT.SCROLL_PAGE
+ * <li>(in) count the number of lines or pages to scroll
+ * </ul>
* </dl>
*
* @param event the event to be generated
@@ -2897,67 +2964,79 @@ int /*long*/ mouseHoverProc (int /*long*/ handle) {
*
*/
public boolean post (Event event) {
- synchronized (Device.class) {
- if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
- if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
- if (!OS.GDK_WINDOWING_X11()) return false;
- int /*long*/ xDisplay = OS.GDK_DISPLAY ();
- int type = event.type;
- switch (type) {
- case SWT.KeyDown:
- case SWT.KeyUp: {
- int keyCode = 0;
- int /*long*/ keysym = untranslateKey (event.keyCode);
- if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
- if (keyCode == 0) {
- char key = event.character;
- switch (key) {
- case SWT.BS: keysym = OS.GDK_BackSpace; break;
- case SWT.CR: keysym = OS.GDK_Return; break;
- case SWT.DEL: keysym = OS.GDK_Delete; break;
- case SWT.ESC: keysym = OS.GDK_Escape; break;
- case SWT.TAB: keysym = OS.GDK_Tab; break;
- case SWT.LF: keysym = OS.GDK_Linefeed; break;
- default:
- keysym = key;
+ /*
+ * Get the operating system lock before synchronizing on the device
+ * lock so that the device lock will not be held should another
+ * thread already be in the operating system. This avoids deadlock
+ * should the other thread need the device lock.
+ */
+ Lock lock = OS.lock;
+ lock.lock();
+ try {
+ synchronized (Device.class) {
+ if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
+ if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (!OS.GDK_WINDOWING_X11()) return false;
+ int /*long*/ xDisplay = OS.GDK_DISPLAY ();
+ int type = event.type;
+ switch (type) {
+ case SWT.KeyDown:
+ case SWT.KeyUp: {
+ int keyCode = 0;
+ int /*long*/ keysym = untranslateKey (event.keyCode);
+ if (keysym != 0) keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
+ if (keyCode == 0) {
+ char key = event.character;
+ switch (key) {
+ case SWT.BS: keysym = OS.GDK_BackSpace; break;
+ case SWT.CR: keysym = OS.GDK_Return; break;
+ case SWT.DEL: keysym = OS.GDK_Delete; break;
+ case SWT.ESC: keysym = OS.GDK_Escape; break;
+ case SWT.TAB: keysym = OS.GDK_Tab; break;
+ case SWT.LF: keysym = OS.GDK_Linefeed; break;
+ default:
+ keysym = key;
+ }
+ keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
+ if (keyCode == 0) return false;
}
- keyCode = OS.XKeysymToKeycode (xDisplay, keysym);
- if (keyCode == 0) return false;
+ OS.XTestFakeKeyEvent (xDisplay, keyCode, type == SWT.KeyDown, 0);
+ return true;
}
- OS.XTestFakeKeyEvent (xDisplay, keyCode, type == SWT.KeyDown, 0);
- return true;
- }
- case SWT.MouseDown:
- case SWT.MouseMove:
- case SWT.MouseUp: {
- if (type == SWT.MouseMove) {
- OS.XTestFakeMotionEvent (xDisplay, -1, event.x, event.y, 0);
- } else {
- int button = event.button;
- switch (button) {
- case 1:
- case 2:
- case 3: break;
- case 4: button = 6; break;
- case 5: button = 7; break;
- default: return false;
+ case SWT.MouseDown:
+ case SWT.MouseMove:
+ case SWT.MouseUp: {
+ if (type == SWT.MouseMove) {
+ OS.XTestFakeMotionEvent (xDisplay, -1, event.x, event.y, 0);
+ } else {
+ int button = event.button;
+ switch (button) {
+ case 1:
+ case 2:
+ case 3: break;
+ case 4: button = 6; break;
+ case 5: button = 7; break;
+ default: return false;
+ }
+ OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseDown, 0);
}
- OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseDown, 0);
+ return true;
}
- return true;
+ /*
+ * This code is intentionally commented. After posting a
+ * mouse wheel event the system may respond unpredictably
+ * to subsequent mouse actions.
+ */
+// case SWT.MouseWheel: {
+// if (event.count == 0) return false;
+// int button = event.count < 0 ? 5 : 4;
+// OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseWheel, 0);
+// }
}
- /*
- * This code is intentionally commented. After posting a
- * mouse wheel event the system may respond unpredictably
- * to subsequent mouse actions.
- */
-// case SWT.MouseWheel: {
-// if (event.count == 0) return false;
-// int button = event.count < 0 ? 5 : 4;
-// OS.XTestFakeButtonEvent (xDisplay, button, type == SWT.MouseWheel, 0);
-// }
+ return false;
}
- return false;
+ } finally {
+ lock.unlock();
}
}
@@ -3033,7 +3112,7 @@ public boolean readAndDispatch () {
runDeferredEvents ();
return true;
}
- return runAsyncMessages (false);
+ return isDisposed () || runAsyncMessages (false);
}
static void register (Display display) {
@@ -3237,6 +3316,17 @@ void releaseDisplay () {
styleSetCallback.dispose(); styleSetCallback = null;
styleSetProc = 0;
+ /* Dispose subclass */
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
+ int /*long*/ pangoLayoutType = OS.PANGO_TYPE_LAYOUT ();
+ int /*long*/ pangoLayoutClass = OS.g_type_class_ref (pangoLayoutType);
+ OS.G_OBJECT_CLASS_SET_CONSTRUCTOR (pangoLayoutClass, pangoLayoutNewDefaultProc);
+ OS.g_type_class_unref (pangoLayoutClass);
+ pangoLayoutNewCallback.dispose ();
+ pangoLayoutNewCallback = null;
+ pangoLayoutNewDefaultProc = pangoLayoutNewProc = 0;
+ }
+
/* Release the sleep resources */
max_priority = timeout = null;
if (fds != 0) OS.g_free (fds);
@@ -3379,6 +3469,7 @@ boolean runAsyncMessages (boolean all) {
}
boolean runDeferredEvents () {
+ boolean run = false;
/*
* Run deferred events. This code is always
* called in the Display's thread so it must
@@ -3398,6 +3489,7 @@ boolean runDeferredEvents () {
if (widget != null && !widget.isDisposed ()) {
Widget item = event.item;
if (item == null || !item.isDisposed ()) {
+ run = true;
widget.sendEvent (event);
}
}
@@ -3411,7 +3503,7 @@ boolean runDeferredEvents () {
/* Clear the queue */
eventQueue = null;
- return true;
+ return run;
}
boolean runPopups () {
@@ -3543,7 +3635,7 @@ public void setData (String key, Object value) {
}
}
if (key.equals (SET_MODAL_DIALOG)) {
- setModalDialog ((Dialog) data);
+ setModalDialog ((Dialog) value);
return;
}
if (key.equals (ADD_WIDGET_KEY)) {
diff --git a/org/eclipse/swt/widgets/ExpandBar.java b/org/eclipse/swt/widgets/ExpandBar.java
index b06db82..b3584f8 100644
--- a/org/eclipse/swt/widgets/ExpandBar.java
+++ b/org/eclipse/swt/widgets/ExpandBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.2
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ExpandBar extends Composite {
ExpandItem [] items;
@@ -73,6 +74,7 @@ public class ExpandBar extends Composite {
* <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
* </ul>
*
+ * @see SWT#V_SCROLL
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
@@ -155,10 +157,11 @@ void createHandle (int index) {
if ((style & SWT.V_SCROLL) != 0) {
scrolledHandle = OS.gtk_scrolled_window_new (0, 0);
if (scrolledHandle == 0) error (SWT.ERROR_NO_HANDLES);
- int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_AUTOMATIC : OS.GTK_POLICY_NEVER;
- OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, vsp);
+ OS.gtk_scrolled_window_set_policy (scrolledHandle, OS.GTK_POLICY_NEVER, OS.GTK_POLICY_AUTOMATIC);
OS.gtk_container_add (fixedHandle, scrolledHandle);
OS.gtk_scrolled_window_add_with_viewport (scrolledHandle, handle);
+ int /*long*/ viewport = OS.gtk_bin_get_child (scrolledHandle);
+ OS.gtk_viewport_set_shadow_type (viewport, OS.GTK_SHADOW_NONE);
} else {
OS.gtk_container_add (fixedHandle, handle);
}
@@ -263,6 +266,15 @@ boolean hasFocus () {
return super.hasFocus();
}
+void hookEvents () {
+ super.hookEvents ();
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
+ if (scrolledHandle != 0) {
+ OS.g_signal_connect_closure (scrolledHandle, OS.size_allocate, display.closures [SIZE_ALLOCATE], true);
+ }
+ }
+}
+
int getBandHeight () {
if (font == null) return ExpandItem.CHEVRON_SIZE;
GC gc = new GC (this);
@@ -544,6 +556,12 @@ void layoutItems (int index, boolean setScrollbar) {
}
}
+int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
+ int /*long*/ result = super.gtk_size_allocate (widget, allocation);
+ layoutItems (0, false);
+ return result;
+}
+
int /*long*/ parentingHandle () {
return OS.GTK_VERSION >= OS.VERSION (2, 4, 0) ? fixedHandle : handle;
}
diff --git a/org/eclipse/swt/widgets/ExpandItem.java b/org/eclipse/swt/widgets/ExpandItem.java
index 91dfb8d..e141b60 100644
--- a/org/eclipse/swt/widgets/ExpandItem.java
+++ b/org/eclipse/swt/widgets/ExpandItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.2
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ExpandItem extends Item {
ExpandBar parent;
@@ -409,6 +410,21 @@ void resizeControl (int yScroll) {
OS.gtk_widget_style_get (handle, OS.focus_line_width, property, 0);
y += property [0] * 2;
height -= property [0] * 2;
+
+ /*
+ * Feature in GTK. When the ExpandBar is resize too small the control
+ * shows up on top of the vertical scrollbar. This happen because the
+ * GtkExpander does not set the size of child smaller than the request
+ * size of its parent and because the control is not parented in the
+ * hierarchy of the GtkScrolledWindow.
+ * The fix is calculate the width ourselves when the scrollbar is visible.
+ */
+ ScrollBar vBar = parent.verticalBar;
+ if (vBar != null) {
+ if (OS.GTK_WIDGET_VISIBLE (vBar.handle)) {
+ width = OS.GTK_WIDGET_WIDTH (parent.scrolledHandle) - parent.vScrollBarWidth () - 2 * parent.spacing;
+ }
+ }
control.setBounds (x, y - yScroll, width, Math.max (0, height), true, true);
}
}
diff --git a/org/eclipse/swt/widgets/FileDialog.java b/org/eclipse/swt/widgets/FileDialog.java
index 1e658ff..6cbca21 100644
--- a/org/eclipse/swt/widgets/FileDialog.java
+++ b/org/eclipse/swt/widgets/FileDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#filedialog">FileDialog snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class FileDialog extends Dialog {
String [] filterNames = new String [0];
@@ -44,6 +45,7 @@ public class FileDialog extends Dialog {
String fullPath = "";
int filterIndex = -1;
boolean overwrite = false;
+ boolean uriMode;
int /*long*/ handle;
static final char SEPARATOR = System.getProperty ("file.separator").charAt (0);
static final char EXTENSION_SEPARATOR = ';';
@@ -87,6 +89,10 @@ public FileDialog (Shell parent) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
* <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
* </ul>
+ *
+ * @see SWT#SAVE
+ * @see SWT#OPEN
+ * @see SWT#MULTI
*/
public FileDialog (Shell parent, int style) {
super (parent, checkStyle (parent, style));
@@ -96,15 +102,25 @@ String computeResultChooserDialog () {
/* MULTI is only valid if the native dialog's action is Open */
fullPath = null;
if ((style & (SWT.SAVE | SWT.MULTI)) == SWT.MULTI) {
- int /*long*/ list = OS.gtk_file_chooser_get_filenames (handle);
+ int /*long*/ list = 0;
+ if (uriMode) {
+ list = OS.gtk_file_chooser_get_uris (handle);
+ } else {
+ list = OS.gtk_file_chooser_get_filenames (handle);
+ }
int listLength = OS.g_slist_length (list);
fileNames = new String [listLength];
int /*long*/ current = list;
int writePos = 0;
for (int i = 0; i < listLength; i++) {
int /*long*/ name = OS.g_slist_data (current);
- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (name, -1, null, null, null);
- OS.g_free (name);
+ int /*long*/ utf8Ptr = 0;
+ if (uriMode) {
+ utf8Ptr = name;
+ } else {
+ utf8Ptr = OS.g_filename_to_utf8 (name, -1, null, null, null);
+ OS.g_free (name);
+ }
if (utf8Ptr != 0) {
int /*long*/ [] items_written = new int /*long*/ [1];
int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
@@ -127,23 +143,28 @@ String computeResultChooserDialog () {
}
OS.g_slist_free (list);
} else {
- int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
- if (path != 0) {
- int /*long*/ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
- OS.g_free (path);
- if (utf8Ptr != 0) {
- int /*long*/ [] items_written = new int /*long*/ [1];
- int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
- OS.g_free (utf8Ptr);
- if (utf16Ptr != 0) {
- int clength = (int)/*64*/items_written [0];
- char [] chars = new char [clength];
- OS.memmove (chars, utf16Ptr, clength * 2);
- OS.g_free (utf16Ptr);
- fullPath = new String (chars);
- fileNames = new String [1];
- fileNames[0] = fullPath.substring (fullPath.lastIndexOf (SEPARATOR) + 1);
- }
+ int /*long*/ utf8Ptr = 0;
+ if (uriMode) {
+ utf8Ptr = OS.gtk_file_chooser_get_uri (handle);
+ } else {
+ int /*long*/ path = OS.gtk_file_chooser_get_filename (handle);
+ if (path != 0) {
+ utf8Ptr = OS.g_filename_to_utf8 (path, -1, null, null, null);
+ OS.g_free (path);
+ }
+ }
+ if (utf8Ptr != 0) {
+ int /*long*/ [] items_written = new int /*long*/ [1];
+ int /*long*/ utf16Ptr = OS.g_utf8_to_utf16 (utf8Ptr, -1, null, items_written, null);
+ OS.g_free (utf8Ptr);
+ if (utf16Ptr != 0) {
+ int clength = (int)/*64*/items_written [0];
+ char [] chars = new char [clength];
+ OS.memmove (chars, utf16Ptr, clength * 2);
+ OS.g_free (utf16Ptr);
+ fullPath = new String (chars);
+ fileNames = new String [1];
+ fileNames[0] = fullPath.substring (fullPath.lastIndexOf (SEPARATOR) + 1);
}
}
}
@@ -371,20 +392,22 @@ String openChooserDialog () {
OS.GTK_FILE_CHOOSER_ACTION_SAVE :
OS.GTK_FILE_CHOOSER_ACTION_OPEN;
int /*long*/ shellHandle = parent.topHandle ();
- handle = OS.gtk_file_chooser_dialog_new (
- titleBytes,
- shellHandle,
- action,
- OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL,
- OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK,
- 0);
+ Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
+ if (display.getDismissalAlignment() == SWT.RIGHT) {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, 0);
+ } else {
+ handle = OS.gtk_file_chooser_dialog_new (titleBytes, shellHandle, action, OS.GTK_STOCK_OK (), OS.GTK_RESPONSE_OK, OS.GTK_STOCK_CANCEL (), OS.GTK_RESPONSE_CANCEL, 0);
+ }
+ OS.gtk_window_set_modal (handle, true);
int /*long*/ pixbufs = OS.gtk_window_get_icon_list (shellHandle);
if (pixbufs != 0) {
OS.gtk_window_set_icon_list (handle, pixbufs);
OS.g_list_free (pixbufs);
}
+ if (uriMode) {
+ OS.gtk_file_chooser_set_local_only (handle, false);
+ }
presetChooserDialog ();
- Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
display.addIdleProc ();
String answer = null;
Dialog oldModal = null;
@@ -424,6 +447,7 @@ String openClassicDialog () {
OS.g_list_free (pixbufs);
}
}
+ OS.gtk_window_set_modal (handle, true);
presetClassicDialog ();
Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
display.addIdleProc ();
@@ -460,32 +484,46 @@ void presetChooserDialog () {
}
if (filterPath == null) filterPath = "";
if (fileName == null) fileName = "";
- if (filterPath.length () > 0) {
- StringBuffer stringBuffer = new StringBuffer ();
- /* filename must be a full path */
- if (filterPath.charAt (0) != SEPARATOR) {
- stringBuffer.append (SEPARATOR);
- }
- stringBuffer.append (filterPath);
-
- if (fileName.length () > 0 && (style & SWT.SAVE) == 0) {
- if (filterPath.charAt (filterPath.length () - 1) != SEPARATOR) {
- stringBuffer.append (SEPARATOR);
- }
- stringBuffer.append (fileName);
- byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true);
- /*
- * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
- * when setting a file name that is not a true canonical path.
- * The fix is to use the canonical path.
- */
- int /*long*/ ptr = OS.realpath (buffer, null);
- if (ptr != 0) {
- OS.gtk_file_chooser_set_filename (handle, ptr);
+ if ((style & SWT.SAVE) != 0) {
+ if (filterPath.length () > 0) {
+ if (uriMode) {
+ byte [] buffer = Converter.wcsToMbcs (null, filterPath, true);
+ OS.gtk_file_chooser_set_current_folder_uri (handle, buffer);
+ } else {
+ /* filename must be a full path */
+ byte [] buffer = Converter.wcsToMbcs (null, SEPARATOR + filterPath, true);
+
+ /*
+ * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
+ * when setting a file name that is not a true canonical path.
+ * The fix is to use the canonical path.
+ */
+ int /*long*/ ptr = OS.realpath (buffer, null);
+ OS.gtk_file_chooser_set_current_folder (handle, ptr);
OS.g_free (ptr);
}
+ }
+ if (fileName.length () > 0) {
+ byte [] buffer = Converter.wcsToMbcs (null, fileName, true);
+ OS.gtk_file_chooser_set_current_name (handle, buffer);
+ }
+ } else {
+ StringBuffer stringBuffer = new StringBuffer();
+ if (filterPath.length () > 0) {
+ if (!uriMode) {
+ /* filename must be a full path */
+ stringBuffer.append(SEPARATOR);
+ }
+ stringBuffer.append(filterPath);
+ stringBuffer.append(SEPARATOR);
+ }
+ if (fileName.length () > 0) {
+ stringBuffer.append(fileName);
+ }
+ byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString(), true);
+ if (uriMode) {
+ OS.gtk_file_chooser_set_uri (handle, buffer);
} else {
- byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true);
/*
* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
* when setting a file name that is not a true canonical path.
@@ -493,31 +531,13 @@ void presetChooserDialog () {
*/
int /*long*/ ptr = OS.realpath (buffer, null);
if (ptr != 0) {
- OS.gtk_file_chooser_set_current_folder (handle, ptr);
+ OS.gtk_file_chooser_set_filename (handle, ptr);
OS.g_free (ptr);
}
}
- } else {
- if (fileName.length () > 0) {
- if (fileName.charAt (0) == SEPARATOR) {
- byte [] buffer = Converter.wcsToMbcs (null, fileName, true);
- /*
- * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
- * when setting a file name that is not a true canonical path.
- * The fix is to use the canonical path.
- */
- int /*long*/ ptr = OS.realpath (buffer, null);
- if (ptr != 0) {
- OS.gtk_file_chooser_set_filename (handle, ptr);
- OS.g_free (ptr);
- }
- }
- }
- }
- if ((style & SWT.SAVE) != 0 && fileName.length () > 0) {
- byte [] buffer = Converter.wcsToMbcs (null, fileName, true);
- OS.gtk_file_chooser_set_current_name (handle, buffer);
}
+
+ /* Set overwrite mode */
if ((style & SWT.SAVE) != 0) {
if (OS.GTK_VERSION >= OS.VERSION (2, 8, 0)) {
OS.gtk_file_chooser_set_do_overwrite_confirmation (handle, overwrite);
@@ -697,4 +717,15 @@ public void setFilterPath (String string) {
public void setOverwrite (boolean overwrite) {
this.overwrite = overwrite;
}
+/* Sets URI Mode.
+ *
+ * When the FileDialog is in URI mode it returns
+ * a URI (instead of a file name) for the following
+ * methods: open() and getFilterPath().
+ * The input argment for setFilterPath() should also
+ * be a URI.
+ */
+/*public*/ void setURIMode (boolean uriMode) {
+ this.uriMode = uriMode;
+}
}
diff --git a/org/eclipse/swt/widgets/FontDialog.java b/org/eclipse/swt/widgets/FontDialog.java
index 4893cc4..d2c7d32 100644
--- a/org/eclipse/swt/widgets/FontDialog.java
+++ b/org/eclipse/swt/widgets/FontDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.swt.graphics.*;
*
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class FontDialog extends Dialog {
FontData fontData;
@@ -147,6 +148,7 @@ public FontData open () {
OS.g_list_free (pixbufs);
}
}
+ OS.gtk_window_set_modal (handle, true);
if (fontData != null) {
Font font = new Font (display, fontData);
int /*long*/ fontName = OS.pango_font_description_to_string (font.handle);
diff --git a/org/eclipse/swt/widgets/Group.java b/org/eclipse/swt/widgets/Group.java
index 70ad3d9..f2b75d0 100644
--- a/org/eclipse/swt/widgets/Group.java
+++ b/org/eclipse/swt/widgets/Group.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,7 @@ import org.eclipse.swt.graphics.*;
*
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Group extends Composite {
int /*long*/ clientHandle, labelHandle;
diff --git a/org/eclipse/swt/widgets/IME.java b/org/eclipse/swt/widgets/IME.java
index 27b12e0..cc0036e 100644
--- a/org/eclipse/swt/widgets/IME.java
+++ b/org/eclipse/swt/widgets/IME.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.4
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class IME extends Widget {
Canvas parent;
@@ -362,7 +363,19 @@ int /*long*/ gtk_preedit_changed (int /*long*/ imcontext) {
OS.g_free (preeditString [0]);
}
if (chars != null) {
- if (text.length() == 0) startOffset = -1;
+ if (text.length() == 0) {
+ /*
+ * Bug in GTK. In Solaris, the IME sends multiple
+ * preedit_changed signals with an empty text.
+ * This behavior is not correct for SWT and can
+ * cause the editor to replace its current selection
+ * with an empty string. The fix is to ignore any
+ * preedit_changed signals with an empty text when
+ * the preedit buffer is already empty.
+ */
+ if (chars.length == 0) return 0;
+ startOffset = -1;
+ }
int end = startOffset + text.length();
if (startOffset == -1) {
Event event = new Event ();
@@ -412,7 +425,7 @@ void releaseWidget () {
* above the IME, then the IME must be informed that the composition
* offset has changed.
*
- * @return the offset of the composition
+ * @param offset the offset of the composition
*
* @exception SWTException <ul>
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
diff --git a/org/eclipse/swt/widgets/Label.java b/org/eclipse/swt/widgets/Label.java
index 5976e86..82ec5be 100644
--- a/org/eclipse/swt/widgets/Label.java
+++ b/org/eclipse/swt/widgets/Label.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.*;
* When SEPARATOR is specified, displays a single
* vertical or horizontal line.
* <p>
- * Shadow styles are hints and may not be honoured
+ * Shadow styles are hints and may not be honored
* by the platform. To create a separator label
* with the default shadow style for the platform,
* do not specify a shadow style.
@@ -47,6 +47,7 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#label">Label snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Label extends Control {
int /*long*/ frameHandle, labelHandle, imageHandle;
@@ -125,25 +126,48 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
if (hHint == SWT.DEFAULT) hHint = DEFAULT_HEIGHT;
}
}
- boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0;
+ Point size;
+ /*
+ * Feature in GTK. GTK has a predetermined maximum width for wrapping text.
+ * The fix is to use pango layout directly instead of the label size request
+ * to calculate its preferred size.
+ */
+ boolean fixWrap = labelHandle != 0 && (style & SWT.WRAP) != 0 && (OS.GTK_WIDGET_FLAGS (labelHandle) & OS.GTK_VISIBLE) != 0;
if (fixWrap || frameHandle != 0) forceResize ();
- int [] labelWidth = new int [1], labelHeight = new int [1];
if (fixWrap) {
- OS.gtk_widget_get_size_request (labelHandle, labelWidth, labelHeight);
- OS.gtk_widget_set_size_request (labelHandle, wHint, hHint);
- }
- Point size;
- if (frameHandle != 0) {
- int [] reqWidth = new int [1], reqHeight = new int [1];
- OS.gtk_widget_get_size_request (handle, reqWidth, reqHeight);
- OS.gtk_widget_set_size_request (handle, wHint, hHint);
- size = computeNativeSize (frameHandle, -1, -1, changed);
- OS.gtk_widget_set_size_request (handle, reqWidth [0], reqHeight [0]);
+ int /*long*/ labelLayout = OS.gtk_label_get_layout (labelHandle);
+ int pangoWidth = OS.pango_layout_get_width (labelLayout);
+ if (wHint != SWT.DEFAULT) {
+ OS.pango_layout_set_width (labelLayout, wHint * OS.PANGO_SCALE);
+ } else {
+ OS.pango_layout_set_width (labelLayout, -1);
+ }
+ int [] w = new int [1], h = new int [1];
+ OS.pango_layout_get_size (labelLayout, w, h);
+ OS.pango_layout_set_width (labelLayout, pangoWidth);
+ if (frameHandle != 0) {
+ int [] labelWidth = new int [1], labelHeight = new int [1];
+ OS.gtk_widget_get_size_request (labelHandle, labelWidth, labelHeight);
+ OS.gtk_widget_set_size_request (labelHandle, 1, 1);
+ size = computeNativeSize (frameHandle, -1, -1, changed);
+ OS.gtk_widget_set_size_request (labelHandle, labelWidth [0], labelHeight [0]);
+ size.x = size.x - 1;
+ size.y = size.y - 1;
+ } else {
+ size = new Point (0,0);
+ }
+ size.x += wHint == SWT.DEFAULT ? OS.PANGO_PIXELS(w [0]) : wHint;
+ size.y += hHint == SWT.DEFAULT ? OS.PANGO_PIXELS(h [0]) : hHint;
} else {
- size = computeNativeSize (handle, wHint, hHint, changed);
- }
- if (fixWrap) {
- OS.gtk_widget_set_size_request (labelHandle, labelWidth [0], labelHeight [0]);
+ if (frameHandle != 0) {
+ int [] reqWidth = new int [1], reqHeight = new int [1];
+ OS.gtk_widget_get_size_request (handle, reqWidth, reqHeight);
+ OS.gtk_widget_set_size_request (handle, wHint, hHint);
+ size = computeNativeSize (frameHandle, -1, -1, changed);
+ OS.gtk_widget_set_size_request (handle, reqWidth [0], reqHeight [0]);
+ } else {
+ size = computeNativeSize (handle, wHint, hHint, changed);
+ }
}
/*
* Feature in GTK. Instead of using the font height to determine
@@ -389,20 +413,9 @@ public void setAlignment (int alignment) {
}
void setAlignment () {
- boolean isRTL = (style & SWT.RIGHT_TO_LEFT) != 0;
- if (text != null && text.length () != 0) {
- if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0)) {
- int /*long*/ layout = OS.gtk_label_get_layout (labelHandle);
- int /*long*/ linePtr = OS.pango_layout_get_line (layout, 0);
- int resolved_dir = OS.pango_layout_line_get_resolved_dir (linePtr);
- if (resolved_dir == OS.PANGO_DIRECTION_RTL) {
- isRTL = !isRTL;
- }
- }
- }
if ((style & SWT.LEFT) != 0) {
OS.gtk_misc_set_alignment (labelHandle, 0.0f, 0.0f);
- OS.gtk_label_set_justify (labelHandle, isRTL ? OS.GTK_JUSTIFY_RIGHT : OS.GTK_JUSTIFY_LEFT);
+ OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_LEFT);
OS.gtk_misc_set_alignment (imageHandle, 0.0f, 0.5f);
return;
}
@@ -414,7 +427,7 @@ void setAlignment () {
}
if ((style & SWT.RIGHT) != 0) {
OS.gtk_misc_set_alignment (labelHandle, 1.0f, 0.0f);
- OS.gtk_label_set_justify (labelHandle, isRTL ? OS.GTK_JUSTIFY_LEFT : OS.GTK_JUSTIFY_RIGHT);
+ OS.gtk_label_set_justify (labelHandle, OS.GTK_JUSTIFY_RIGHT);
OS.gtk_misc_set_alignment (imageHandle, 1.0f, 0.5f);
return;
}
@@ -566,7 +579,6 @@ public void setText (String string) {
OS.gtk_label_set_text_with_mnemonic (labelHandle, buffer);
OS.gtk_widget_hide (imageHandle);
OS.gtk_widget_show (labelHandle);
- setAlignment ();
}
void showWidget () {
diff --git a/org/eclipse/swt/widgets/Link.java b/org/eclipse/swt/widgets/Link.java
index 1f4bdee..265b3dc 100644
--- a/org/eclipse/swt/widgets/Link.java
+++ b/org/eclipse/swt/widgets/Link.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@ import org.eclipse.swt.accessibility.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Link extends Control {
String text;
@@ -675,8 +676,9 @@ void setFontDescription (int /*long*/ font) {
* selected, the text field of the selection event contains either the
* text of the hyperlink or the value of its HREF, if one was specified.
* In the rare case of identical hyperlinks within the same string, the
- * HREF tag can be used to distinguish between them. The string may
- * include the mnemonic character and line delimiters.
+ * HREF attribute can be used to distinguish between them. The string may
+ * include the mnemonic character and line delimiters. The only delimiter
+ * the HREF attribute supports is the quotation mark (").
* </p>
*
* @param string the new text
diff --git a/org/eclipse/swt/widgets/List.java b/org/eclipse/swt/widgets/List.java
index 99e61db..b1df97f 100644
--- a/org/eclipse/swt/widgets/List.java
+++ b/org/eclipse/swt/widgets/List.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#list">List snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class List extends Scrollable {
int /*long*/ modelHandle;
diff --git a/org/eclipse/swt/widgets/Menu.java b/org/eclipse/swt/widgets/Menu.java
index 72bc0e2..5e042a6 100644
--- a/org/eclipse/swt/widgets/Menu.java
+++ b/org/eclipse/swt/widgets/Menu.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#menu">Menu snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Menu extends Widget {
int x, y;
@@ -105,6 +106,9 @@ public Menu (Control parent) {
* @see SWT#BAR
* @see SWT#DROP_DOWN
* @see SWT#POP_UP
+ * @see SWT#NO_RADIO_GROUP
+ * @see SWT#LEFT_TO_RIGHT
+ * @see SWT#RIGHT_TO_LEFT
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
@@ -598,7 +602,7 @@ public boolean getVisible () {
int /*long*/ gtk_hide (int /*long*/ widget) {
if ((style & SWT.POP_UP) != 0) {
- display.activeShell = getShell ();
+ if (display.activeShell != null) display.activeShell = getShell ();
}
if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
sendEvent (SWT.Hide);
@@ -617,7 +621,7 @@ int /*long*/ gtk_hide (int /*long*/ widget) {
int /*long*/ gtk_show (int /*long*/ widget) {
if ((style & SWT.POP_UP) != 0) {
- display.activeShell = getShell ();
+ if (display.activeShell != null) display.activeShell = getShell ();
return 0;
}
sendEvent (SWT.Show);
diff --git a/org/eclipse/swt/widgets/MenuItem.java b/org/eclipse/swt/widgets/MenuItem.java
index b5392c0..d676e46 100644
--- a/org/eclipse/swt/widgets/MenuItem.java
+++ b/org/eclipse/swt/widgets/MenuItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ import org.eclipse.swt.events.*;
* </p>
*
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class MenuItem extends Item {
Menu parent, menu;
diff --git a/org/eclipse/swt/widgets/MessageBox.java b/org/eclipse/swt/widgets/MessageBox.java
index 15689a7..3d1cfd1 100644
--- a/org/eclipse/swt/widgets/MessageBox.java
+++ b/org/eclipse/swt/widgets/MessageBox.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ import org.eclipse.swt.internal.gtk.*;
*
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample, Dialog tab</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class MessageBox extends Dialog {
@@ -81,6 +82,19 @@ public MessageBox (Shell parent) {
* <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
* <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
* </ul>
+ *
+ * @see SWT#ICON_ERROR
+ * @see SWT#ICON_INFORMATION
+ * @see SWT#ICON_QUESTION
+ * @see SWT#ICON_WARNING
+ * @see SWT#ICON_WORKING
+ * @see SWT#OK
+ * @see SWT#CANCEL
+ * @see SWT#YES
+ * @see SWT#NO
+ * @see SWT#ABORT
+ * @see SWT#RETRY
+ * @see SWT#IGNORE
*/
public MessageBox (Shell parent, int style) {
super (parent, checkStyle (parent, checkStyle (style)));
@@ -147,10 +161,10 @@ public int open () {
OS.g_list_free (pixbufs);
}
}
- createButtons();
+ Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
+ createButtons (display.getDismissalAlignment ());
buffer = Converter.wcsToMbcs(null, title, true);
OS.gtk_window_set_title(handle,buffer);
- Display display = parent != null ? parent.getDisplay (): Display.getCurrent ();
display.addIdleProc ();
Dialog oldModal = null;
if (OS.gtk_window_get_modal (handle)) {
@@ -175,14 +189,24 @@ public int open () {
return response;
}
-private void createButtons() {
- if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-ok", true), SWT.OK);
- if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-cancel", true), SWT.CANCEL);
- if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-yes", true), SWT.YES);
- if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-no", true), SWT.NO);
- if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
- if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
- if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
+private void createButtons (int alignment) {
+ if (alignment == SWT.LEFT) {
+ if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-ok", true), SWT.OK);
+ if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
+ if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
+ if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-yes", true), SWT.YES);
+ if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-no", true), SWT.NO);
+ if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
+ if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-cancel", true), SWT.CANCEL);
+ } else {
+ if ((style & SWT.CANCEL) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-cancel", true), SWT.CANCEL);
+ if ((style & SWT.OK) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-ok", true), SWT.OK);
+ if ((style & SWT.NO) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-no", true), SWT.NO);
+ if ((style & SWT.YES) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, "gtk-yes", true), SWT.YES);
+ if ((style & SWT.IGNORE) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Ignore"), true), SWT.IGNORE);
+ if ((style & SWT.RETRY) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Retry"), true), SWT.RETRY);
+ if ((style & SWT.ABORT) != 0) OS.gtk_dialog_add_button(handle, Converter.wcsToMbcs (null, SWT.getMessage("SWT_Abort"), true), SWT.ABORT);
+ }
}
private static int checkStyle (int style) {
diff --git a/org/eclipse/swt/widgets/ProgressBar.java b/org/eclipse/swt/widgets/ProgressBar.java
index 19279e0..34f3886 100644
--- a/org/eclipse/swt/widgets/ProgressBar.java
+++ b/org/eclipse/swt/widgets/ProgressBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#progressbar">ProgressBar snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ProgressBar extends Control {
int timerId, minimum = 0, maximum = 100, selection = 0;
@@ -66,6 +67,7 @@ public class ProgressBar extends Control {
* @see SWT#SMOOTH
* @see SWT#HORIZONTAL
* @see SWT#VERTICAL
+ * @see SWT#INDETERMINATE
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
diff --git a/org/eclipse/swt/widgets/Sash.java b/org/eclipse/swt/widgets/Sash.java
index 9699e91..4c5d29c 100644
--- a/org/eclipse/swt/widgets/Sash.java
+++ b/org/eclipse/swt/widgets/Sash.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#sash">Sash snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Sash extends Control {
boolean dragging;
@@ -71,6 +72,7 @@ public class Sash extends Control {
*
* @see SWT#HORIZONTAL
* @see SWT#VERTICAL
+ * @see SWT#SMOOTH
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
diff --git a/org/eclipse/swt/widgets/Scale.java b/org/eclipse/swt/widgets/Scale.java
index 965ef6e..47e6ebb 100644
--- a/org/eclipse/swt/widgets/Scale.java
+++ b/org/eclipse/swt/widgets/Scale.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#scale">Scale snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Scale extends Control {
diff --git a/org/eclipse/swt/widgets/ScrollBar.java b/org/eclipse/swt/widgets/ScrollBar.java
index f9a8ee3..b2fcd24 100644
--- a/org/eclipse/swt/widgets/ScrollBar.java
+++ b/org/eclipse/swt/widgets/ScrollBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -80,6 +80,7 @@ import org.eclipse.swt.events.*;
* @see Scrollable#getVerticalBar
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ScrollBar extends Widget {
Scrollable parent;
diff --git a/org/eclipse/swt/widgets/Scrollable.java b/org/eclipse/swt/widgets/Scrollable.java
index b221c87..ab33045 100644
--- a/org/eclipse/swt/widgets/Scrollable.java
+++ b/org/eclipse/swt/widgets/Scrollable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ import org.eclipse.swt.graphics.*;
* </p>
*
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public abstract class Scrollable extends Control {
int /*long*/ scrolledHandle;
diff --git a/org/eclipse/swt/widgets/Shell.java b/org/eclipse/swt/widgets/Shell.java
index c719609..9e3a131 100644
--- a/org/eclipse/swt/widgets/Shell.java
+++ b/org/eclipse/swt/widgets/Shell.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -81,7 +81,7 @@ import org.eclipse.swt.events.*;
* downgraded to <code>APPLICATION_MODAL</code>.
* <dl>
* <dt><b>Styles:</b></dt>
- * <dd>BORDER, CLOSE, MIN, MAX, NO_TRIM, RESIZE, TITLE, ON_TOP, TOOL</dd>
+ * <dd>BORDER, CLOSE, MIN, MAX, NO_TRIM, RESIZE, TITLE, ON_TOP, TOOL, SHEET</dd>
* <dd>APPLICATION_MODAL, MODELESS, PRIMARY_MODAL, SYSTEM_MODAL</dd>
* <dt><b>Events:</b></dt>
* <dd>Activate, Close, Deactivate, Deiconify, Iconify</dd>
@@ -118,10 +118,11 @@ import org.eclipse.swt.events.*;
*/
public class Shell extends Decorations {
int /*long*/ shellHandle, tooltipsHandle, tooltipWindow, group, modalGroup;
- boolean mapped, moved, resized, opened, fullScreen, showWithParent;
+ boolean mapped, moved, resized, opened, fullScreen, showWithParent, modified, center;
int oldX, oldY, oldWidth, oldHeight;
int minWidth, minHeight;
Control lastActive;
+ ToolTip [] toolTips;
static final int MAXIMUM_TRIM = 128;
@@ -164,13 +165,16 @@ public Shell () {
* @see SWT#MAX
* @see SWT#RESIZE
* @see SWT#TITLE
+ * @see SWT#TOOL
* @see SWT#NO_TRIM
* @see SWT#SHELL_TRIM
* @see SWT#DIALOG_TRIM
+ * @see SWT#ON_TOP
* @see SWT#MODELESS
* @see SWT#PRIMARY_MODAL
* @see SWT#APPLICATION_MODAL
* @see SWT#SYSTEM_MODAL
+ * @see SWT#SHEET
*/
public Shell (int style) {
this ((Display) null, style);
@@ -233,13 +237,16 @@ public Shell (Display display) {
* @see SWT#MAX
* @see SWT#RESIZE
* @see SWT#TITLE
+ * @see SWT#TOOL
* @see SWT#NO_TRIM
* @see SWT#SHELL_TRIM
* @see SWT#DIALOG_TRIM
+ * @see SWT#ON_TOP
* @see SWT#MODELESS
* @see SWT#PRIMARY_MODAL
* @see SWT#APPLICATION_MODAL
* @see SWT#SYSTEM_MODAL
+ * @see SWT#SHEET
*/
public Shell (Display display, int style) {
this (display, null, style, 0, false);
@@ -256,7 +263,8 @@ Shell (Display display, Shell parent, int style, int /*long*/ handle, boolean em
if (parent != null && parent.isDisposed ()) {
error (SWT.ERROR_INVALID_ARGUMENT);
}
- this.style = checkStyle (style);
+ this.center = parent != null && (style & SWT.SHEET) != 0;
+ this.style = checkStyle (parent, style);
this.parent = parent;
this.display = display;
if (handle != 0) {
@@ -342,6 +350,7 @@ public Shell (Shell parent) {
* @see SWT#PRIMARY_MODAL
* @see SWT#APPLICATION_MODAL
* @see SWT#SYSTEM_MODAL
+ * @see SWT#SHEET
*/
public Shell (Shell parent, int style) {
this (parent != null ? parent.display : null, parent, style, 0, false);
@@ -372,11 +381,18 @@ public static Shell internal_new (Display display, int /*long*/ handle) {
return new Shell (display, null, SWT.NO_TRIM, handle, false);
}
-static int checkStyle (int style) {
+static int checkStyle (Shell parent, int style) {
style = Decorations.checkStyle (style);
style &= ~SWT.TRANSPARENT;
if ((style & SWT.ON_TOP) != 0) style &= ~SWT.SHELL_TRIM;
int mask = SWT.SYSTEM_MODAL | SWT.APPLICATION_MODAL | SWT.PRIMARY_MODAL;
+ if ((style & SWT.SHEET) != 0) {
+ style &= ~SWT.SHEET;
+ style |= parent == null ? SWT.SHELL_TRIM : SWT.DIALOG_TRIM;
+ if ((style & mask) == 0) {
+ style |= parent == null ? SWT.APPLICATION_MODAL : SWT.PRIMARY_MODAL;
+ }
+ }
int bits = style & ~mask;
if ((style & SWT.SYSTEM_MODAL) != 0) return bits | SWT.SYSTEM_MODAL;
if ((style & SWT.APPLICATION_MODAL) != 0) return bits | SWT.APPLICATION_MODAL;
@@ -414,6 +430,20 @@ public void addShellListener (ShellListener listener) {
addListener (SWT.Deactivate, typedListener);
}
+void addToolTip (ToolTip toolTip) {
+ if (toolTips == null) toolTips = new ToolTip [4];
+ for (int i=0; i<toolTips.length; i++) {
+ if (toolTips [i] == null) {
+ toolTips [i] = toolTip;
+ return;
+ }
+ }
+ ToolTip [] newToolTips = new ToolTip [toolTips.length + 4];
+ newToolTips [toolTips.length] = toolTip;
+ System.arraycopy (toolTips, 0, newToolTips, 0, toolTips.length);
+ toolTips = newToolTips;
+}
+
void adjustTrim () {
if (display.ignoreTrim) return;
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
@@ -526,6 +556,26 @@ void bringToTop (boolean force) {
display.activePending = true;
}
+void center () {
+ if (parent == null) return;
+ Rectangle rect = getBounds ();
+ Rectangle parentRect = display.map (parent, null, parent.getClientArea());
+ int x = Math.max (parentRect.x, parentRect.x + (parentRect.width - rect.width) / 2);
+ int y = Math.max (parentRect.y, parentRect.y + (parentRect.height - rect.height) / 2);
+ Rectangle monitorRect = parent.getMonitor ().getClientArea();
+ if (x + rect.width > monitorRect.x + monitorRect.width) {
+ x = Math.max (monitorRect.x, monitorRect.x + monitorRect.width - rect.width);
+ } else {
+ x = Math.max (x, monitorRect.x);
+ }
+ if (y + rect.height > monitorRect.y + monitorRect.height) {
+ y = Math.max (monitorRect.y, monitorRect.y + monitorRect.height - rect.height);
+ } else {
+ y = Math.max (y, monitorRect.y);
+ }
+ setLocation (x, y);
+}
+
void checkBorder () {
/* Do nothing */
}
@@ -907,6 +957,22 @@ Shell getModalShell () {
return null;
}
+/**
+ * Gets the receiver's modified state.
+ *
+ * </ul>
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public boolean getModified () {
+ checkWidget ();
+ return modified;
+}
+
public Point getSize () {
checkWidget ();
int width = OS.GTK_WIDGET_WIDTH (vboxHandle);
@@ -1184,6 +1250,16 @@ public void removeShellListener (ShellListener listener) {
eventTable.unhook (SWT.Deactivate, listener);
}
+void removeTooTip (ToolTip toolTip) {
+ if (toolTips == null) return;
+ for (int i=0; i<toolTips.length; i++) {
+ if (toolTips [i] == toolTip) {
+ toolTips [i] = null;
+ return;
+ }
+ }
+}
+
/**
* If the receiver is visible, moves it to the top of the
* drawing order for the display on which it was created
@@ -1418,7 +1494,7 @@ public void setEnabled (boolean enabled) {
* to switch to the full screen state, and if the argument is
* <code>false</code> and the receiver was previously switched
* into full screen state, causes the receiver to switch back
- * to either the maximmized or normal states.
+ * to either the maximized or normal states.
* <p>
* Note: The result of intermixing calls to <code>setFullScreen(true)</code>,
* <code>setMaximized(true)</code> and <code>setMinimized(true)</code> will
@@ -1470,10 +1546,18 @@ public void setImeInputMode (int mode) {
void setInitialBounds () {
if ((state & FOREIGN_HANDLE) != 0) return;
- Monitor monitor = getMonitor ();
- Rectangle rect = monitor.getClientArea ();
- int width = rect.width * 5 / 8;
- int height = rect.height * 5 / 8;
+ int width = OS.gdk_screen_width () * 5 / 8;
+ int height = OS.gdk_screen_height () * 5 / 8;
+ int /*long*/ screen = OS.gdk_screen_get_default ();
+ if (screen != 0) {
+ if (OS.gdk_screen_get_n_monitors (screen) > 1) {
+ int monitorNumber = OS.gdk_screen_get_monitor_at_window (screen, paintWindow ());
+ GdkRectangle dest = new GdkRectangle ();
+ OS.gdk_screen_get_monitor_geometry (screen, monitorNumber, dest);
+ width = dest.width * 5 / 8;
+ height = dest.height * 5 / 8;
+ }
+ }
if ((style & SWT.RESIZE) != 0) {
OS.gtk_window_resize (shellHandle, width, height);
}
@@ -1574,6 +1658,24 @@ public void setMinimumSize (Point size) {
}
/**
+ * Sets the receiver's modified state as specified by the argument.
+ *
+ * @param modified the new modified state for the receiver
+ *
+ * </ul>
+ * @exception SWTException <ul>
+ * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.5
+ */
+public void setModified (boolean modified) {
+ checkWidget ();
+ this.modified = modified;
+}
+
+/**
* Sets the shape of the shell to the region specified
* by the argument. When the argument is null, the
* default shape of the shell is restored. The shell
@@ -1640,6 +1742,10 @@ public void setVisible (boolean visible) {
showWithParent = visible;
if ((OS.GTK_WIDGET_MAPPED (shellHandle) == visible)) return;
if (visible) {
+ if (center && !moved) {
+ center ();
+ if (isDisposed ()) return;
+ }
sendEvent (SWT.Show);
if (isDisposed ()) return;
@@ -1945,6 +2051,15 @@ void releaseChildren (boolean destroy) {
shell.release (false);
}
}
+ if (toolTips != null) {
+ for (int i=0; i<toolTips.length; i++) {
+ ToolTip toolTip = toolTips [i];
+ if (toolTip != null && !toolTip.isDisposed ()) {
+ toolTip.dispose ();
+ }
+ }
+ toolTips = null;
+ }
super.releaseChildren (destroy);
}
diff --git a/org/eclipse/swt/widgets/Slider.java b/org/eclipse/swt/widgets/Slider.java
index 27e9e36..61d636b 100644
--- a/org/eclipse/swt/widgets/Slider.java
+++ b/org/eclipse/swt/widgets/Slider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -66,6 +66,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#slider">Slider snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Slider extends Control {
int detail;
diff --git a/org/eclipse/swt/widgets/Spinner.java b/org/eclipse/swt/widgets/Spinner.java
index c6c86b7..b08c147 100644
--- a/org/eclipse/swt/widgets/Spinner.java
+++ b/org/eclipse/swt/widgets/Spinner.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,9 +40,9 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Spinner extends Composite {
- static final int INNER_BORDER = 2;
static final int MIN_ARROW_WIDTH = 6;
int lastEventTime = 0;
int /*long*/ gdkEventKey = 0;
@@ -244,8 +244,6 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
}
- xborder += INNER_BORDER;
- yborder += INNER_BORDER;
int [] property = new int [1];
OS.gtk_widget_style_get (handle, OS.interior_focus, property, 0);
if (property [0] == 0) {
@@ -263,6 +261,11 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
trim.width += 2 * xborder;
trim.height += 2 * yborder;
trim.width += arrowSize + (2 * OS.gtk_style_get_xthickness (style));
+ GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
+ trim.x -= innerBorder.left;
+ trim.y -= innerBorder.top;
+ trim.width += innerBorder.left + innerBorder.right;
+ trim.height += innerBorder.top + innerBorder.bottom;
return new Rectangle (trim.x, trim.y, trim.width, trim.height);
}
@@ -1125,6 +1128,10 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
}
+boolean checkSubwindow () {
+ return false;
+}
+
boolean translateTraversal (GdkEventKey keyEvent) {
int key = keyEvent.keyval;
switch (key) {
diff --git a/org/eclipse/swt/widgets/Synchronizer.java b/org/eclipse/swt/widgets/Synchronizer.java
index 52ba0ad..5bcf914 100644
--- a/org/eclipse/swt/widgets/Synchronizer.java
+++ b/org/eclipse/swt/widgets/Synchronizer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@ public class Synchronizer {
//TEMPORARY CODE
static final boolean IS_CARBON = "carbon".equals (SWT.getPlatform ());
+ static final boolean IS_GTK = "gtk".equals (SWT.getPlatform ());
/**
* Constructs a new instance of this class.
@@ -83,7 +84,7 @@ void addLast (RunnableLock lock) {
protected void asyncExec (Runnable runnable) {
if (runnable == null) {
//TEMPORARY CODE
- if (!IS_CARBON) {
+ if (!(IS_CARBON || IS_GTK)) {
display.wake ();
return;
}
diff --git a/org/eclipse/swt/widgets/TabFolder.java b/org/eclipse/swt/widgets/TabFolder.java
index 4a19e9e..68ddc4b 100644
--- a/org/eclipse/swt/widgets/TabFolder.java
+++ b/org/eclipse/swt/widgets/TabFolder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#tabfolder">TabFolder, TabItem snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TabFolder extends Composite {
TabItem [] items;
@@ -74,6 +75,8 @@ public class TabFolder extends Composite {
* </ul>
*
* @see SWT
+ * @see SWT#TOP
+ * @see SWT#BOTTOM
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
diff --git a/org/eclipse/swt/widgets/TabItem.java b/org/eclipse/swt/widgets/TabItem.java
index 4742154..a19d175 100644
--- a/org/eclipse/swt/widgets/TabItem.java
+++ b/org/eclipse/swt/widgets/TabItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@ import org.eclipse.swt.graphics.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#tabfolder">TabFolder, TabItem snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TabItem extends Item {
int /*long*/ labelHandle, imageHandle, pageHandle;
@@ -262,10 +263,16 @@ public void setControl (Control control) {
}
Control oldControl = this.control, newControl = control;
this.control = control;
- int index = parent.indexOf (this);
- if (index != parent.getSelectionIndex ()) {
- if (newControl != null) newControl.setVisible (false);
- return;
+ int index = parent.indexOf (this), selectionIndex = parent.getSelectionIndex();
+ if (index != selectionIndex) {
+ if (newControl != null) {
+ if (selectionIndex != -1) {
+ Control selectedControl = parent.getItem(selectionIndex).getControl();
+ if (selectedControl == newControl) return;
+ }
+ newControl.setVisible(false);
+ return;
+ }
}
if (newControl != null) {
newControl.setBounds (parent.getClientArea ());
@@ -357,8 +364,17 @@ public void setText (String string) {
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
- *
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
+ * <p>
+ * The mnemonic indicator (character '&') is not displayed in a tool tip.
+ * To display a single '&' in the tool tip, the character '&' can be
+ * escaped by doubling it in the string.
+ * </p>
+ *
* @param string the new tool tip text (or null)
*
* @exception SWTException <ul>
diff --git a/org/eclipse/swt/widgets/Table.java b/org/eclipse/swt/widgets/Table.java
index f9ecdb6..451650d 100644
--- a/org/eclipse/swt/widgets/Table.java
+++ b/org/eclipse/swt/widgets/Table.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -65,6 +65,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#table">Table, TableItem, TableColumn snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Table extends Composite {
int /*long*/ modelHandle, checkRenderer;
@@ -78,7 +79,7 @@ public class Table extends Composite {
boolean firstCustomDraw;
int drawState, drawFlags;
GdkColor drawForeground;
- boolean ownerDraw, ignoreSize;
+ boolean ownerDraw, ignoreSize, ignoreAccessibility;
static final int CHECKED_COLUMN = 0;
static final int GRAYED_COLUMN = 1;
@@ -359,6 +360,10 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter) {
temp = OS.g_list_next (temp);
}
OS.g_list_free (list);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0) && OS.gtk_tree_view_get_rules_hint (handle)) {
+ OS.gtk_widget_style_get (handle, OS.grid_line_width, w, 0) ;
+ width += 2 * w [0];
+ }
return width;
}
@@ -709,12 +714,21 @@ void createItem (TableColumn column, int index) {
}
}
}
+ /*
+ * Feature in GTK. The tree view does not resize immediately if a table
+ * column is created when the table is not visible. If the width of the
+ * new column is queried, GTK returns an incorrect value. The fix is to
+ * ensure that the columns are resized before any queries.
+ */
+ if(!isVisible ()) {
+ OS.gtk_container_resize_children (handle);
+ }
}
void createItem (TableItem item, int index) {
if (!(0 <= index && index <= itemCount)) error (SWT.ERROR_INVALID_RANGE);
if (itemCount == items.length) {
- int length = drawCount == 0 ? items.length + 4 : Math.max (4, items.length * 3 / 2);
+ int length = drawCount <= 0 ? items.length + 4 : Math.max (4, items.length * 3 / 2);
TableItem [] newItems = new TableItem [length];
System.arraycopy (items, 0, newItems, 0, items.length);
items = newItems;
@@ -844,6 +858,7 @@ void deregister () {
super.deregister ();
display.removeWidget (OS.gtk_tree_view_get_selection (handle));
if (checkRenderer != 0) display.removeWidget (checkRenderer);
+ display.removeWidget (modelHandle);
}
/**
@@ -1093,6 +1108,21 @@ int /*long*/ eventWindow () {
return paintWindow ();
}
+boolean fixAccessibility () {
+ /*
+ * Bug in GTK. With GTK 2.12, when assistive technologies is on, the time
+ * it takes to add or remove several rows to the model is very long. This
+ * happens because the accessible object asks each row for its data, including
+ * the rows that are not visible. The the fix is to block the accessible object
+ * from receiving row_added and row_removed signals and, at the end, send only
+ * a notify signal with the "model" detail.
+ *
+ * Note: The test bellow has to be updated when the real problem is fixed in
+ * the accessible object.
+ */
+ return OS.GTK_VERSION >= OS.VERSION (2, 12, 0);
+}
+
void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, Decorations oldDecorations, Menu [] menus) {
super.fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
for (int i=0; i<columnCount; i++) {
@@ -1526,7 +1556,8 @@ public TableItem [] getItems () {
/**
* Returns <code>true</code> if the receiver's lines are visible,
- * and <code>false</code> otherwise.
+ * and <code>false</code> otherwise. Note that some platforms draw
+ * grid lines while others may draw alternating row colors.
* <p>
* If one of the receiver's ancestors is not visible or some
* other condition makes the receiver not visible, this method
@@ -1962,6 +1993,20 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
return 0;
}
+int gtk_row_deleted (int model, int path) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_deleted);
+ }
+ return 0;
+}
+
+int gtk_row_inserted (int model, int path, int iter) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_inserted);
+ }
+ return 0;
+}
+
int /*long*/ gtk_toggled (int /*long*/ renderer, int /*long*/ pathStr) {
int /*long*/ path = OS.gtk_tree_path_new_from_string (pathStr);
if (path == 0) return 0;
@@ -2026,6 +2071,10 @@ void hookEvents () {
if (checkRenderer != 0) {
OS.g_signal_connect_closure (checkRenderer, OS.toggled, display.closures [TOGGLED], false);
}
+ if (fixAccessibility ()) {
+ OS.g_signal_connect_closure (modelHandle, OS.row_inserted, display.closures [ROW_INSERTED], true);
+ OS.g_signal_connect_closure (modelHandle, OS.row_deleted, display.closures [ROW_DELETED], true);
+ }
}
/**
@@ -2166,6 +2215,7 @@ void register () {
super.register ();
display.addWidget (OS.gtk_tree_view_get_selection (handle), this);
if (checkRenderer != 0) display.addWidget (checkRenderer, this);
+ display.addWidget (modelHandle, this);
}
void releaseChildren (boolean destroy) {
@@ -2266,17 +2316,26 @@ public void remove (int start, int end) {
}
int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, start);
- int index = start;
- while (index <= end) {
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
+ int index = end;
+ while (index >= start) {
+ OS.gtk_tree_model_iter_nth_child (modelHandle, iter, 0, index);
TableItem item = items [index];
if (item != null && !item.isDisposed ()) item.release (false);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
OS.gtk_list_store_remove (modelHandle, iter);
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
- index++;
+ index--;
+ }
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
}
OS.g_free (iter);
+ index = end + 1;
System.arraycopy (items, index, items, start, itemCount - index);
for (int i=itemCount-(index-start); i<itemCount; i++) items [i] = null;
itemCount = itemCount - (index - start);
@@ -2311,6 +2370,10 @@ public void remove (int [] indices) {
int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
int last = -1;
int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
for (int i=0; i<newIndices.length; i++) {
int index = newIndices [i];
if (index != last) {
@@ -2335,6 +2398,10 @@ public void remove (int [] indices) {
last = index;
}
}
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
+ }
OS.g_free (iter);
}
@@ -2358,7 +2425,14 @@ public void removeAll () {
itemCount = 0;
int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
OS.gtk_list_store_clear (modelHandle);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
+ }
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
resetCustomDraw ();
@@ -2944,9 +3018,16 @@ public void setItemCount (int count) {
if (isVirtual) {
int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
for (int i=itemCount; i<count; i++) {
OS.gtk_list_store_append (modelHandle, iter);
}
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
+ }
OS.g_free (iter);
itemCount = count;
} else {
@@ -2959,7 +3040,8 @@ public void setItemCount (int count) {
/**
* Marks the receiver's lines as visible if the argument is <code>true</code>,
- * and marks it invisible otherwise.
+ * and marks it invisible otherwise. Note that some platforms draw grid lines
+ * while others may draw alternating row colors.
* <p>
* If one of the receiver's ancestors is not visible or some
* other condition makes the receiver not visible, marking
@@ -2976,6 +3058,9 @@ public void setItemCount (int count) {
public void setLinesVisible (boolean show) {
checkWidget();
OS.gtk_tree_view_set_rules_hint (handle, show);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
+ OS.gtk_tree_view_set_grid_lines (handle, show ? OS.GTK_TREE_VIEW_GRID_LINES_VERTICAL : OS.GTK_TREE_VIEW_GRID_LINES_NONE);
+ }
}
void setParentBackground () {
diff --git a/org/eclipse/swt/widgets/TableColumn.java b/org/eclipse/swt/widgets/TableColumn.java
index 5eacbd5..4a62dfe 100644
--- a/org/eclipse/swt/widgets/TableColumn.java
+++ b/org/eclipse/swt/widgets/TableColumn.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ import org.eclipse.swt.events.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#table">Table, TableItem, TableColumn snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TableColumn extends Item {
int /*long*/ labelHandle, imageHandle, buttonHandle;
@@ -365,6 +366,22 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
return 0;
}
+int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ switch (event.type) {
+ case OS.GDK_BUTTON_PRESS: {
+ GdkEventButton gdkEventButton = new GdkEventButton ();
+ OS.memmove (gdkEventButton, gdkEvent, GdkEventButton.sizeof);
+ if (gdkEventButton.button == 3) {
+ parent.showMenu ((int) gdkEventButton.x_root, (int) gdkEventButton.y_root);
+ }
+ break;
+ }
+ }
+ return 0;
+}
+
int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
return parent.gtk_mnemonic_activate (widget, arg1);
}
@@ -387,7 +404,10 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
void hookEvents () {
super.hookEvents ();
OS.g_signal_connect_closure (handle, OS.clicked, display.closures [CLICKED], false);
- if (buttonHandle != 0) OS.g_signal_connect_closure_by_id (buttonHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
+ if (buttonHandle != 0) {
+ OS.g_signal_connect_closure_by_id (buttonHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
+ OS.g_signal_connect_closure_by_id (buttonHandle, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
+ }
if (labelHandle != 0) OS.g_signal_connect_closure_by_id (labelHandle, display.signalIds [MNEMONIC_ACTIVATE], 0, display.closures [MNEMONIC_ACTIVATE], false);
}
@@ -619,8 +639,17 @@ public void setText (String string) {
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
- *
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
+ * <p>
+ * The mnemonic indicator (character '&') is not displayed in a tool tip.
+ * To display a single '&' in the tool tip, the character '&' can be
+ * escaped by doubling it in the string.
+ * </p>
+ *
* @param string the new tool tip text (or null)
*
* @exception SWTException <ul>
diff --git a/org/eclipse/swt/widgets/TableItem.java b/org/eclipse/swt/widgets/TableItem.java
index fef1590..f348437 100644
--- a/org/eclipse/swt/widgets/TableItem.java
+++ b/org/eclipse/swt/widgets/TableItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@ import org.eclipse.swt.graphics.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#table">Table, TableItem, TableColumn snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TableItem extends Item {
Table parent;
diff --git a/org/eclipse/swt/widgets/Text.java b/org/eclipse/swt/widgets/Text.java
index d0615c0..0973f06 100644
--- a/org/eclipse/swt/widgets/Text.java
+++ b/org/eclipse/swt/widgets/Text.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -30,20 +30,30 @@ import org.eclipse.swt.events.*;
* <p>
* <dl>
* <dt><b>Styles:</b></dt>
- * <dd>CANCEL, CENTER, LEFT, MULTI, PASSWORD, SEARCH, SINGLE, RIGHT, READ_ONLY, WRAP</dd>
+ * <dd>CENTER, ICON_CANCEL, ICON_SEARCH, LEFT, MULTI, PASSWORD, SEARCH, SINGLE, RIGHT, READ_ONLY, WRAP</dd>
* <dt><b>Events:</b></dt>
* <dd>DefaultSelection, Modify, Verify</dd>
* </dl>
* <p>
* Note: Only one of the styles MULTI and SINGLE may be specified,
* and only one of the styles LEFT, CENTER, and RIGHT may be specified.
- * </p><p>
+ * </p>
+ * <p>
+ * Note: The styles ICON_CANCEL and ICON_SEARCH are hints used in combination with SEARCH.
+ * When the platform supports the hint, the text control shows these icons. When an icon
+ * is selected, a default selection event is sent with the detail field set to one of
+ * ICON_CANCEL or ICON_SEARCH. Normally, application code does not need to check the
+ * detail. In the case of ICON_CANCEL, the text is cleared before the default selection
+ * event is sent causing the application to search for an empty string.
+ * </p>
+ * <p>
* IMPORTANT: This class is <em>not</em> intended to be subclassed.
* </p>
*
* @see <a href="http://www.eclipse.org/swt/snippets/#text">Text snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Text extends Scrollable {
int /*long*/ bufferHandle;
@@ -53,8 +63,8 @@ public class Text extends Scrollable {
boolean doubleClick;
String message = "";
- static final int INNER_BORDER = 2;
static final int ITER_SIZEOF = OS.GtkTextIter_sizeof();
+ static final int SPACE_FOR_CURSOR = 1;
/**
* The maximum number of characters that can be entered
@@ -109,6 +119,13 @@ public class Text extends Scrollable {
* @see SWT#MULTI
* @see SWT#READ_ONLY
* @see SWT#WRAP
+ * @see SWT#LEFT
+ * @see SWT#RIGHT
+ * @see SWT#CENTER
+ * @see SWT#PASSWORD
+ * @see SWT#SEARCH
+ * @see SWT#ICON_SEARCH
+ * @see SWT#ICON_CANCEL
* @see Widget#checkSubclass
* @see Widget#getStyle
*/
@@ -120,8 +137,12 @@ static int checkStyle (int style) {
if ((style & SWT.SEARCH) != 0) {
style |= SWT.SINGLE | SWT.BORDER;
style &= ~SWT.PASSWORD;
+ /*
+ * NOTE: ICON_CANCEL has the same value as H_SCROLL and
+ * ICON_SEARCH has the same value as V_SCROLL so they are
+ * cleared because SWT.SINGLE is set.
+ */
}
- style &= ~SWT.SEARCH;
if ((style & SWT.SINGLE) != 0 && (style & SWT.MULTI) != 0) {
style &= ~SWT.MULTI;
}
@@ -139,6 +160,11 @@ static int checkStyle (int style) {
void createHandle (int index) {
state |= HANDLE | MENU;
+ if ((style & SWT.READ_ONLY) != 0) {
+ if ((style & (SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL)) == 0) {
+ state |= THEME_BACKGROUND;
+ }
+ }
fixedHandle = OS.g_object_new (display.gtk_fixed_get_type (), 0);
if (fixedHandle == 0) error (SWT.ERROR_NO_HANDLES);
OS.gtk_fixed_set_has_window (fixedHandle, true);
@@ -165,7 +191,7 @@ void createHandle (int index) {
OS.gtk_container_add (fixedHandle, scrolledHandle);
OS.gtk_container_add (scrolledHandle, handle);
OS.gtk_text_view_set_editable (handle, (style & SWT.READ_ONLY) == 0);
- if ((style & SWT.WRAP) != 0) OS.gtk_text_view_set_wrap_mode (handle, OS.GTK_WRAP_WORD_CHAR);
+ if ((style & SWT.WRAP) != 0) OS.gtk_text_view_set_wrap_mode (handle, OS.GTK_VERSION < OS.VERSION (2, 4, 0) ? OS.GTK_WRAP_WORD : OS.GTK_WRAP_WORD_CHAR);
int hsp = (style & SWT.H_SCROLL) != 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
int vsp = (style & SWT.V_SCROLL) != 0 ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER;
OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
@@ -348,13 +374,13 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
}
int width = OS.PANGO_PIXELS (w [0]);
int height = OS.PANGO_PIXELS (h [0]);
- //This code is intentionally commented
-// if ((style & SWT.SEARCH) != 0 && message.length () != 0) {
-// GC gc = new GC (this);
-// Point size = gc.stringExtent (message);
-// width = Math.max (width, size.x);
-// gc.dispose ();
-// }
+ if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
+ int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+ OS.pango_layout_get_size (layout, w, h);
+ OS.g_object_unref (layout);
+ width = Math.max (width, OS.PANGO_PIXELS (w [0]));
+ }
if (width == 0) width = DEFAULT_WIDTH;
if (height == 0) height = DEFAULT_HEIGHT;
width = wHint == SWT.DEFAULT ? width : wHint;
@@ -373,8 +399,11 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
xborder += OS.gtk_style_get_xthickness (style);
yborder += OS.gtk_style_get_ythickness (style);
}
- xborder += INNER_BORDER;
- yborder += INNER_BORDER;
+ GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
+ trim.x -= innerBorder.left;
+ trim.y -= innerBorder.top;
+ trim.width += innerBorder.left + innerBorder.right;
+ trim.height += innerBorder.top + innerBorder.bottom;
} else {
int borderWidth = OS.gtk_container_get_border_width (handle);
xborder += borderWidth;
@@ -391,6 +420,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
trim.y -= yborder;
trim.width += 2 * xborder;
trim.height += 2 * yborder;
+ trim.width += SPACE_FOR_CURSOR;
return new Rectangle (trim.x, trim.y, trim.width, trim.height);
}
@@ -555,7 +585,7 @@ public int getBorderWidth () {
*/
public int getCaretLineNumber () {
checkWidget ();
- if ((style & SWT.SINGLE) != 0) return 1;
+ if ((style & SWT.SINGLE) != 0) return 0;
byte [] position = new byte [ITER_SIZEOF];
int /*long*/ mark = OS.gtk_text_buffer_get_insert (bufferHandle);
OS.gtk_text_buffer_get_iter_at_mark (bufferHandle, position, mark);
@@ -764,13 +794,10 @@ public int getLineHeight () {
}
/**
- * Returns the widget message. When the widget is created
- * with the style <code>SWT.SEARCH</code>, the message text
- * is displayed as a hint for the user, indicating the
- * purpose of the field.
+ * Returns the widget message. The message text is displayed
+ * as a hint for the user, indicating the purpose of the field.
* <p>
- * Note: This operation is a <em>HINT</em> and is not
- * supported on platforms that do not have this concept.
+ * Typically this is used in conjunction with <code>SWT.SEARCH</code>.
* </p>
*
* @return the widget message
@@ -972,13 +999,15 @@ public String getText () {
public String getText (int start, int end) {
checkWidget ();
if (!(start <= end && 0 <= end)) return "";
- start = Math.max (0, start);
int /*long*/ address;
if ((style & SWT.SINGLE) != 0) {
+ start = Math.max (0, start);
address = OS.gtk_editable_get_chars (handle, start, end + 1);
} else {
int length = OS.gtk_text_buffer_get_char_count (bufferHandle);
end = Math.min (end, length - 1);
+ if (start > end) return "";
+ start = Math.max (0, start);
byte [] startIter = new byte [ITER_SIZEOF];
byte [] endIter = new byte [ITER_SIZEOF];
OS.gtk_text_buffer_get_iter_at_offset (bufferHandle, startIter, start);
@@ -1251,6 +1280,65 @@ int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
return super.gtk_event_after (widget, gdkEvent);
}
+int /*long*/ gtk_expose_event (int /*long*/ widget, int /*long*/ event) {
+ if ((state & OBSCURED) != 0) return 0;
+ int /*long*/ result = super.gtk_expose_event (widget, event);
+ if ((style & SWT.SINGLE) != 0 && message.length () > 0) {
+ int /*long*/ str = OS.gtk_entry_get_text (handle);
+ if (!OS.GTK_WIDGET_HAS_FOCUS (handle) && OS.strlen (str) == 0) {
+ GdkEventExpose gdkEvent = new GdkEventExpose ();
+ OS.memmove (gdkEvent, event, GdkEventExpose.sizeof);
+ int /*long*/ window = paintWindow ();
+ int [] w = new int [1], h = new int [1];
+ OS.gdk_drawable_get_size (window, w, h);
+ GtkBorder innerBorder = Display.getEntryInnerBorder (handle);
+ int width = w [0] - innerBorder.left - innerBorder.right;
+ int height = h [0] - innerBorder.top - innerBorder.bottom;
+ int /*long*/ context = OS.gtk_widget_get_pango_context (handle);
+ int /*long*/ lang = OS.pango_context_get_language (context);
+ int /*long*/ metrics = OS.pango_context_get_metrics (context, getFontDescription (), lang);
+ int ascent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_ascent (metrics));
+ int descent = OS.PANGO_PIXELS (OS.pango_font_metrics_get_descent (metrics));
+ OS.pango_font_metrics_unref (metrics);
+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
+ int /*long*/ layout = OS.gtk_widget_create_pango_layout (handle, buffer);
+ int /*long*/ line = OS.pango_layout_get_line (layout, 0);
+ PangoRectangle rect = new PangoRectangle ();
+ OS.pango_layout_line_get_extents (line, null, rect);
+ rect.y = OS.PANGO_PIXELS (rect.y);
+ rect.height = OS.PANGO_PIXELS (rect.height);
+ rect.width = OS.PANGO_PIXELS (rect.width);
+ int y = (height - ascent - descent) / 2 + ascent + rect.y;
+ if (rect.height > height) {
+ y = (height - rect.height) / 2;
+ } else if (y < 0) {
+ y = 0;
+ } else if (y + rect.height > height) {
+ y = height - rect.height;
+ }
+ y += innerBorder.top;
+ int x = innerBorder.left;
+ boolean rtl = (style & SWT.RIGHT_TO_LEFT) != 0;
+ int alignment = style & (SWT.LEFT | SWT.CENTER | SWT.RIGHT);
+ switch (alignment) {
+ case SWT.LEFT: x = rtl ? width - rect.width: innerBorder.left; break;
+ case SWT.CENTER: x = (width - rect.width) / 2; break;
+ case SWT.RIGHT: x = rtl ? innerBorder.left : width - rect.width; break;
+ }
+ int /*long*/ gc = OS.gdk_gc_new (window);
+ int /*long*/ style = OS.gtk_widget_get_style (handle);
+ GdkColor textColor = new GdkColor ();
+ OS.gtk_style_get_text (style, OS.GTK_STATE_INSENSITIVE, textColor);
+ GdkColor baseColor = new GdkColor ();
+ OS.gtk_style_get_base (style, OS.GTK_STATE_NORMAL, baseColor);
+ OS.gdk_draw_layout_with_colors (window, gc, x, y, layout, textColor, baseColor);
+ OS.g_object_unref (gc);
+ OS.g_object_unref (layout);
+ }
+ }
+ return result;
+}
+
int /*long*/ gtk_focus_out_event (int /*long*/ widget, int /*long*/ event) {
fixIM ();
return super.gtk_focus_out_event (widget, event);
@@ -1682,13 +1770,10 @@ void setFontDescription (int /*long*/ font) {
}
/**
- * Sets the widget message. When the widget is created
- * with the style <code>SWT.SEARCH</code>, the message text
- * is displayed as a hint for the user, indicating the
- * purpose of the field.
+ * Sets the widget message. The message text is displayed
+ * as a hint for the user, indicating the purpose of the field.
* <p>
- * Note: This operation is a <em>HINT</em> and is not
- * supported on platforms that do not have this concept.
+ * Typically this is used in conjunction with <code>SWT.SEARCH</code>.
* </p>
*
* @param message the new message
@@ -1707,6 +1792,7 @@ public void setMessage (String message) {
checkWidget ();
if (message == null) error (SWT.ERROR_NULL_ARGUMENT);
this.message = message;
+ redraw (false);
}
/**
diff --git a/org/eclipse/swt/widgets/ToolBar.java b/org/eclipse/swt/widgets/ToolBar.java
index fd8b8ce..2d7306e 100644
--- a/org/eclipse/swt/widgets/ToolBar.java
+++ b/org/eclipse/swt/widgets/ToolBar.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,9 +42,11 @@ import org.eclipse.swt.graphics.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#toolbar">ToolBar, ToolItem snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ToolBar extends Composite {
ToolItem lastFocus;
+ ToolItem [] tabItemList;
ImageList imageList;
/**
@@ -142,6 +144,50 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
return computeNativeSize (handle, wHint, hHint, changed);
}
+Widget computeTabGroup () {
+ ToolItem [] items = _getItems ();
+ if (tabItemList == null) {
+ int i = 0;
+ while (i < items.length && items [i].control == null) i++;
+ if (i == items.length) return super.computeTabGroup ();
+ }
+ int index = 0;
+ while (index < items.length) {
+ if (items[index].hasFocus ()) break;
+ index++;
+ }
+ while (index >= 0) {
+ ToolItem item = items [index];
+ if (item.isTabGroup ()) return item;
+ index--;
+ }
+ return super.computeTabGroup ();
+}
+
+Widget [] computeTabList () {
+ ToolItem [] items = _getItems ();
+ if (tabItemList == null) {
+ int i = 0;
+ while (i < items.length && items [i].control == null) i++;
+ if (i == items.length) return super.computeTabList ();
+ }
+ Widget result [] = {};
+ if (!isTabGroup () || !isEnabled () || !isVisible ()) return result;
+ ToolItem [] list = tabList != null ? _getTabItemList () : items;
+ for (int i=0; i<list.length; i++) {
+ ToolItem child = list [i];
+ Widget [] childList = child.computeTabList ();
+ if (childList.length != 0) {
+ Widget [] newResult = new Widget [result.length + childList.length];
+ System.arraycopy (result, 0, newResult, 0, result.length);
+ System.arraycopy (childList, 0, newResult, result.length, childList.length);
+ result = newResult;
+ }
+ }
+ if (result.length == 0) result = new Widget [] {this};
+ return result;
+}
+
int /*long*/ eventHandle () {
return fixedHandle;
}
@@ -258,17 +304,27 @@ public int getItemCount () {
*/
public ToolItem [] getItems () {
checkWidget();
+ return _getItems ();
+}
+
+ToolItem [] _getItems () {
int /*long*/ list = OS.gtk_container_get_children (handle);
if (list == 0) return new ToolItem [0];
int count = OS.g_list_length (list);
- ToolItem [] result = new ToolItem [count];
+ ToolItem [] items = new ToolItem [count];
+ int index = 0;
for (int i=0; i<count; i++) {
int /*long*/ data = OS.g_list_nth_data (list, i);
Widget widget = display.getWidget (data);
- result [i] = (ToolItem) widget;
+ if (widget != null) items [index++] = (ToolItem) widget;
}
OS.g_list_free (list);
- return result;
+ if (index != items.length) {
+ ToolItem [] newItems = new ToolItem [index];
+ System.arraycopy (items, 0, newItems, 0, index);
+ items = newItems;
+ }
+ return items;
}
/**
@@ -290,6 +346,24 @@ public int getRowCount () {
return 1;
}
+ToolItem [] _getTabItemList () {
+ if (tabItemList == null) return tabItemList;
+ int count = 0;
+ for (int i=0; i<tabItemList.length; i++) {
+ if (!tabItemList [i].isDisposed ()) count++;
+ }
+ if (count == tabItemList.length) return tabItemList;
+ ToolItem [] newList = new ToolItem [count];
+ int index = 0;
+ for (int i=0; i<tabItemList.length; i++) {
+ if (!tabItemList [i].isDisposed ()) {
+ newList [index++] = tabItemList [i];
+ }
+ }
+ tabItemList = newList;
+ return tabItemList;
+}
+
int /*long*/ gtk_key_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
if (!hasFocus ()) return 0;
int /*long*/ result = super.gtk_key_press_event (widget, eventPtr);
@@ -447,6 +521,22 @@ void setForegroundColor (GdkColor color) {
}
}
+/*public*/ void setTabItemList (ToolItem [] tabList) {
+ checkWidget ();
+ if (tabList != null) {
+ for (int i=0; i<tabList.length; i++) {
+ ToolItem item = tabList [i];
+ if (item == null) error (SWT.ERROR_INVALID_ARGUMENT);
+ if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
+ if (item.parent != this) error (SWT.ERROR_INVALID_PARENT);
+ }
+ ToolItem [] newList = new ToolItem [tabList.length];
+ System.arraycopy (tabList, 0, newList, 0, tabList.length);
+ tabList = newList;
+ }
+ this.tabItemList = tabList;
+}
+
public void setToolTipText (String string) {
checkWidget();
super.setToolTipText (string);
diff --git a/org/eclipse/swt/widgets/ToolItem.java b/org/eclipse/swt/widgets/ToolItem.java
index facadfd..6013cfc 100644
--- a/org/eclipse/swt/widgets/ToolItem.java
+++ b/org/eclipse/swt/widgets/ToolItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@ import org.eclipse.swt.events.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#toolbar">ToolBar, ToolItem snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ToolItem extends Item {
int /*long*/ boxHandle, arrowHandle, arrowBoxHandle, separatorHandle, labelHandle, imageHandle;
@@ -266,6 +267,19 @@ void createWidget (int index) {
parent.relayout ();
}
+Widget [] computeTabList () {
+ if (isTabGroup ()) {
+ if (getEnabled ()) {
+ if ((style & SWT.SEPARATOR) != 0) {
+ if (control != null) return control.computeTabList();
+ } else {
+ return new Widget [] {this};
+ }
+ }
+ }
+ return new Widget [0];
+}
+
void deregister() {
super.deregister ();
if (labelHandle != 0) display.removeWidget (labelHandle);
@@ -666,6 +680,20 @@ public boolean isEnabled () {
return getEnabled () && parent.isEnabled ();
}
+boolean isTabGroup () {
+ ToolItem [] tabList = parent._getTabItemList ();
+ if (tabList != null) {
+ for (int i=0; i<tabList.length; i++) {
+ if (tabList [i] == this) return true;
+ }
+ }
+ if ((style & SWT.SEPARATOR) != 0) return true;
+ int index = parent.indexOf (this);
+ if (index == 0) return true;
+ ToolItem previous = parent.getItem (index - 1);
+ return (previous.getStyle () & SWT.SEPARATOR) != 0;
+}
+
void register () {
super.register ();
if (labelHandle != 0) display.addWidget (labelHandle, this);
@@ -953,6 +981,10 @@ public void setSelection (boolean selected) {
OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CLICKED);
}
+boolean setTabItemFocus (boolean next) {
+ return setFocus ();
+}
+
/**
* Sets the receiver's text. The string may include
* the mnemonic character.
@@ -997,8 +1029,17 @@ public void setText (String string) {
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
- *
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
+ * <p>
+ * The mnemonic indicator (character '&') is not displayed in a tool tip.
+ * To display a single '&' in the tool tip, the character '&' can be
+ * escaped by doubling it in the string.
+ * </p>
+ *
* @param string the new tool tip text (or null)
*
* @exception SWTException <ul>
diff --git a/org/eclipse/swt/widgets/ToolTip.java b/org/eclipse/swt/widgets/ToolTip.java
index 0d162d1..a106744 100644
--- a/org/eclipse/swt/widgets/ToolTip.java
+++ b/org/eclipse/swt/widgets/ToolTip.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.2
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ToolTip extends Widget {
Shell parent;
@@ -81,6 +82,7 @@ public class ToolTip extends Widget {
* <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
* </ul>
*
+ * @see SWT#BALLOON
* @see SWT#ICON_ERROR
* @see SWT#ICON_INFORMATION
* @see SWT#ICON_WARNING
@@ -91,6 +93,7 @@ public ToolTip (Shell parent, int style) {
super (parent, checkStyle (style));
this.parent = parent;
createWidget (0);
+ parent.addToolTip (this);
}
static int checkStyle (int style) {
@@ -260,6 +263,7 @@ void createHandle (int index) {
Color background = display.getSystemColor (SWT.COLOR_INFO_BACKGROUND);
OS.gtk_widget_modify_bg (handle, OS.GTK_STATE_NORMAL, background.handle);
OS.gtk_widget_set_app_paintable (handle, true);
+ OS.gtk_window_set_type_hint (handle, OS.GDK_WINDOW_TYPE_HINT_TOOLTIP);
} else {
handle = OS.gtk_tooltips_new ();
if (handle == 0) SWT.error (SWT.ERROR_NO_HANDLES);
@@ -294,6 +298,7 @@ void deregister () {
void destroyWidget () {
int /*long*/ topHandle = topHandle ();
+ if (parent != null) parent.removeTooTip (this);
releaseHandle ();
if (topHandle != 0 && (state & HANDLE) != 0) {
if ((style & SWT.BALLOON) != 0) {
@@ -326,12 +331,19 @@ Point getLocation () {
int y = this.y;
if (item != null) {
int /*long*/ itemHandle = item.handle;
- OS.gtk_widget_realize (itemHandle);
- int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
- int [] px = new int [1], py = new int [1];
- OS.gdk_window_get_origin (window, px, py);
- x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
- y = py [0] + OS.GTK_WIDGET_HEIGHT (itemHandle) / 2;
+ if(OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ GdkRectangle area = new GdkRectangle ();
+ OS.gtk_status_icon_get_geometry (itemHandle, 0, area, 0);
+ x = area.x + area.width / 2;
+ y = area.y + area.height / 2;
+ } else {
+ OS.gtk_widget_realize (itemHandle);
+ int /*long*/ window = OS.GTK_WIDGET_WINDOW (itemHandle);
+ int [] px = new int [1], py = new int [1];
+ OS.gdk_window_get_origin (window, px, py);
+ x = px [0] + OS.GTK_WIDGET_WIDTH (itemHandle) / 2;
+ y = py [0] + OS.GTK_WIDGET_HEIGHT (itemHandle) / 2;
+ }
}
if (x == -1 || y == -1) {
int [] px = new int [1], py = new int [1];
@@ -764,6 +776,7 @@ public void setText (String string) {
* </ul>
*/
public void setVisible (boolean visible) {
+ checkWidget ();
if (timerId != 0) OS.gtk_timeout_remove(timerId);
timerId = 0;
if (visible) {
diff --git a/org/eclipse/swt/widgets/Tracker.java b/org/eclipse/swt/widgets/Tracker.java
index a888504..e5729d3 100644
--- a/org/eclipse/swt/widgets/Tracker.java
+++ b/org/eclipse/swt/widgets/Tracker.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ import org.eclipse.swt.events.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#tracker">Tracker snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Tracker extends Widget {
Composite parent;
@@ -121,6 +122,7 @@ public Tracker (Composite parent, int style) {
* @see SWT#RIGHT
* @see SWT#UP
* @see SWT#DOWN
+ * @see SWT#RESIZE
*/
public Tracker (Display display, int style) {
if (display == null) display = Display.getCurrent ();
diff --git a/org/eclipse/swt/widgets/Tray.java b/org/eclipse/swt/widgets/Tray.java
index c918004..53fadef 100644
--- a/org/eclipse/swt/widgets/Tray.java
+++ b/org/eclipse/swt/widgets/Tray.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.swt.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Tray extends Widget {
int itemCount;
diff --git a/org/eclipse/swt/widgets/TrayItem.java b/org/eclipse/swt/widgets/TrayItem.java
index 28a8e35..7d1fb1f 100644
--- a/org/eclipse/swt/widgets/TrayItem.java
+++ b/org/eclipse/swt/widgets/TrayItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ import org.eclipse.swt.internal.gtk.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TrayItem extends Item {
Tray parent;
@@ -150,39 +151,46 @@ void createWidget (int index) {
void createHandle (int index) {
state |= HANDLE;
- handle = OS.gtk_plug_new (0);
- if (handle == 0) error (SWT.ERROR_NO_HANDLES);
- imageHandle = OS.gtk_image_new ();
- if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
- OS.gtk_container_add (handle, imageHandle);
- OS.gtk_widget_show (handle);
- OS.gtk_widget_show (imageHandle);
- int /*long*/ id = OS.gtk_plug_get_id (handle);
- int monitor = 0;
- int /*long*/ screen = OS.gdk_screen_get_default ();
- if (screen != 0) {
- monitor = OS.gdk_screen_get_number (screen);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ handle = OS.gtk_status_icon_new ();
+ if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+ imageHandle = OS.gtk_image_new ();
+ OS.gtk_status_icon_set_visible (handle,true);
+ } else {
+ handle = OS.gtk_plug_new (0);
+ if (handle == 0) error (SWT.ERROR_NO_HANDLES);
+ imageHandle = OS.gtk_image_new ();
+ if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
+ OS.gtk_container_add (handle, imageHandle);
+ OS.gtk_widget_show (handle);
+ OS.gtk_widget_show (imageHandle);
+ int /*long*/ id = OS.gtk_plug_get_id (handle);
+ int monitor = 0;
+ int /*long*/ screen = OS.gdk_screen_get_default ();
+ if (screen != 0) {
+ monitor = OS.gdk_screen_get_number (screen);
+ }
+ byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
+ int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
+ int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
+ int /*long*/ xDisplay = OS.GDK_DISPLAY ();
+ int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
+ byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
+ int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
+ int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
+ XClientMessageEvent event = new XClientMessageEvent ();
+ event.type = OS.ClientMessage;
+ event.window = trayWindow;
+ event.message_type = xMessageAtom;
+ event.format = 32;
+ event.data [0] = OS.GDK_CURRENT_TIME;
+ event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
+ event.data [2] = id;
+ int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
+ OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
+ OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
+ OS.g_free (clientEvent);
}
- byte [] trayBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_S" + monitor, true);
- int /*long*/ trayAtom = OS.gdk_atom_intern (trayBuffer, true);
- int /*long*/ xTrayAtom = OS.gdk_x11_atom_to_xatom (trayAtom);
- int /*long*/ xDisplay = OS.GDK_DISPLAY ();
- int /*long*/ trayWindow = OS.XGetSelectionOwner (xDisplay, xTrayAtom);
- byte [] messageBuffer = Converter.wcsToMbcs (null, "_NET_SYSTEM_TRAY_OPCODE", true);
- int /*long*/ messageAtom = OS.gdk_atom_intern (messageBuffer, true);
- int /*long*/ xMessageAtom = OS.gdk_x11_atom_to_xatom (messageAtom);
- XClientMessageEvent event = new XClientMessageEvent ();
- event.type = OS.ClientMessage;
- event.window = trayWindow;
- event.message_type = xMessageAtom;
- event.format = 32;
- event.data [0] = OS.GDK_CURRENT_TIME;
- event.data [1] = OS.SYSTEM_TRAY_REQUEST_DOCK;
- event.data [2] = id;
- int /*long*/ clientEvent = OS.g_malloc (XClientMessageEvent.sizeof);
- OS.memmove (clientEvent, event, XClientMessageEvent.sizeof);
- OS.XSendEvent (xDisplay, trayWindow, false, OS.NoEventMask, clientEvent);
- OS.g_free (clientEvent);
}
void deregister () {
@@ -246,6 +254,31 @@ public String getToolTipText () {
return toolTipText;
}
+int /*long*/ gtk_activate (int /*long*/ widget) {
+ postEvent (SWT.Selection);
+ /*
+ * Feature in GTK. GTK will generate a single-click event before sending
+ * a double-click event. To know when to send a DefaultSelection, look for
+ * the single-click as the current event and for the double-click in the
+ * event queue.
+ */
+ int /*long*/ nextEvent = OS.gdk_event_peek ();
+ if (nextEvent != 0) {
+ int nextEventType = OS.GDK_EVENT_TYPE (nextEvent);
+ int /*long*/ currEvent = OS.gtk_get_current_event ();
+ int currEventType = 0;
+ if (currEvent != 0) {
+ currEventType = OS.GDK_EVENT_TYPE (currEvent);
+ OS.gdk_event_free (currEvent);
+ }
+ OS.gdk_event_free (nextEvent);
+ if (currEventType == OS.GDK_BUTTON_PRESS && nextEventType == OS.GDK_2BUTTON_PRESS) {
+ postEvent (SWT.DefaultSelection);
+ }
+ }
+ return 0;
+}
+
int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
GdkEventButton gdkEvent = new GdkEventButton ();
OS.memmove (gdkEvent, eventPtr, GdkEventButton.sizeof);
@@ -295,12 +328,22 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
return 0;
}
+int /*long*/ gtk_status_icon_popup_menu (int /*long*/ widget, int /*long*/ button, int /*long*/ activate_time) {
+ sendEvent (SWT.MenuDetect);
+ return 0;
+}
+
void hookEvents () {
- int eventMask = OS.GDK_BUTTON_PRESS_MASK;
- OS.gtk_widget_add_events (handle, eventMask);
- OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
- OS.g_signal_connect_closure_by_id (imageHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
- }
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.g_signal_connect_closure (handle, OS.activate, display.closures [ACTIVATE], false);
+ OS.g_signal_connect_closure (handle, OS.popup_menu, display.closures [STATUS_ICON_POPUP_MENU], false);
+ } else {
+ int eventMask = OS.GDK_BUTTON_PRESS_MASK;
+ OS.gtk_widget_add_events (handle, eventMask);
+ OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
+ OS.g_signal_connect_closure_by_id (imageHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
+ }
+}
/**
* Returns <code>true</code> if the receiver is visible and
@@ -315,6 +358,9 @@ void hookEvents () {
*/
public boolean getVisible () {
checkWidget ();
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ return OS.gtk_status_icon_get_visible (handle);
+ }
return OS.GTK_WIDGET_VISIBLE (handle);
}
@@ -324,7 +370,13 @@ void register () {
}
void releaseHandle () {
- if (handle != 0) OS.gtk_widget_destroy (handle);
+ if (handle != 0) {
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.g_object_unref (handle);
+ } else {
+ OS.gtk_widget_destroy (handle);
+ }
+ }
handle = imageHandle = 0;
super.releaseHandle ();
parent = null;
@@ -409,8 +461,6 @@ public void setImage (Image image) {
if (image != null && image.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
this.image = image;
if (image != null) {
- Rectangle rect = image.getBounds ();
- OS.gtk_widget_set_size_request (handle, rect.width, rect.height);
if (imageList == null) imageList = new ImageList ();
int imageIndex = imageList.indexOf (image);
if (imageIndex == -1) {
@@ -419,12 +469,24 @@ public void setImage (Image image) {
imageList.put (imageIndex, image);
}
int /*long*/ pixbuf = imageList.getPixbuf (imageIndex);
- OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
- OS.gtk_widget_show (imageHandle);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.gtk_status_icon_set_from_pixbuf (handle, pixbuf);
+ OS.gtk_status_icon_set_visible (handle, true);
+ } else {
+ Rectangle rect = image.getBounds ();
+ OS.gtk_widget_set_size_request (handle, rect.width, rect.height);
+ OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ OS.gtk_widget_show (imageHandle);
+ }
} else {
OS.gtk_widget_set_size_request (handle, 1, 1);
- OS.gtk_image_set_from_pixbuf (imageHandle, 0);
- OS.gtk_widget_hide (imageHandle);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.gtk_status_icon_set_from_pixbuf (handle, 0);
+ OS.gtk_status_icon_set_visible (handle, false);
+ } else {
+ OS.gtk_image_set_from_pixbuf (imageHandle, 0);
+ OS.gtk_widget_hide (imageHandle);
+ }
}
}
@@ -451,9 +513,18 @@ public void setToolTip (ToolTip toolTip) {
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
- *
- * @param value the new tool tip text (or null)
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
+ * <p>
+ * The mnemonic indicator (character '&') is not displayed in a tool tip.
+ * To display a single '&' in the tool tip, the character '&' can be
+ * escaped by doubling it in the string.
+ * </p>
+ *
+ * @param string the new tool tip text (or null)
*
* @exception SWTException <ul>
* <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -473,7 +544,10 @@ public void setToolTipText (String string) {
OS.g_object_ref (tooltipsHandle);
OS.gtk_object_sink (tooltipsHandle);
}
- OS.gtk_tooltips_set_tip (tooltipsHandle, handle, buffer, null);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.gtk_status_icon_set_tooltip (handle, buffer);
+ } else
+ OS.gtk_tooltips_set_tip (tooltipsHandle, handle, buffer, null);
}
/**
@@ -489,7 +563,11 @@ public void setToolTipText (String string) {
*/
public void setVisible (boolean visible) {
checkWidget ();
- if (OS.GTK_WIDGET_VISIBLE (handle) == visible) return;
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ if(OS.gtk_status_icon_get_visible (handle) == visible) return;
+ } else {
+ if (OS.GTK_WIDGET_VISIBLE (handle) == visible) return;
+ }
if (visible) {
/*
* It is possible (but unlikely), that application
@@ -498,10 +576,16 @@ public void setVisible (boolean visible) {
*/
sendEvent (SWT.Show);
if (isDisposed ()) return;
- OS.gtk_widget_show (handle);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.gtk_status_icon_set_visible (handle, visible);
+ } else
+ OS.gtk_widget_show (handle);
} else {
- OS.gtk_widget_hide (handle);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 10, 0)) {
+ OS.gtk_status_icon_set_visible (handle, visible);
+ } else
+ OS.gtk_widget_hide (handle);
sendEvent (SWT.Hide);
}
}
-}
+}
\ No newline at end of file
diff --git a/org/eclipse/swt/widgets/Tree.java b/org/eclipse/swt/widgets/Tree.java
index a42fe7e..e6a26ce 100644
--- a/org/eclipse/swt/widgets/Tree.java
+++ b/org/eclipse/swt/widgets/Tree.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -72,6 +72,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/snippets/#tree">Tree, TreeItem, TreeColumn snippets</a>
* @see <a href="http://www.eclipse.org/swt/examples.php">SWT Example: ControlExample</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class Tree extends Composite {
int /*long*/ modelHandle, checkRenderer;
@@ -87,7 +88,7 @@ public class Tree extends Composite {
boolean expandAll;
int drawState, drawFlags;
GdkColor drawForeground;
- boolean ownerDraw, ignoreSize;
+ boolean ownerDraw, ignoreSize, ignoreAccessibility;
static final int ID_COLUMN = 0;
static final int CHECKED_COLUMN = 1;
@@ -462,6 +463,10 @@ int calculateWidth (int /*long*/ column, int /*long*/ iter, boolean recurse) {
}
if (path != 0) OS.gtk_tree_path_free (path);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0) && OS.gtk_tree_view_get_rules_hint (handle)) {
+ OS.gtk_widget_style_get (handle, OS.grid_line_width, w, 0) ;
+ width += 2 * w [0];
+ }
return width;
}
@@ -941,6 +946,7 @@ void deregister () {
super.deregister ();
display.removeWidget (OS.gtk_tree_view_get_selection (handle));
if (checkRenderer != 0) display.removeWidget (checkRenderer);
+ display.removeWidget (modelHandle);
}
/**
@@ -1126,6 +1132,21 @@ int /*long*/ eventWindow () {
return paintWindow ();
}
+boolean fixAccessibility () {
+ /*
+ * Bug in GTK. With GTK 2.12, when assistive technologies is on, the time
+ * it takes to add or remove several rows to the model is very long. This
+ * happens because the accessible object asks each row for its data, including
+ * the rows that are not visible. The the fix is to block the accessible object
+ * from receiving row_added and row_removed signals and, at the end, send only
+ * a notify signal with the "model" detail.
+ *
+ * Note: The test bellow has to be updated when the real problem is fixed in
+ * the accessible object.
+ */
+ return OS.GTK_VERSION >= OS.VERSION (2, 12, 0);
+}
+
void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, Decorations oldDecorations, Menu [] menus) {
super.fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
for (int i=0; i<columnCount; i++) {
@@ -1610,7 +1631,8 @@ TreeItem [] getItems (int /*long*/ parent) {
/**
* Returns <code>true</code> if the receiver's lines are visible,
- * and <code>false</code> otherwise.
+ * and <code>false</code> otherwise. Note that some platforms draw
+ * grid lines while others may draw alternating row colors.
* <p>
* If one of the receiver's ancestors is not visible or some
* other condition makes the receiver not visible, this method
@@ -1977,6 +1999,20 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
return 0;
}
+int gtk_row_deleted (int model, int path) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_deleted);
+ }
+ return 0;
+}
+
+int gtk_row_inserted (int model, int path, int iter) {
+ if (ignoreAccessibility) {
+ OS.g_signal_stop_emission_by_name (model, OS.row_inserted);
+ }
+ return 0;
+}
+
int /*long*/ gtk_test_collapse_row (int /*long*/ tree, int /*long*/ iter, int /*long*/ path) {
int [] index = new int [1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, index, -1);
@@ -2126,6 +2162,10 @@ void hookEvents () {
if (checkRenderer != 0) {
OS.g_signal_connect_closure (checkRenderer, OS.toggled, display.closures [TOGGLED], false);
}
+ if (fixAccessibility ()) {
+ OS.g_signal_connect_closure (modelHandle, OS.row_inserted, display.closures [ROW_INSERTED], true);
+ OS.g_signal_connect_closure (modelHandle, OS.row_deleted, display.closures [ROW_DELETED], true);
+ }
}
/**
@@ -2247,6 +2287,7 @@ void register () {
super.register ();
display.addWidget (OS.gtk_tree_view_get_selection (handle), this);
if (checkRenderer != 0) display.addWidget (checkRenderer, this);
+ display.addWidget (modelHandle, this);
}
void releaseItem (TreeItem item, boolean release) {
@@ -2317,9 +2358,12 @@ void remove (int /*long*/ parentIter, int start, int end) {
}
int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int index = start;
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
for (int i = start; i <= end; i++) {
- OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parentIter, index);
+ OS.gtk_tree_model_iter_nth_child (modelHandle, iter, parentIter, start);
int[] value = new int[1];
OS.gtk_tree_model_get (modelHandle, iter, ID_COLUMN, value, -1);
TreeItem item = value [0] != -1 ? items [value [0]] : null;
@@ -2331,6 +2375,10 @@ void remove (int /*long*/ parentIter, int start, int end) {
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
}
}
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
+ }
OS.g_free (iter);
}
@@ -2351,7 +2399,14 @@ public void removeAll () {
items = new TreeItem[4];
int /*long*/ selection = OS.gtk_tree_view_get_selection (handle);
OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
OS.gtk_tree_store_clear (modelHandle);
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
+ }
OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
/* Disable searching when using VIRTUAL */
@@ -2584,8 +2639,10 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
if (hooks (SWT.PaintItem)) {
GdkRectangle rect = new GdkRectangle ();
+ GdkRectangle clipRect = new GdkRectangle ();
int /*long*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
+ OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);
OS.gtk_tree_path_free (path);
if (OS.GTK_VERSION < OS.VERSION (2, 8, 18) && OS.gtk_tree_view_get_expander_column (handle) == columnHandle) {
int [] buffer = new int [1];
@@ -2619,8 +2676,11 @@ int /*long*/ rendererRenderProc (int /*long*/ cell, int /*long*/ window, int /*l
gc.setForeground (foreground);
}
gc.setFont (item.getFont (columnIndex));
- if ((style & SWT.MIRRORED) != 0) rect.x = getClientWidth () - rect.width - rect.x;
- gc.setClipping (rect.x, rect.y, rect.width, rect.height);
+ if ((style & SWT.MIRRORED) != 0) {
+ rect.x = getClientWidth () - rect.width - rect.x;
+ clipRect.x = getClientWidth () - clipRect.width - clipRect.x;
+ }
+ gc.setClipping (clipRect.x, clipRect.y, clipRect.width, clipRect.height);
Event event = new Event ();
event.item = item;
event.index = columnIndex;
@@ -2695,6 +2755,9 @@ void setItemCount (int /*long*/ parentIter, int count) {
if (!isVirtual) setRedraw (false);
remove (parentIter, count, itemCount - 1);
if (isVirtual) {
+ if (fixAccessibility ()) {
+ ignoreAccessibility = true;
+ }
for (int i=itemCount; i<count; i++) {
int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
if (iter == 0) error (SWT.ERROR_NO_HANDLES);
@@ -2702,6 +2765,10 @@ void setItemCount (int /*long*/ parentIter, int count) {
OS.gtk_tree_store_set (modelHandle, iter, ID_COLUMN, -1, -1);
OS.g_free (iter);
}
+ if (fixAccessibility ()) {
+ ignoreAccessibility = false;
+ OS.g_object_notify (handle, OS.model);
+ }
} else {
for (int i=itemCount; i<count; i++) {
new TreeItem (this, parentIter, SWT.NONE, i, true);
@@ -2895,7 +2962,8 @@ public void setHeaderVisible (boolean show) {
/**
* Marks the receiver's lines as visible if the argument is <code>true</code>,
- * and marks it invisible otherwise.
+ * and marks it invisible otherwise. Note that some platforms draw
+ * grid lines while others may draw alternating row colors.
* <p>
* If one of the receiver's ancestors is not visible or some
* other condition makes the receiver not visible, marking
@@ -2914,6 +2982,9 @@ public void setHeaderVisible (boolean show) {
public void setLinesVisible (boolean show) {
checkWidget();
OS.gtk_tree_view_set_rules_hint (handle, show);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 12, 0)) {
+ OS.gtk_tree_view_set_grid_lines (handle, show ? OS.GTK_TREE_VIEW_GRID_LINES_VERTICAL : OS.GTK_TREE_VIEW_GRID_LINES_NONE);
+ }
}
void setParentBackground () {
diff --git a/org/eclipse/swt/widgets/TreeColumn.java b/org/eclipse/swt/widgets/TreeColumn.java
index 6050236..a3b6ee5 100644
--- a/org/eclipse/swt/widgets/TreeColumn.java
+++ b/org/eclipse/swt/widgets/TreeColumn.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,7 @@ import org.eclipse.swt.events.*;
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
*
* @since 3.1
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TreeColumn extends Item {
int /*long*/ labelHandle, imageHandle, buttonHandle;
@@ -367,6 +368,22 @@ int /*long*/ gtk_clicked (int /*long*/ widget) {
return 0;
}
+int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+ GdkEvent event = new GdkEvent ();
+ OS.memmove (event, gdkEvent, GdkEvent.sizeof);
+ switch (event.type) {
+ case OS.GDK_BUTTON_PRESS: {
+ GdkEventButton gdkEventButton = new GdkEventButton ();
+ OS.memmove (gdkEventButton, gdkEvent, GdkEventButton.sizeof);
+ if (gdkEventButton.button == 3) {
+ parent.showMenu ((int) gdkEventButton.x_root, (int) gdkEventButton.y_root);
+ }
+ break;
+ }
+ }
+ return 0;
+}
+
int /*long*/ gtk_mnemonic_activate (int /*long*/ widget, int /*long*/ arg1) {
return parent.gtk_mnemonic_activate (widget, arg1);
}
@@ -389,7 +406,10 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
void hookEvents () {
super.hookEvents ();
OS.g_signal_connect_closure (handle, OS.clicked, display.closures [CLICKED], false);
- if (buttonHandle != 0) OS.g_signal_connect_closure_by_id (buttonHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
+ if (buttonHandle != 0) {
+ OS.g_signal_connect_closure_by_id (buttonHandle, display.signalIds [SIZE_ALLOCATE], 0, display.closures [SIZE_ALLOCATE], false);
+ OS.g_signal_connect_closure_by_id (buttonHandle, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
+ }
if (labelHandle != 0) OS.g_signal_connect_closure_by_id (labelHandle, display.signalIds [MNEMONIC_ACTIVATE], 0, display.closures [MNEMONIC_ACTIVATE], false);
}
@@ -614,8 +634,17 @@ public void setText (String string) {
/**
* Sets the receiver's tool tip text to the argument, which
- * may be null indicating that no tool tip text should be shown.
- *
+ * may be null indicating that the default tool tip for the
+ * control will be shown. For a control that has a default
+ * tool tip, such as the Tree control on Windows, setting
+ * the tool tip text to an empty string replaces the default,
+ * causing no tool tip text to be shown.
+ * <p>
+ * The mnemonic indicator (character '&') is not displayed in a tool tip.
+ * To display a single '&' in the tool tip, the character '&' can be
+ * escaped by doubling it in the string.
+ * </p>
+ *
* @param string the new tool tip text (or null)
*
* @exception SWTException <ul>
diff --git a/org/eclipse/swt/widgets/TreeItem.java b/org/eclipse/swt/widgets/TreeItem.java
index 4d8eb4b..1102499 100644
--- a/org/eclipse/swt/widgets/TreeItem.java
+++ b/org/eclipse/swt/widgets/TreeItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.swt.graphics.*;
*
* @see <a href="http://www.eclipse.org/swt/snippets/#tree">Tree, TreeItem, TreeColumn snippets</a>
* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class TreeItem extends Item {
Tree parent;
@@ -1135,19 +1136,31 @@ void releaseWidget () {
*/
public void removeAll () {
checkWidget ();
- int length = OS.gtk_tree_model_iter_n_children (parent.modelHandle, handle);
+ int /*long*/ modelHandle = parent.modelHandle;
+ int length = OS.gtk_tree_model_iter_n_children (modelHandle, handle);
if (length == 0) return;
int /*long*/ iter = OS.g_malloc (OS.GtkTreeIter_sizeof ());
- int [] index = new int [1];
- while (OS.gtk_tree_model_iter_children (parent.modelHandle, iter, handle)) {
- OS.gtk_tree_model_get (parent.modelHandle, iter, Tree.ID_COLUMN, index, -1);
- if (index [0] != -1) {
- TreeItem item = parent.items [index [0]];
- if (item != null && !item.isDisposed ()) {
- item.dispose ();
- }
+ if (iter == 0) error (SWT.ERROR_NO_HANDLES);
+ if (parent.fixAccessibility ()) {
+ parent.ignoreAccessibility = true;
+ }
+ int /*long*/ selection = OS.gtk_tree_view_get_selection (parent.handle);
+ int [] value = new int [1];
+ while (OS.gtk_tree_model_iter_children (modelHandle, iter, handle)) {
+ OS.gtk_tree_model_get (modelHandle, iter, Tree.ID_COLUMN, value, -1);
+ TreeItem item = value [0] != -1 ? parent.items [value [0]] : null;
+ if (item != null && !item.isDisposed ()) {
+ item.dispose ();
+ } else {
+ OS.g_signal_handlers_block_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
+ OS.gtk_tree_store_remove (modelHandle, iter);
+ OS.g_signal_handlers_unblock_matched (selection, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, CHANGED);
}
}
+ if (parent.fixAccessibility ()) {
+ parent.ignoreAccessibility = false;
+ OS.g_object_notify (parent.handle, OS.model);
+ }
OS.g_free (iter);
}
diff --git a/org/eclipse/swt/widgets/Widget.java b/org/eclipse/swt/widgets/Widget.java
index 260a975..a391ca1 100644
--- a/org/eclipse/swt/widgets/Widget.java
+++ b/org/eclipse/swt/widgets/Widget.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -161,7 +161,11 @@ public abstract class Widget {
static final int ACTIVATE_INVERSE = 60;
static final int DAY_SELECTED = 61;
static final int MONTH_CHANGED = 62;
- static final int LAST_SIGNAL = 63;
+ static final int STATUS_ICON_POPUP_MENU = 63;
+ static final int ROW_INSERTED = 64;
+ static final int ROW_DELETED = 65;
+ static final int DAY_SELECTED_DOUBLE_CLICK = 66;
+ static final int LAST_SIGNAL = 67;
/**
* Prevents uninitialized instances from being created outside the package.
@@ -632,6 +636,10 @@ int /*long*/ gtk_day_selected (int /*long*/ widget) {
return 0;
}
+int /*long*/ gtk_day_selected_double_click (int /*long*/ widget) {
+ return 0;
+}
+
int /*long*/ gtk_delete_event (int /*long*/ widget, int /*long*/ event) {
return 0;
}
@@ -756,6 +764,14 @@ int /*long*/ gtk_row_activated (int /*long*/ tree, int /*long*/ path, int /*long
return 0;
}
+int /*long*/ gtk_row_deleted (int /*long*/ model, int /*long*/ path) {
+ return 0;
+}
+
+int /*long*/ gtk_row_inserted (int /*long*/ model, int /*long*/ path, int /*long*/ iter) {
+ return 0;
+}
+
int /*long*/ gtk_scroll_child (int /*long*/ widget, int /*long*/ scrollType, int /*long*/ horizontal) {
return 0;
}
@@ -780,6 +796,10 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
return 0;
}
+int /*long*/ gtk_status_icon_popup_menu (int /*long*/ handle, int /*long*/ button, int /*long*/ activate_time) {
+ return 0;
+}
+
int /*long*/ gtk_style_set (int /*long*/ widget, int /*long*/ previousStyle) {
return 0;
}
@@ -872,20 +892,18 @@ char [] fixMnemonic (String string, boolean replace) {
switch (text [i]) {
case '&':
if (i + 1 < length && text [i + 1] == '&') {
- i++;
+ result [j++] = text [i++];
} else {
- if (replace) {
- text [i] = '_';
- } else {
- i++;
- }
+ if (replace) result [j++] = '_';
}
+ i++;
break;
case '_':
if (replace) result [j++] = '_';
- break;
+ //FALL THROUGH
+ default:
+ result [j++] = text [i++];
}
- result [j++] = text [i++];
}
return result;
}
@@ -1447,6 +1465,14 @@ boolean setKeyState (Event event, GdkEventKey keyEvent) {
void setOrientation () {
}
+boolean setTabGroupFocus (boolean next) {
+ return setTabItemFocus (next);
+}
+
+boolean setTabItemFocus (boolean next) {
+ return false;
+}
+
int /*long*/ shellMapProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ user_data) {
return 0;
}
@@ -1496,6 +1522,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ user_data) {
case CHANGED: return gtk_changed (handle);
case CLICKED: return gtk_clicked (handle);
case DAY_SELECTED: return gtk_day_selected (handle);
+ case DAY_SELECTED_DOUBLE_CLICK: return gtk_day_selected_double_click (handle);
case HIDE: return gtk_hide (handle);
case GRAB_FOCUS: return gtk_grab_focus (handle);
case MAP: return gtk_map (handle);
@@ -1557,6 +1584,7 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ us
case UNMAP_EVENT: return gtk_unmap_event (handle, arg0);
case VISIBILITY_NOTIFY_EVENT: return gtk_visibility_notify_event (handle, arg0);
case WINDOW_STATE_EVENT: return gtk_window_state_event (handle, arg0);
+ case ROW_DELETED: return gtk_row_deleted (handle, arg0);
default: return 0;
}
}
@@ -1567,9 +1595,11 @@ int /*long*/ windowProc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ ar
case DELETE_TEXT: return gtk_delete_text (handle, arg0, arg1);
case ROW_ACTIVATED: return gtk_row_activated (handle, arg0, arg1);
case SCROLL_CHILD: return gtk_scroll_child (handle, arg0, arg1);
+ case STATUS_ICON_POPUP_MENU: return gtk_status_icon_popup_menu (handle, arg0, arg1);
case SWITCH_PAGE: return gtk_switch_page (handle, arg0, arg1);
case TEST_COLLAPSE_ROW: return gtk_test_collapse_row (handle, arg0, arg1);
case TEST_EXPAND_ROW: return gtk_test_expand_row(handle, arg0, arg1);
+ case ROW_INSERTED: return gtk_row_inserted (handle, arg0, arg1);
default: return 0;
}
}
diff --git a/os.c b/os.c
index 070b3dd..7e69ea0 100644
--- a/os.c
+++ b/os.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2009 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
@@ -19,21 +19,55 @@
#define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
-#ifndef NO_Call
-JNIEXPORT jint JNICALL OS_NATIVE(Call)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO_Call__IIII) && !defined(JNI64)) || (!defined(NO_Call__JJII) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jint JNICALL OS_NATIVE(Call__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#else
+JNIEXPORT jint JNICALL OS_NATIVE(Call__JJII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
+#endif
{
jint rc = 0;
- OS_NATIVE_ENTER(env, that, Call_FUNC);
+#ifndef JNI64
+ OS_NATIVE_ENTER(env, that, Call__IIII_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, Call__JJII_FUNC);
+#endif
rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
- OS_NATIVE_EXIT(env, that, Call_FUNC);
+#ifndef JNI64
+ OS_NATIVE_EXIT(env, that, Call__IIII_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, Call__JJII_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO_Call__IIIJ) && !defined(JNI64)) || (!defined(NO_Call__JJIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jlong JNICALL OS_NATIVE(Call__IIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3)
+#else
+JNIEXPORT jlong JNICALL OS_NATIVE(Call__JJIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3)
+#endif
+{
+ jlong rc = 0;
+#ifndef JNI64
+ OS_NATIVE_ENTER(env, that, Call__IIIJ_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, Call__JJIJ_FUNC);
+#endif
+ rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
+#ifndef JNI64
+ OS_NATIVE_EXIT(env, that, Call__IIIJ_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, Call__JJIJ_FUNC);
+#endif
return rc;
}
#endif
#ifndef NO_GDK_1EVENT_1TYPE
JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GDK_1EVENT_1TYPE_FUNC);
@@ -44,12 +78,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1TYPE)
#endif
#ifndef NO_GDK_1EVENT_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GDK_1EVENT_1WINDOW)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GDK_1EVENT_1WINDOW_FUNC);
- rc = (jint)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
+ rc = (jintLong)GDK_EVENT_WINDOW((GdkEventAny *)arg0);
OS_NATIVE_EXIT(env, that, GDK_1EVENT_1WINDOW_FUNC);
return rc;
}
@@ -80,12 +114,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GPollFD_1sizeof)
#endif
#ifndef NO_GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
- rc = (jint)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
+ rc = (jintLong)GTK_ACCEL_LABEL_GET_ACCEL_STRING((GtkAccelLabel *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING_FUNC);
return rc;
}
@@ -93,7 +127,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1GET_1ACCEL_1STRING)
#ifndef NO_GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING
JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING_FUNC);
GTK_ACCEL_LABEL_SET_ACCEL_STRING((GtkAccelLabel *)arg0, (gchar *)arg1);
@@ -102,24 +136,24 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1ACCEL_1LABEL_1SET_1ACCEL_1STRING)
#endif
#ifndef NO_GTK_1ENTRY_1IM_1CONTEXT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1ENTRY_1IM_1CONTEXT)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
- rc = (jint)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
+ rc = (jintLong)GTK_ENTRY_IM_CONTEXT((GtkEntry *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1ENTRY_1IM_1CONTEXT_FUNC);
return rc;
}
#endif
#ifndef NO_GTK_1SCROLLED_1WINDOW_1HSCROLLBAR
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC);
- rc = (jint)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
+ rc = (jintLong)GTK_SCROLLED_WINDOW_HSCROLLBAR((GtkScrolledWindow *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1HSCROLLBAR_FUNC);
return rc;
}
@@ -127,7 +161,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1HSCROLLBAR)
#ifndef NO_GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING_FUNC);
@@ -138,24 +172,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1SCROLLBAR_1SPACING)
#endif
#ifndef NO_GTK_1SCROLLED_1WINDOW_1VSCROLLBAR
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1SCROLLED_1WINDOW_1VSCROLLBAR)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC);
- rc = (jint)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
+ rc = (jintLong)GTK_SCROLLED_WINDOW_VSCROLLBAR((GtkScrolledWindow *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1SCROLLED_1WINDOW_1VSCROLLBAR_FUNC);
return rc;
}
#endif
#ifndef NO_GTK_1TEXTVIEW_1IM_1CONTEXT
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
- rc = (jint)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
+ rc = (jintLong)GTK_TEXTVIEW_IM_CONTEXT((GtkTextView *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1TEXTVIEW_1IM_1CONTEXT_FUNC);
return rc;
}
@@ -163,7 +197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TEXTVIEW_1IM_1CONTEXT)
#ifndef NO_GTK_1TOOLTIPS_1SET_1ACTIVE
JNIEXPORT void JNICALL OS_NATIVE(GTK_1TOOLTIPS_1SET_1ACTIVE)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, GTK_1TOOLTIPS_1SET_1ACTIVE_FUNC);
GTK_TOOLTIPS_SET_ACTIVE((GtkTooltips *)arg0, (GtkTooltipsData *)arg1);
@@ -172,12 +206,12 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1TOOLTIPS_1SET_1ACTIVE)
#endif
#ifndef NO_GTK_1TOOLTIPS_1TIP_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1TOOLTIPS_1TIP_1WINDOW_FUNC);
- rc = (jint)GTK_TOOLTIPS_TIP_WINDOW((GtkTooltips *)arg0);
+ rc = (jintLong)GTK_TOOLTIPS_TIP_WINDOW((GtkTooltips *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1TOOLTIPS_1TIP_1WINDOW_FUNC);
return rc;
}
@@ -185,7 +219,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1TOOLTIPS_1TIP_1WINDOW)
#ifndef NO_GTK_1WIDGET_1HEIGHT
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1HEIGHT_FUNC);
@@ -197,7 +231,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1HEIGHT)
#ifndef NO_GTK_1WIDGET_1REQUISITION_1HEIGHT
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1HEIGHT_FUNC);
@@ -209,7 +243,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1HEIGHT)
#ifndef NO_GTK_1WIDGET_1REQUISITION_1WIDTH
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1REQUISITION_1WIDTH_FUNC);
@@ -221,7 +255,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1REQUISITION_1WIDTH)
#ifndef NO_GTK_1WIDGET_1SET_1HEIGHT
JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1HEIGHT)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1HEIGHT_FUNC);
GTK_WIDGET_SET_HEIGHT((GtkWidget *)arg0, arg1);
@@ -231,7 +265,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1HEIGHT)
#ifndef NO_GTK_1WIDGET_1SET_1WIDTH
JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1WIDTH)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1WIDTH_FUNC);
GTK_WIDGET_SET_WIDTH((GtkWidget *)arg0, arg1);
@@ -241,7 +275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1WIDTH)
#ifndef NO_GTK_1WIDGET_1SET_1X
JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1X)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1X_FUNC);
GTK_WIDGET_SET_X((GtkWidget *)arg0, arg1);
@@ -251,7 +285,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1X)
#ifndef NO_GTK_1WIDGET_1SET_1Y
JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1Y)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1SET_1Y_FUNC);
GTK_WIDGET_SET_Y((GtkWidget *)arg0, arg1);
@@ -261,7 +295,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GTK_1WIDGET_1SET_1Y)
#ifndef NO_GTK_1WIDGET_1WIDTH
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1WIDTH_FUNC);
@@ -272,12 +306,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WIDTH)
#endif
#ifndef NO_GTK_1WIDGET_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1WINDOW_FUNC);
- rc = (jint)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
+ rc = (jintLong)GTK_WIDGET_WINDOW((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, GTK_1WIDGET_1WINDOW_FUNC);
return rc;
}
@@ -285,7 +319,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1WINDOW)
#ifndef NO_GTK_1WIDGET_1X
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1X_FUNC);
@@ -297,7 +331,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1X)
#ifndef NO_GTK_1WIDGET_1Y
JNIEXPORT jint JNICALL OS_NATIVE(GTK_1WIDGET_1Y)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, GTK_1WIDGET_1Y_FUNC);
@@ -331,6 +365,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTypeQuery_1sizeof)
}
#endif
+#ifndef NO_G_1OBJECT_1CLASS_1CONSTRUCTOR
+JNIEXPORT jintLong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC);
+ rc = (jintLong)G_OBJECT_CLASS_CONSTRUCTOR((GObjectClass *)arg0);
+ OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO_G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR
+JNIEXPORT void JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+ OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC);
+ G_OBJECT_CLASS_SET_CONSTRUCTOR((GObjectClass *)arg0, arg1);
+ OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC);
+}
+#endif
+
#ifndef NO_GdkColor_1sizeof
JNIEXPORT jint JNICALL OS_NATIVE(GdkColor_1sizeof)
(JNIEnv *env, jclass that)
@@ -1017,7 +1073,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(XWindowChanges_1sizeof)
#ifndef NO_X_1EVENT_1TYPE
JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, X_1EVENT_1TYPE_FUNC);
@@ -1028,12 +1084,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1TYPE)
#endif
#ifndef NO_X_1EVENT_1WINDOW
-JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, X_1EVENT_1WINDOW_FUNC);
- rc = (jint)X_EVENT_WINDOW((XAnyEvent *)arg0);
+ rc = (jintLong)X_EVENT_WINDOW((XAnyEvent *)arg0);
OS_NATIVE_EXIT(env, that, X_1EVENT_1WINDOW_FUNC);
return rc;
}
@@ -1041,7 +1097,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
#ifndef NO__1Call
JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1Call_FUNC);
@@ -1053,7 +1109,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1Call)
#ifndef NO__1FcConfigAppFontAddFile
JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
jboolean rc = 0;
@@ -1063,18 +1119,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1FcConfigAppFontAddFile)
rc = (jboolean)FcConfigAppFontAddFile(arg0, lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint, jbyte *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(FcConfigAppFontAddFile_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "FcConfigAppFontAddFile");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0, lparg1);
+ LOAD_FUNCTION(fp, FcConfigAppFontAddFile)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
}
}
fail:
@@ -1085,60 +1132,60 @@ fail:
#endif
#ifndef NO__1GDK_1DISPLAY
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1DISPLAY)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1DISPLAY)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GDK_1DISPLAY_FUNC);
- rc = (jint)GDK_DISPLAY();
+ rc = (jintLong)GDK_DISPLAY();
OS_NATIVE_EXIT(env, that, _1GDK_1DISPLAY_FUNC);
return rc;
}
#endif
#ifndef NO__1GDK_1PIXMAP_1XID
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1PIXMAP_1XID)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GDK_1PIXMAP_1XID_FUNC);
- rc = (jint)GDK_PIXMAP_XID((GdkPixmap *)arg0);
+ rc = (jintLong)GDK_PIXMAP_XID((GdkPixmap *)arg0);
OS_NATIVE_EXIT(env, that, _1GDK_1PIXMAP_1XID_FUNC);
return rc;
}
#endif
#ifndef NO__1GDK_1ROOT_1PARENT
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1ROOT_1PARENT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1ROOT_1PARENT)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GDK_1ROOT_1PARENT_FUNC);
- rc = (jint)GDK_ROOT_PARENT();
+ rc = (jintLong)GDK_ROOT_PARENT();
OS_NATIVE_EXIT(env, that, _1GDK_1ROOT_1PARENT_FUNC);
return rc;
}
#endif
#ifndef NO__1GDK_1TYPE_1COLOR
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1COLOR)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1COLOR_FUNC);
- rc = (jint)GDK_TYPE_COLOR;
+ rc = (jintLong)GDK_TYPE_COLOR;
OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1COLOR_FUNC);
return rc;
}
#endif
#ifndef NO__1GDK_1TYPE_1PIXBUF
-JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
- rc = (jint)GDK_TYPE_PIXBUF;
+ rc = (jintLong)GDK_TYPE_PIXBUF;
OS_NATIVE_EXIT(env, that, _1GDK_1TYPE_1PIXBUF_FUNC);
return rc;
}
@@ -1146,7 +1193,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GDK_1TYPE_1PIXBUF)
#ifndef NO__1GTK_1IS_1BUTTON
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1BUTTON)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1BUTTON_FUNC);
@@ -1158,7 +1205,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1BUTTON)
#ifndef NO__1GTK_1IS_1CELL_1RENDERER_1PIXBUF
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1PIXBUF_FUNC);
@@ -1170,7 +1217,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1PIXBUF)
#ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TEXT
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TEXT_FUNC);
@@ -1182,7 +1229,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TEXT)
#ifndef NO__1GTK_1IS_1CELL_1RENDERER_1TOGGLE
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CELL_1RENDERER_1TOGGLE_FUNC);
@@ -1194,7 +1241,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CELL_1RENDERER_1TOGGLE)
#ifndef NO__1GTK_1IS_1CONTAINER
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CONTAINER)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1CONTAINER_FUNC);
@@ -1206,7 +1253,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1CONTAINER)
#ifndef NO__1GTK_1IS_1IMAGE_1MENU_1ITEM
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC);
@@ -1218,7 +1265,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1IMAGE_1MENU_1ITEM)
#ifndef NO__1GTK_1IS_1MENU_1ITEM
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1MENU_1ITEM)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1MENU_1ITEM_FUNC);
@@ -1230,7 +1277,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1MENU_1ITEM)
#ifndef NO__1GTK_1IS_1PLUG
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1PLUG)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1PLUG_FUNC);
@@ -1240,9 +1287,21 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1PLUG)
}
#endif
+#ifndef NO__1GTK_1IS_1SOCKET
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1SOCKET)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jboolean rc = 0;
+ OS_NATIVE_ENTER(env, that, _1GTK_1IS_1SOCKET_FUNC);
+ rc = (jboolean)GTK_IS_SOCKET(arg0);
+ OS_NATIVE_EXIT(env, that, _1GTK_1IS_1SOCKET_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1GTK_1IS_1WINDOW
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1WINDOW)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1IS_1WINDOW_FUNC);
@@ -1253,96 +1312,96 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1IS_1WINDOW)
#endif
#ifndef NO__1GTK_1STOCK_1CANCEL
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1STOCK_1CANCEL)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
- rc = (jint)GTK_STOCK_CANCEL;
+ rc = (jintLong)GTK_STOCK_CANCEL;
OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1CANCEL_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1STOCK_1OK
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1STOCK_1OK)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1STOCK_1OK_FUNC);
- rc = (jint)GTK_STOCK_OK;
+ rc = (jintLong)GTK_STOCK_OK;
OS_NATIVE_EXIT(env, that, _1GTK_1STOCK_1OK_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
- rc = (jint)GTK_TYPE_CELL_RENDERER_PIXBUF;
+ rc = (jintLong)GTK_TYPE_CELL_RENDERER_PIXBUF;
OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1PIXBUF_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TEXT
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TEXT)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
- rc = (jint)GTK_TYPE_CELL_RENDERER_TEXT;
+ rc = (jintLong)GTK_TYPE_CELL_RENDERER_TEXT;
OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TEXT_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
- rc = (jint)GTK_TYPE_CELL_RENDERER_TOGGLE;
+ rc = (jintLong)GTK_TYPE_CELL_RENDERER_TOGGLE;
OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1CELL_1RENDERER_1TOGGLE_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1TYPE_1FIXED
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1FIXED)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1FIXED_FUNC);
- rc = (jint)GTK_TYPE_FIXED;
+ rc = (jintLong)GTK_TYPE_FIXED;
OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1FIXED_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1TYPE_1MENU
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1MENU)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1MENU_FUNC);
- rc = (jint)GTK_TYPE_MENU;
+ rc = (jintLong)GTK_TYPE_MENU;
OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1MENU_FUNC);
return rc;
}
#endif
#ifndef NO__1GTK_1TYPE_1WIDGET
-JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
- rc = (jint)GTK_TYPE_WIDGET;
+ rc = (jintLong)GTK_TYPE_WIDGET;
OS_NATIVE_EXIT(env, that, _1GTK_1TYPE_1WIDGET_FUNC);
return rc;
}
@@ -1350,7 +1409,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1TYPE_1WIDGET)
#ifndef NO__1GTK_1WIDGET_1FLAGS
JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1FLAGS)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1FLAGS_FUNC);
@@ -1362,7 +1421,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1FLAGS)
#ifndef NO__1GTK_1WIDGET_1HAS_1DEFAULT
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1DEFAULT)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1HAS_1DEFAULT_FUNC);
@@ -1374,7 +1433,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1DEFAULT)
#ifndef NO__1GTK_1WIDGET_1HAS_1FOCUS
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1FOCUS)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1HAS_1FOCUS_FUNC);
@@ -1386,7 +1445,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1HAS_1FOCUS)
#ifndef NO__1GTK_1WIDGET_1IS_1SENSITIVE
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1IS_1SENSITIVE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1IS_1SENSITIVE_FUNC);
@@ -1398,7 +1457,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1IS_1SENSITIVE)
#ifndef NO__1GTK_1WIDGET_1MAPPED
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1MAPPED)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1MAPPED_FUNC);
@@ -1410,7 +1469,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1MAPPED)
#ifndef NO__1GTK_1WIDGET_1SENSITIVE
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1SENSITIVE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SENSITIVE_FUNC);
@@ -1422,7 +1481,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1SENSITIVE)
#ifndef NO__1GTK_1WIDGET_1SET_1FLAGS
JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1SET_1FLAGS_FUNC);
GTK_WIDGET_SET_FLAGS(arg0, arg1);
@@ -1432,7 +1491,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1SET_1FLAGS)
#ifndef NO__1GTK_1WIDGET_1STATE
JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1STATE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1STATE_FUNC);
@@ -1444,7 +1503,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1GTK_1WIDGET_1STATE)
#ifndef NO__1GTK_1WIDGET_1UNSET_1FLAGS
JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1UNSET_1FLAGS_FUNC);
GTK_WIDGET_UNSET_FLAGS(arg0, arg1);
@@ -1454,7 +1513,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1GTK_1WIDGET_1UNSET_1FLAGS)
#ifndef NO__1GTK_1WIDGET_1VISIBLE
JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1VISIBLE)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1GTK_1WIDGET_1VISIBLE_FUNC);
@@ -1465,84 +1524,84 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1GTK_1WIDGET_1VISIBLE)
#endif
#ifndef NO__1G_1OBJECT_1CLASS
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1CLASS)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1CLASS_FUNC);
- rc = (jint)G_OBJECT_CLASS(arg0);
+ rc = (jintLong)G_OBJECT_CLASS(arg0);
OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1CLASS_FUNC);
return rc;
}
#endif
#ifndef NO__1G_1OBJECT_1GET_1CLASS
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1GET_1CLASS)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
- rc = (jint)G_OBJECT_GET_CLASS(arg0);
+ rc = (jintLong)G_OBJECT_GET_CLASS(arg0);
OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1GET_1CLASS_FUNC);
return rc;
}
#endif
#ifndef NO__1G_1OBJECT_1TYPE
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_FUNC);
- rc = (jint)G_OBJECT_TYPE(arg0);
+ rc = (jintLong)G_OBJECT_TYPE(arg0);
OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_FUNC);
return rc;
}
#endif
#ifndef NO__1G_1OBJECT_1TYPE_1NAME
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1OBJECT_1TYPE_1NAME)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
- rc = (jint)G_OBJECT_TYPE_NAME(arg0);
+ rc = (jintLong)G_OBJECT_TYPE_NAME(arg0);
OS_NATIVE_EXIT(env, that, _1G_1OBJECT_1TYPE_1NAME_FUNC);
return rc;
}
#endif
#ifndef NO__1G_1TYPE_1BOOLEAN
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1BOOLEAN)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1TYPE_1BOOLEAN_FUNC);
- rc = (jint)G_TYPE_BOOLEAN;
+ rc = (jintLong)G_TYPE_BOOLEAN;
OS_NATIVE_EXIT(env, that, _1G_1TYPE_1BOOLEAN_FUNC);
return rc;
}
#endif
#ifndef NO__1G_1TYPE_1INT
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1INT)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1INT)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1TYPE_1INT_FUNC);
- rc = (jint)G_TYPE_INT;
+ rc = (jintLong)G_TYPE_INT;
OS_NATIVE_EXIT(env, that, _1G_1TYPE_1INT_FUNC);
return rc;
}
#endif
#ifndef NO__1G_1TYPE_1STRING
-JNIEXPORT jint JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1G_1TYPE_1STRING)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1G_1TYPE_1STRING_FUNC);
- rc = (jint)G_TYPE_STRING;
+ rc = (jintLong)G_TYPE_STRING;
OS_NATIVE_EXIT(env, that, _1G_1TYPE_1STRING_FUNC);
return rc;
}
@@ -1561,20 +1620,32 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1PIXELS)
#endif
#ifndef NO__1PANGO_1TYPE_1FONT_1DESCRIPTION
-JNIEXPORT jint JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1FONT_1DESCRIPTION)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
- rc = (jint)PANGO_TYPE_FONT_DESCRIPTION;
+ rc = (jintLong)PANGO_TYPE_FONT_DESCRIPTION;
OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC);
return rc;
}
#endif
+#ifndef NO__1PANGO_1TYPE_1LAYOUT
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1PANGO_1TYPE_1LAYOUT)
+ (JNIEnv *env, jclass that)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC);
+ rc = (jintLong)PANGO_TYPE_LAYOUT;
+ OS_NATIVE_EXIT(env, that, _1PANGO_1TYPE_1LAYOUT_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1XCheckIfEvent
JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC);
@@ -1586,7 +1657,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckIfEvent)
#ifndef NO__1XCheckMaskEvent
JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckMaskEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1XCheckMaskEvent_FUNC);
@@ -1598,7 +1669,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckMaskEvent)
#ifndef NO__1XCheckWindowEvent
JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckWindowEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1XCheckWindowEvent_FUNC);
@@ -1609,12 +1680,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XCheckWindowEvent)
#endif
#ifndef NO__1XDefaultRootWindow
-JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultRootWindow)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XDefaultRootWindow)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XDefaultRootWindow_FUNC);
- rc = (jint)XDefaultRootWindow((Display *)arg0);
+ rc = (jintLong)XDefaultRootWindow((Display *)arg0);
OS_NATIVE_EXIT(env, that, _1XDefaultRootWindow_FUNC);
return rc;
}
@@ -1622,7 +1693,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultRootWindow)
#ifndef NO__1XDefaultScreen
JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XDefaultScreen_FUNC);
@@ -1634,7 +1705,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XDefaultScreen)
#ifndef NO__1XFlush
JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1XFlush_FUNC);
XFlush((Display *)arg0);
@@ -1644,7 +1715,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFlush)
#ifndef NO__1XFree
JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1XFree_FUNC);
XFree((void *)arg0);
@@ -1653,26 +1724,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
#endif
#ifndef NO__1XGetSelectionOwner
-JNIEXPORT jint JNICALL OS_NATIVE(_1XGetSelectionOwner)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XGetSelectionOwner)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XGetSelectionOwner_FUNC);
- rc = (jint)XGetSelectionOwner((Display *)arg0, (Atom)arg1);
+ rc = (jintLong)XGetSelectionOwner((Display *)arg0, (Atom)arg1);
OS_NATIVE_EXIT(env, that, _1XGetSelectionOwner_FUNC);
return rc;
}
#endif
#ifndef NO__1XInternAtom
-JNIEXPORT jint JNICALL OS_NATIVE(_1XInternAtom)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jboolean arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XInternAtom)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XInternAtom_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)XInternAtom((Display *)arg0, (char *)lparg1, (Bool)arg2);
+ rc = (jintLong)XInternAtom((Display *)arg0, (char *)lparg1, (Bool)arg2);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1XInternAtom_FUNC);
@@ -1682,7 +1753,7 @@ fail:
#ifndef NO__1XKeysymToKeycode
JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XKeysymToKeycode_FUNC);
@@ -1693,14 +1764,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XKeysymToKeycode)
#endif
#ifndef NO__1XListProperties
-JNIEXPORT jint JNICALL OS_NATIVE(_1XListProperties)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XListProperties)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
{
jint *lparg2=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XListProperties_FUNC);
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- rc = (jint)XListProperties((Display *)arg0, (Window)arg1, (int *)lparg2);
+ rc = (jintLong)XListProperties((Display *)arg0, (Window)arg1, (int *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1XListProperties_FUNC);
@@ -1710,10 +1781,10 @@ fail:
#ifndef NO__1XQueryPointer
JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
jint *lparg4=NULL;
jint *lparg5=NULL;
jint *lparg6=NULL;
@@ -1721,8 +1792,8 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
jint *lparg8=NULL;
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XQueryPointer_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 (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
@@ -1735,8 +1806,8 @@ fail:
if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1XQueryPointer_FUNC);
return rc;
}
@@ -1744,24 +1815,24 @@ fail:
#ifndef NO__1XQueryTree
JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryTree)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5)
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XQueryTree_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;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
rc = (jint)XQueryTree((Display *)arg0, (Window)arg1, (Window *)lparg2, (Window *)lparg3, (Window **)lparg4, (unsigned int *)lparg5);
fail:
if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1XQueryTree_FUNC);
return rc;
}
@@ -1769,7 +1840,7 @@ fail:
#ifndef NO__1XReconfigureWMWindow
JNIEXPORT jint JNICALL OS_NATIVE(_1XReconfigureWMWindow)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4)
{
XWindowChanges _arg4, *lparg4=NULL;
jint rc = 0;
@@ -1784,24 +1855,16 @@ fail:
#ifndef NO__1XRenderComposite
JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
{
OS_NATIVE_ENTER(env, that, _1XRenderComposite_FUNC);
/*
XRenderComposite(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderComposite_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderComposite");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
+ LOAD_FUNCTION(fp, XRenderComposite)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong, jintLong, jint, jint, jint, jint, jint, jint, jint, jint))fp)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
}
}
OS_NATIVE_EXIT(env, that, _1XRenderComposite_FUNC);
@@ -1809,29 +1872,20 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderComposite)
#endif
#ifndef NO__1XRenderCreatePicture
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderCreatePicture)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderCreatePicture)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
{
XRenderPictureAttributes _arg4, *lparg4=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XRenderCreatePicture_FUNC);
if (arg4) if ((lparg4 = getXRenderPictureAttributesFields(env, arg4, &_arg4)) == NULL) goto fail;
/*
- rc = (jint)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
+ rc = (jintLong)XRenderCreatePicture(arg0, arg1, arg2, arg3, lparg4);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, jint, jint, jint, XRenderPictureAttributes *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderCreatePicture_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderCreatePicture");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1, arg2, arg3, lparg4);
+ LOAD_FUNCTION(fp, XRenderCreatePicture)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, XRenderPictureAttributes *))fp)(arg0, arg1, arg2, arg3, lparg4);
}
}
fail:
@@ -1841,27 +1895,18 @@ fail:
#endif
#ifndef NO__1XRenderFindStandardFormat
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XRenderFindStandardFormat_FUNC);
/*
- rc = (jint)XRenderFindStandardFormat(arg0, arg1);
+ rc = (jintLong)XRenderFindStandardFormat(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderFindStandardFormat_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderFindStandardFormat");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, XRenderFindStandardFormat)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1XRenderFindStandardFormat_FUNC);
@@ -1870,27 +1915,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindStandardFormat)
#endif
#ifndef NO__1XRenderFindVisualFormat
-JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XRenderFindVisualFormat_FUNC);
/*
- rc = (jint)XRenderFindVisualFormat(arg0, arg1);
+ rc = (jintLong)XRenderFindVisualFormat(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderFindVisualFormat_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderFindVisualFormat");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, XRenderFindVisualFormat)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1XRenderFindVisualFormat_FUNC);
@@ -1900,24 +1936,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderFindVisualFormat)
#ifndef NO__1XRenderFreePicture
JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1XRenderFreePicture_FUNC);
/*
XRenderFreePicture(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderFreePicture_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderFreePicture");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, XRenderFreePicture)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1XRenderFreePicture_FUNC);
@@ -1926,7 +1954,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderFreePicture)
#ifndef NO__1XRenderQueryExtension
JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -1938,18 +1966,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1XRenderQueryExtension)
rc = (jboolean)XRenderQueryExtension(arg0, lparg1, lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint, jint *, jint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderQueryExtension_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderQueryExtension");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0, lparg1, lparg2);
+ LOAD_FUNCTION(fp, XRenderQueryExtension)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2);
}
}
fail:
@@ -1962,7 +1981,7 @@ fail:
#ifndef NO__1XRenderQueryVersion
JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -1974,18 +1993,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XRenderQueryVersion)
rc = (jint)XRenderQueryVersion(arg0, lparg1, lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, jint *, jint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderQueryVersion_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderQueryVersion");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, lparg1, lparg2);
+ LOAD_FUNCTION(fp, XRenderQueryVersion)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint *, jint *))fp)(arg0, lparg1, lparg2);
}
}
fail:
@@ -1998,7 +2008,7 @@ fail:
#ifndef NO__1XRenderSetPictureClipRectangles
JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jshortArray arg4, jint arg5)
{
jshort *lparg4=NULL;
OS_NATIVE_ENTER(env, that, _1XRenderSetPictureClipRectangles_FUNC);
@@ -2007,17 +2017,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureClipRectangles)
XRenderSetPictureClipRectangles(arg0, arg1, arg2, arg3, lparg4, arg5);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, jint, jint, jshort *, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderSetPictureClipRectangles_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureClipRectangles");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2, arg3, lparg4, arg5);
+ LOAD_FUNCTION(fp, XRenderSetPictureClipRectangles)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint, jshort *, jint))fp)(arg0, arg1, arg2, arg3, lparg4, arg5);
}
}
fail:
@@ -2028,7 +2030,7 @@ fail:
#ifndef NO__1XRenderSetPictureTransform
JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2)
{
jint *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1XRenderSetPictureTransform_FUNC);
@@ -2037,17 +2039,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XRenderSetPictureTransform)
XRenderSetPictureTransform(arg0, arg1, lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, jint *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(XRenderSetPictureTransform_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "XRenderSetPictureTransform");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, lparg2);
+ LOAD_FUNCTION(fp, XRenderSetPictureTransform)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong, jint *))fp)(arg0, arg1, lparg2);
}
}
fail:
@@ -2058,7 +2052,7 @@ fail:
#ifndef NO__1XSendEvent
JNIEXPORT jint JNICALL OS_NATIVE(_1XSendEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3, jintLong arg4)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XSendEvent_FUNC);
@@ -2069,24 +2063,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSendEvent)
#endif
#ifndef NO__1XSetErrorHandler
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSetErrorHandler)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetErrorHandler)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XSetErrorHandler_FUNC);
- rc = (jint)XSetErrorHandler((XErrorHandler)arg0);
+ rc = (jintLong)XSetErrorHandler((XErrorHandler)arg0);
OS_NATIVE_EXIT(env, that, _1XSetErrorHandler_FUNC);
return rc;
}
#endif
#ifndef NO__1XSetIOErrorHandler
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSetIOErrorHandler)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSetIOErrorHandler)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XSetIOErrorHandler_FUNC);
- rc = (jint)XSetIOErrorHandler((XIOErrorHandler)arg0);
+ rc = (jintLong)XSetIOErrorHandler((XIOErrorHandler)arg0);
OS_NATIVE_EXIT(env, that, _1XSetIOErrorHandler_FUNC);
return rc;
}
@@ -2094,7 +2088,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetIOErrorHandler)
#ifndef NO__1XSetInputFocus
JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XSetInputFocus_FUNC);
@@ -2106,7 +2100,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetInputFocus)
#ifndef NO__1XSetTransientForHint
JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XSetTransientForHint_FUNC);
@@ -2117,12 +2111,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSetTransientForHint)
#endif
#ifndef NO__1XSynchronize
-JNIEXPORT jint JNICALL OS_NATIVE(_1XSynchronize)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1XSynchronize)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1XSynchronize_FUNC);
- rc = (jint)XSynchronize((Display *)arg0, arg1);
+ rc = (jintLong)XSynchronize((Display *)arg0, arg1);
OS_NATIVE_EXIT(env, that, _1XSynchronize_FUNC);
return rc;
}
@@ -2130,7 +2124,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XSynchronize)
#ifndef NO__1XTestFakeButtonEvent
JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeButtonEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jintLong arg3)
{
OS_NATIVE_ENTER(env, that, _1XTestFakeButtonEvent_FUNC);
XTestFakeButtonEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
@@ -2140,7 +2134,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeButtonEvent)
#ifndef NO__1XTestFakeKeyEvent
JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2, jintLong arg3)
{
OS_NATIVE_ENTER(env, that, _1XTestFakeKeyEvent_FUNC);
XTestFakeKeyEvent((Display *)arg0, arg1, (Bool)arg2, (unsigned long)arg3);
@@ -2150,7 +2144,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeKeyEvent)
#ifndef NO__1XTestFakeMotionEvent
JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeMotionEvent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4)
{
OS_NATIVE_ENTER(env, that, _1XTestFakeMotionEvent_FUNC);
XTestFakeMotionEvent((Display *)arg0, arg1, arg2, arg3, (unsigned long)arg4);
@@ -2160,7 +2154,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XTestFakeMotionEvent)
#ifndef NO__1XWarpPointer
JNIEXPORT jint JNICALL OS_NATIVE(_1XWarpPointer)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1XWarpPointer_FUNC);
@@ -2172,7 +2166,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XWarpPointer)
#ifndef NO__1atk_1object_1add_1relationship
JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1atk_1object_1add_1relationship_FUNC);
@@ -2180,18 +2174,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
rc = (jboolean)atk_object_add_relationship((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(AtkObject *, AtkRelationType, AtkObject *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(atk_object_add_relationship_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "atk_object_add_relationship");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2);
+ LOAD_FUNCTION(fp, atk_object_add_relationship)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(AtkObject *, AtkRelationType, AtkObject *))fp)((AtkObject *)arg0, (AtkRelationType)arg1, (AtkObject *)arg2);
}
}
OS_NATIVE_EXIT(env, that, _1atk_1object_1add_1relationship_FUNC);
@@ -2200,12 +2185,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1atk_1object_1add_1relationship)
#endif
#ifndef NO__1call
-JNIEXPORT jint JNICALL OS_NATIVE(_1call)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1call)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1call_FUNC);
- rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
OS_NATIVE_EXIT(env, that, _1call_FUNC);
return rc;
}
@@ -2213,7 +2198,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1call)
#ifndef NO__1dlclose
JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1dlclose_FUNC);
@@ -2224,14 +2209,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1dlclose)
#endif
#ifndef NO__1dlopen
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlopen)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlopen)
(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1dlopen_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)dlopen((const char *)lparg0, arg1);
+ rc = (jintLong)dlopen((const char *)lparg0, arg1);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1dlopen_FUNC);
@@ -2240,14 +2225,14 @@ fail:
#endif
#ifndef NO__1dlsym
-JNIEXPORT jint JNICALL OS_NATIVE(_1dlsym)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1dlsym)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1dlsym_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)dlsym((void *)arg0, (const char *)lparg1);
+ rc = (jintLong)dlsym((void *)arg0, (const char *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1dlsym_FUNC);
@@ -2256,24 +2241,24 @@ fail:
#endif
#ifndef NO__1g_1cclosure_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1cclosure_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1cclosure_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1cclosure_1new_FUNC);
- rc = (jint)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
+ rc = (jintLong)g_cclosure_new((GCallback)arg0, (gpointer)arg1, (GClosureNotify)arg2);
OS_NATIVE_EXIT(env, that, _1g_1cclosure_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1closure_1ref
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1closure_1ref)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1closure_1ref)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1closure_1ref_FUNC);
- rc = (jint)g_closure_ref((GClosure *)arg0);
+ rc = (jintLong)g_closure_ref((GClosure *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1closure_1ref_FUNC);
return rc;
}
@@ -2281,7 +2266,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1closure_1ref)
#ifndef NO__1g_1closure_1unref
JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1closure_1unref_FUNC);
g_closure_unref((GClosure *)arg0);
@@ -2290,79 +2275,79 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1closure_1unref)
#endif
#ifndef NO__1g_1filename_1from_1uri
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
- jint rc = 0;
+ jintLong *lparg1=NULL;
+ jintLong *lparg2=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_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 = (jint)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ rc = (jintLong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1uri_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1filename_1from_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_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 = (jint)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ rc = (jintLong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1utf8_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1filename_1to_1uri
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
- rc = (jint)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ rc = (jintLong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1uri_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1filename_1to_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_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 = (jint)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ rc = (jintLong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1utf8_FUNC);
return rc;
}
@@ -2370,7 +2355,7 @@ fail:
#ifndef NO__1g_1free
JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1free_FUNC);
g_free((gpointer)arg0);
@@ -2380,7 +2365,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1free)
#ifndef NO__1g_1idle_1add
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1idle_1add_FUNC);
@@ -2391,24 +2376,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1idle_1add)
#endif
#ifndef NO__1g_1list_1append
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1append)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1append)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1append_FUNC);
- rc = (jint)g_list_append((GList *)arg0, (gpointer)arg1);
+ rc = (jintLong)g_list_append((GList *)arg0, (gpointer)arg1);
OS_NATIVE_EXIT(env, that, _1g_1list_1append_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1data)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1data)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1data_FUNC);
- rc = (jint)g_list_data((GList *)arg0);
+ rc = (jintLong)g_list_data((GList *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1list_1data_FUNC);
return rc;
}
@@ -2416,7 +2401,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1data)
#ifndef NO__1g_1list_1free
JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1list_1free_FUNC);
g_list_free((GList *)arg0);
@@ -2426,7 +2411,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free)
#ifndef NO__1g_1list_1free_11
JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1list_1free_11_FUNC);
g_list_free_1((GList *)arg0);
@@ -2436,7 +2421,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1free_11)
#ifndef NO__1g_1list_1length
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1length_FUNC);
@@ -2447,84 +2432,84 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1length)
#endif
#ifndef NO__1g_1list_1next
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1next)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1next)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1next_FUNC);
- rc = (jint)g_list_next(arg0);
+ rc = (jintLong)g_list_next(arg0);
OS_NATIVE_EXIT(env, that, _1g_1list_1next_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1nth
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1nth)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1nth_FUNC);
- rc = (jint)g_list_nth((GList *)arg0, (guint)arg1);
+ rc = (jintLong)g_list_nth((GList *)arg0, (guint)arg1);
OS_NATIVE_EXIT(env, that, _1g_1list_1nth_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1nth_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1nth_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1nth_1data)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1nth_1data_FUNC);
- rc = (jint)g_list_nth_data((GList *)arg0, (guint)arg1);
+ rc = (jintLong)g_list_nth_data((GList *)arg0, (guint)arg1);
OS_NATIVE_EXIT(env, that, _1g_1list_1nth_1data_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1prepend
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1prepend)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1prepend)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1prepend_FUNC);
- rc = (jint)g_list_prepend((GList *)arg0, (gpointer)arg1);
+ rc = (jintLong)g_list_prepend((GList *)arg0, (gpointer)arg1);
OS_NATIVE_EXIT(env, that, _1g_1list_1prepend_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1previous
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1previous)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1previous)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1previous_FUNC);
- rc = (jint)g_list_previous(arg0);
+ rc = (jintLong)g_list_previous(arg0);
OS_NATIVE_EXIT(env, that, _1g_1list_1previous_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1remove_1link
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1remove_1link)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1remove_1link)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1remove_1link_FUNC);
- rc = (jint)g_list_remove_link((GList *)arg0, (GList *)arg1);
+ rc = (jintLong)g_list_remove_link((GList *)arg0, (GList *)arg1);
OS_NATIVE_EXIT(env, that, _1g_1list_1remove_1link_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1list_1reverse
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1reverse)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1list_1reverse)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1list_1reverse_FUNC);
- rc = (jint)g_list_reverse((GList *)arg0);
+ rc = (jintLong)g_list_reverse((GList *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1list_1reverse_FUNC);
return rc;
}
@@ -2532,7 +2517,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1list_1reverse)
#ifndef NO__1g_1list_1set_1next
JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1g_1list_1set_1next_FUNC);
g_list_set_next((GList *)arg0, (GList *)arg1);
@@ -2542,7 +2527,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1next)
#ifndef NO__1g_1list_1set_1previous
JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1g_1list_1set_1previous_FUNC);
g_list_set_previous((GList *)arg0, (GList *)arg1);
@@ -2551,44 +2536,44 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1list_1set_1previous)
#endif
#ifndef NO__1g_1locale_1from_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1locale_1from_1utf8)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1locale_1from_1utf8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1locale_1from_1utf8_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 = (jint)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ rc = (jintLong)g_locale_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1g_1locale_1from_1utf8_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1locale_1to_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1locale_1to_1utf8)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1locale_1to_1utf8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1locale_1to_1utf8_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 = (jint)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
-fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ rc = (jintLong)g_locale_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
+fail:
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1g_1locale_1to_1utf8_FUNC);
return rc;
}
@@ -2596,7 +2581,7 @@ fail:
#ifndef NO__1g_1log_1default_1handler
JNIEXPORT void JNICALL OS_NATIVE(_1g_1log_1default_1handler)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
{
OS_NATIVE_ENTER(env, that, _1g_1log_1default_1handler_FUNC);
g_log_default_handler((gchar *)arg0, (GLogLevelFlags)arg1, (gchar *)arg2, (gpointer)arg3);
@@ -2620,7 +2605,7 @@ fail:
#ifndef NO__1g_1log_1set_1handler
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1log_1set_1handler)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintLong arg2, jintLong arg3)
{
jbyte *lparg0=NULL;
jint rc = 0;
@@ -2636,7 +2621,7 @@ fail:
#ifndef NO__1g_1main_1context_1acquire
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1acquire_FUNC);
@@ -2648,7 +2633,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1acquire)
#ifndef NO__1g_1main_1context_1check
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1check_FUNC);
@@ -2659,24 +2644,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1check)
#endif
#ifndef NO__1g_1main_1context_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1default)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1default_FUNC);
- rc = (jint)g_main_context_default();
+ rc = (jintLong)g_main_context_default();
OS_NATIVE_EXIT(env, that, _1g_1main_1context_1default_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1main_1context_1get_1poll_1func
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
- rc = (jint)g_main_context_get_poll_func((GMainContext *)arg0);
+ rc = (jintLong)g_main_context_get_poll_func((GMainContext *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1main_1context_1get_1poll_1func_FUNC);
return rc;
}
@@ -2684,7 +2669,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1get_1poll_1func)
#ifndef NO__1g_1main_1context_1iteration
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1iteration_FUNC);
@@ -2696,7 +2681,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1iteration)
#ifndef NO__1g_1main_1context_1pending
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1pending)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1pending_FUNC);
@@ -2708,7 +2693,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1pending)
#ifndef NO__1g_1main_1context_1prepare
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1main_1context_1prepare)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
{
jint *lparg1=NULL;
jboolean rc = 0;
@@ -2724,7 +2709,7 @@ fail:
#ifndef NO__1g_1main_1context_1query
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1main_1context_1query)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintLong arg3, jint arg4)
{
jint *lparg2=NULL;
jint rc = 0;
@@ -2740,7 +2725,7 @@ fail:
#ifndef NO__1g_1main_1context_1release
JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1main_1context_1release_FUNC);
g_main_context_release((GMainContext *)arg0);
@@ -2749,12 +2734,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1main_1context_1release)
#endif
#ifndef NO__1g_1malloc
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1malloc)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1malloc)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1malloc_FUNC);
- rc = (jint)g_malloc((gulong)arg0);
+ rc = (jintLong)g_malloc((gulong)arg0);
OS_NATIVE_EXIT(env, that, _1g_1malloc_FUNC);
return rc;
}
@@ -2762,7 +2747,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1malloc)
#ifndef NO__1g_1object_1get
JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1get)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
{
jbyte *lparg1=NULL;
jint *lparg2=NULL;
@@ -2778,117 +2763,186 @@ fail:
#endif
#ifndef NO__1g_1object_1get_1qdata
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1get_1qdata)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1object_1get_1qdata_FUNC);
- rc = (jint)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
+ rc = (jintLong)g_object_get_qdata((GObject *)arg0, (GQuark)arg1);
OS_NATIVE_EXIT(env, that, _1g_1object_1get_1qdata_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1object_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1object_1new_FUNC);
- rc = (jint)g_object_new((GType)arg0, (const gchar *)arg1);
+ rc = (jintLong)g_object_new((GType)arg0, (const gchar *)arg1);
OS_NATIVE_EXIT(env, that, _1g_1object_1new_FUNC);
return rc;
}
#endif
+#ifndef NO__1g_1object_1notify
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1notify)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+ jbyte *lparg1=NULL;
+ OS_NATIVE_ENTER(env, that, _1g_1object_1notify_FUNC);
+ if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ g_object_notify((GObject *)arg0, (const gchar *)lparg1);
+fail:
+ if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ OS_NATIVE_EXIT(env, that, _1g_1object_1notify_FUNC);
+}
+#endif
+
#ifndef NO__1g_1object_1ref
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1object_1ref)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1object_1ref)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1object_1ref_FUNC);
- rc = (jint)g_object_ref((gpointer)arg0);
+ rc = (jintLong)g_object_ref((gpointer)arg0);
OS_NATIVE_EXIT(env, that, _1g_1object_1ref_FUNC);
return rc;
}
#endif
-#ifndef NO__1g_1object_1set__I_3BFI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jfloat arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BFI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BFJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BFI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BFJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jfloat arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BFI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BFJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BFI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BFJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1object_1set__I_3BII
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BIJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BII_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BIJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BII_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BIJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1object_1set__I_3BJI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jlong arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BJI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BJI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlong arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BJI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BJJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BJI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BJJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
GdkColor _arg2, *lparg2=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
g_object_set((gpointer)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
fail:
if (arg2 && lparg2) setGdkColorFields(env, arg2, lparg2);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1object_1set__I_3BZI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jboolean arg2, jint arg3)
+#if (!defined(NO__1g_1object_1set__I_3BZI) && !defined(JNI64)) || (!defined(NO__1g_1object_1set__J_3BZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__I_3BZI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set__J_3BZJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jboolean arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1object_1set__I_3BZI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1object_1set__J_3BZJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_object_set((gpointer)arg0, (const gchar *)lparg1, arg2, (const gchar *)NULL);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1object_1set__I_3BZI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1object_1set__J_3BZJ_FUNC);
+#endif
}
#endif
#ifndef NO__1g_1object_1set_1qdata
JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1g_1object_1set_1qdata_FUNC);
g_object_set_qdata((GObject *)arg0, (GQuark)arg1, (gpointer)arg2);
@@ -2898,7 +2952,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1set_1qdata)
#ifndef NO__1g_1object_1unref
JNIEXPORT void JNICALL OS_NATIVE(_1g_1object_1unref)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1object_1unref_FUNC);
g_object_unref((gpointer)arg0);
@@ -2937,12 +2991,12 @@ fail:
#endif
#ifndef NO__1g_1signal_1add_1emission_1hook
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3, jintLong arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
- rc = (jint)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
+ rc = (jintLong)g_signal_add_emission_hook((guint)arg0, (GQuark)arg1, (GSignalEmissionHook)arg2, (gpointer)arg3, (GDestroyNotify)arg4);
OS_NATIVE_EXIT(env, that, _1g_1signal_1add_1emission_1hook_FUNC);
return rc;
}
@@ -2950,7 +3004,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1add_1emission_1hook)
#ifndef NO__1g_1signal_1connect
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
{
jbyte *lparg1=NULL;
jint rc = 0;
@@ -2966,7 +3020,7 @@ fail:
#ifndef NO__1g_1signal_1connect_1after
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1after)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
{
jbyte *lparg1=NULL;
jint rc = 0;
@@ -2982,7 +3036,7 @@ fail:
#ifndef NO__1g_1signal_1connect_1closure
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jboolean arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jboolean arg3)
{
jbyte *lparg1=NULL;
jint rc = 0;
@@ -2998,7 +3052,7 @@ fail:
#ifndef NO__1g_1signal_1connect_1closure_1by_1id
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jboolean arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLong arg3, jboolean arg4)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1signal_1connect_1closure_1by_1id_FUNC);
@@ -3008,68 +3062,112 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1connect_1closure_1by_1id)
}
#endif
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3B
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BI) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3BII
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3BII) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3BJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3BII)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3BJJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, arg2, arg3);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3BII_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1g_1signal_1emit_1by_1name__I_3B_3B
-JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+#if (!defined(NO__1g_1signal_1emit_1by_1name__I_3B_3B) && !defined(JNI64)) || (!defined(NO__1g_1signal_1emit_1by_1name__J_3B_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__I_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1emit_1by_1name__J_3B_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
+#endif
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
g_signal_emit_by_name((gpointer)arg0, (const gchar *)lparg1, lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__I_3B_3B_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC);
+#endif
}
#endif
#ifndef NO__1g_1signal_1handler_1disconnect
JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1g_1signal_1handler_1disconnect_FUNC);
g_signal_handler_disconnect((gpointer)arg0, (gulong)arg1);
@@ -3079,7 +3177,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1handler_1disconnect)
#ifndef NO__1g_1signal_1handlers_1block_1matched
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1block_1matched_FUNC);
@@ -3091,7 +3189,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1block_1matched)
#ifndef NO__1g_1signal_1handlers_1disconnect_1matched
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1disconnect_1matched)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1disconnect_1matched_FUNC);
@@ -3103,7 +3201,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1disconnect_1matched)
#ifndef NO__1g_1signal_1handlers_1unblock_1matched
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintLong arg4, jintLong arg5, jintLong arg6)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1signal_1handlers_1unblock_1matched_FUNC);
@@ -3115,7 +3213,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1handlers_1unblock_1matched)
#ifndef NO__1g_1signal_1lookup
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1signal_1lookup)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
{
jbyte *lparg0=NULL;
jint rc = 0;
@@ -3131,7 +3229,7 @@ fail:
#ifndef NO__1g_1signal_1remove_1emission_1hook
JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jint arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1g_1signal_1remove_1emission_1hook_FUNC);
g_signal_remove_emission_hook((guint)arg0, (gulong)arg1);
@@ -3141,7 +3239,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1remove_1emission_1hook)
#ifndef NO__1g_1signal_1stop_1emission_1by_1name
JNIEXPORT void JNICALL OS_NATIVE(_1g_1signal_1stop_1emission_1by_1name)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1g_1signal_1stop_1emission_1by_1name_FUNC);
@@ -3154,12 +3252,12 @@ fail:
#endif
#ifndef NO__1g_1slist_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1data)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1data)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1slist_1data_FUNC);
- rc = (jint)g_slist_data((GSList *)arg0);
+ rc = (jintLong)g_slist_data((GSList *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1slist_1data_FUNC);
return rc;
}
@@ -3167,7 +3265,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1data)
#ifndef NO__1g_1slist_1free
JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1slist_1free_FUNC);
g_slist_free((GSList *)arg0);
@@ -3177,7 +3275,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1slist_1free)
#ifndef NO__1g_1slist_1length
JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1slist_1length_FUNC);
@@ -3188,12 +3286,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1length)
#endif
#ifndef NO__1g_1slist_1next
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1next)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1slist_1next)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1slist_1next_FUNC);
- rc = (jint)g_slist_next((GSList *)arg0);
+ rc = (jintLong)g_slist_next((GSList *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1slist_1next_FUNC);
return rc;
}
@@ -3201,7 +3299,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1slist_1next)
#ifndef NO__1g_1source_1remove
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1source_1remove_FUNC);
@@ -3213,7 +3311,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1source_1remove)
#ifndef NO__1g_1strfreev
JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1strfreev_FUNC);
g_strfreev((gchar **)arg0);
@@ -3223,15 +3321,15 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1strfreev)
#ifndef NO__1g_1strtod
JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1strtod_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
rc = (jdouble)g_strtod((const gchar *)arg0, (gchar **)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1g_1strtod_FUNC);
return rc;
}
@@ -3239,7 +3337,7 @@ fail:
#ifndef NO__1g_1thread_1init
JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1g_1thread_1init_FUNC);
g_thread_init((GThreadFunctions *)arg0);
@@ -3261,7 +3359,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported)
#ifndef NO__1g_1type_1add_1interface_1static
JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1g_1type_1add_1interface_1static_FUNC);
g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2);
@@ -3270,38 +3368,60 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1add_1interface_1static)
#endif
#ifndef NO__1g_1type_1class_1peek
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1class_1peek)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_FUNC);
- rc = (jint)g_type_class_peek((GType)arg0);
+ rc = (jintLong)g_type_class_peek((GType)arg0);
OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1type_1class_1peek_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1peek_1parent)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1class_1peek_1parent_FUNC);
- rc = (jint)g_type_class_peek_parent((gpointer)arg0);
+ rc = (jintLong)g_type_class_peek_parent((gpointer)arg0);
OS_NATIVE_EXIT(env, that, _1g_1type_1class_1peek_1parent_FUNC);
return rc;
}
#endif
+#ifndef NO__1g_1type_1class_1ref
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1class_1ref)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1g_1type_1class_1ref_FUNC);
+ rc = (jintLong)g_type_class_ref((GType)arg0);
+ OS_NATIVE_EXIT(env, that, _1g_1type_1class_1ref_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1g_1type_1class_1unref
+JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1class_1unref)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ OS_NATIVE_ENTER(env, that, _1g_1type_1class_1unref_FUNC);
+ g_type_class_unref((gpointer)arg0);
+ OS_NATIVE_EXIT(env, that, _1g_1type_1class_1unref_FUNC);
+}
+#endif
+
#ifndef NO__1g_1type_1from_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1from_1name)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1from_1name)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1from_1name_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)g_type_from_name((const gchar *)lparg0);
+ rc = (jintLong)g_type_from_name((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1g_1type_1from_1name_FUNC);
@@ -3310,12 +3430,12 @@ fail:
#endif
#ifndef NO__1g_1type_1interface_1peek_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
- rc = (jint)g_type_interface_peek_parent((gpointer)arg0);
+ rc = (jintLong)g_type_interface_peek_parent((gpointer)arg0);
OS_NATIVE_EXIT(env, that, _1g_1type_1interface_1peek_1parent_FUNC);
return rc;
}
@@ -3323,7 +3443,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1interface_1peek_1parent)
#ifndef NO__1g_1type_1is_1a
JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1is_1a_FUNC);
@@ -3334,24 +3454,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1type_1is_1a)
#endif
#ifndef NO__1g_1type_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1name_FUNC);
- rc = (jint)g_type_name((GType)arg0);
+ rc = (jintLong)g_type_name((GType)arg0);
OS_NATIVE_EXIT(env, that, _1g_1type_1name_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1type_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1parent)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1parent)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1parent_FUNC);
- rc = (jint)g_type_parent((GType)arg0);
+ rc = (jintLong)g_type_parent((GType)arg0);
OS_NATIVE_EXIT(env, that, _1g_1type_1parent_FUNC);
return rc;
}
@@ -3359,7 +3479,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1parent)
#ifndef NO__1g_1type_1query
JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1g_1type_1query_FUNC);
g_type_query((GType)arg0, (GTypeQuery *)arg1);
@@ -3368,14 +3488,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1type_1query)
#endif
#ifndef NO__1g_1type_1register_1static
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1type_1register_1static)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1type_1register_1static)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1type_1register_1static_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
+ rc = (jintLong)g_type_register_static((GType)arg0, (const gchar *)lparg1, (const GTypeInfo *)arg2, (GTypeFlags)arg3);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1g_1type_1register_1static_FUNC);
@@ -3384,14 +3504,14 @@ fail:
#endif
#ifndef NO__1g_1utf16_1to_1utf8
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
- (JNIEnv *env, jclass that, jcharArray arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
+ (JNIEnv *env, jclass that, jcharArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
{
jchar *lparg0=NULL;
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3403,11 +3523,11 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
#endif
{
if (arg0) if ((lparg0 = (*env)->GetCharArrayElements(env, arg0, NULL)) == NULL) goto fail;
- 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;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
}
- rc = (jint)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+ rc = (jintLong)g_utf16_to_utf8((const gunichar2 *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3418,9 +3538,9 @@ fail:
} else
#endif
{
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
if (arg0 && lparg0) (*env)->ReleaseCharArrayElements(env, arg0, lparg0, JNI_ABORT);
}
OS_NATIVE_EXIT(env, that, _1g_1utf16_1to_1utf8_FUNC);
@@ -3429,50 +3549,57 @@ fail:
#endif
#ifndef NO__1g_1utf8_1offset_1to_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1offset_1to_1pointer)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC);
- rc = (jint)g_utf8_offset_to_pointer((const gchar *)arg0, arg1);
+ rc = (jintLong)g_utf8_offset_to_pointer((const gchar *)arg0, arg1);
OS_NATIVE_EXIT(env, that, _1g_1utf8_1offset_1to_1pointer_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1utf8_1pointer_1to_1offset
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1pointer_1to_1offset)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
- rc = (jint)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
+ rc = (jintLong)g_utf8_pointer_to_offset((const gchar *)arg0, (const gchar *)arg1);
OS_NATIVE_EXIT(env, that, _1g_1utf8_1pointer_1to_1offset_FUNC);
return rc;
}
#endif
#ifndef NO__1g_1utf8_1strlen
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1strlen)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1strlen)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1utf8_1strlen_FUNC);
- rc = (jint)g_utf8_strlen((const gchar *)arg0, arg1);
+ rc = (jintLong)g_utf8_strlen((const gchar *)arg0, arg1);
OS_NATIVE_EXIT(env, that, _1g_1utf8_1strlen_FUNC);
return rc;
}
#endif
-#ifndef NO__1g_1utf8_1to_1utf16__II_3I_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO__1g_1utf8_1to_1utf16__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
{
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
@@ -3481,11 +3608,11 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__II_3I_3I_3I)
} else
#endif
{
- 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;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
}
- rc = (jint)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+ rc = (jintLong)g_utf8_to_utf16((const gchar *)arg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3495,25 +3622,36 @@ fail:
} else
#endif
{
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
}
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO__1g_1utf8_1to_1utf16___3BI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+#endif
{
jbyte *lparg0=NULL;
- jint *lparg2=NULL;
- jint *lparg3=NULL;
- jint *lparg4=NULL;
- jint rc = 0;
+ jintLong *lparg2=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
+ jintLong rc = 0;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
+#endif
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -3524,11 +3662,11 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BI_3I_3I_3I)
#endif
{
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- 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;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
}
- rc = (jint)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
+ rc = (jintLong)g_utf8_to_utf16((const gchar *)lparg0, (glong)arg1, (glong *)lparg2, (glong *)lparg3, (GError **)lparg4);
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3539,34 +3677,38 @@ fail:
} else
#endif
{
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
}
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
+#endif
return rc;
}
#endif
#ifndef NO__1g_1value_1peek_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1g_1value_1peek_1pointer)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1g_1value_1peek_1pointer_FUNC);
- rc = (jint)g_value_peek_pointer((const GValue *)arg0);
+ rc = (jintLong)g_value_peek_pointer((const GValue *)arg0);
OS_NATIVE_EXIT(env, that, _1g_1value_1peek_1pointer_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1atom_1intern
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1intern)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1intern)
(JNIEnv *env, jclass that, jbyteArray arg0, jboolean arg1)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1atom_1intern_FUNC);
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3576,7 +3718,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1intern)
{
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
}
- rc = (jint)gdk_atom_intern((const gchar *)lparg0, arg1);
+ rc = (jintLong)gdk_atom_intern((const gchar *)lparg0, arg1);
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3592,12 +3734,12 @@ fail:
#endif
#ifndef NO__1gdk_1atom_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1atom_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1atom_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1atom_1name_FUNC);
- rc = (jint)gdk_atom_name((GdkAtom)arg0);
+ rc = (jintLong)gdk_atom_name((GdkAtom)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1atom_1name_FUNC);
return rc;
}
@@ -3614,11 +3756,11 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1beep)
#endif
#ifndef NO__1gdk_1bitmap_1create_1from_1data
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1bitmap_1create_1from_1data_FUNC);
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3628,7 +3770,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1bitmap_1create_1from_1data)
{
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
}
- rc = (jint)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
+ rc = (jintLong)gdk_bitmap_create_from_data((GdkWindow *)arg0, (const gchar *)lparg1, (gint)arg2, (gint)arg3);
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -3643,26 +3785,38 @@ fail:
}
#endif
+#ifndef NO__1gdk_1cairo_1create
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cairo_1create)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1create_FUNC);
+/*
+ rc = (jintLong)gdk_cairo_create(arg0);
+*/
+ {
+ LOAD_FUNCTION(fp, gdk_cairo_create)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1create_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gdk_1cairo_1region
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1region_FUNC);
/*
gdk_cairo_region(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_cairo_region_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_cairo_region");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gdk_cairo_region)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1cairo_1region_FUNC);
@@ -3671,7 +3825,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1region)
#ifndef NO__1gdk_1cairo_1set_1source_1color
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1cairo_1set_1source_1color_FUNC);
@@ -3680,17 +3834,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cairo_1set_1source_1color)
gdk_cairo_set_source_color(arg0, lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, GdkColor *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_cairo_set_source_color_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_cairo_set_source_color");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, lparg1);
+ LOAD_FUNCTION(fp, gdk_cairo_set_source_color)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, GdkColor *))fp)(arg0, lparg1);
}
}
fail:
@@ -3701,7 +3847,7 @@ fail:
#ifndef NO__1gdk_1color_1white
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1color_1white)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
jboolean rc = 0;
@@ -3717,7 +3863,7 @@ fail:
#ifndef NO__1gdk_1colormap_1alloc_1color
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1colormap_1alloc_1color)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2, jboolean arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2, jboolean arg3)
{
GdkColor _arg1, *lparg1=NULL;
jboolean rc = 0;
@@ -3733,7 +3879,7 @@ fail:
#ifndef NO__1gdk_1colormap_1free_1colors
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1free_1colors)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1free_1colors_FUNC);
@@ -3745,12 +3891,12 @@ fail:
#endif
#ifndef NO__1gdk_1colormap_1get_1system
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1get_1system_FUNC);
- rc = (jint)gdk_colormap_get_system();
+ rc = (jintLong)gdk_colormap_get_system();
OS_NATIVE_EXIT(env, that, _1gdk_1colormap_1get_1system_FUNC);
return rc;
}
@@ -3758,7 +3904,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1colormap_1get_1system)
#ifndef NO__1gdk_1colormap_1query_1color
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1colormap_1query_1color)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1colormap_1query_1color_FUNC);
@@ -3772,7 +3918,7 @@ fail:
#ifndef NO__1gdk_1cursor_1destroy
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1destroy_FUNC);
gdk_cursor_destroy((GdkCursor *)arg0);
@@ -3781,39 +3927,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1cursor_1destroy)
#endif
#ifndef NO__1gdk_1cursor_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_FUNC);
- rc = (jint)gdk_cursor_new((GdkCursorType)arg0);
+ rc = (jintLong)gdk_cursor_new((GdkCursorType)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1cursor_1new_1from_1pixbuf
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
/*
- rc = (jint)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
+ rc = (jintLong)gdk_cursor_new_from_pixbuf(arg0, arg1, arg2, arg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, jint, jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_cursor_new_from_pixbuf_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_cursor_new_from_pixbuf");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1, arg2, arg3);
+ LOAD_FUNCTION(fp, gdk_cursor_new_from_pixbuf)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jint))fp)(arg0, arg1, arg2, arg3);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixbuf_FUNC);
@@ -3822,16 +3959,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixbuf)
#endif
#ifndef NO__1gdk_1cursor_1new_1from_1pixmap
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1cursor_1new_1from_1pixmap)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jint arg4, jint arg5)
{
GdkColor _arg2, *lparg2=NULL;
GdkColor _arg3, *lparg3=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
if (arg2) if ((lparg2 = getGdkColorFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
- rc = (jint)gdk_cursor_new_from_pixmap((GdkPixmap *)arg0, (GdkPixmap *)arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
+ rc = (jintLong)gdk_cursor_new_from_pixmap((GdkPixmap *)arg0, (GdkPixmap *)arg1, (GdkColor *)lparg2, (GdkColor *)lparg3, (gint)arg4, (gint)arg5);
fail:
OS_NATIVE_EXIT(env, that, _1gdk_1cursor_1new_1from_1pixmap_FUNC);
return rc;
@@ -3839,27 +3976,18 @@ fail:
#endif
#ifndef NO__1gdk_1display_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1display_1get_1default_FUNC);
/*
- rc = (jint)gdk_display_get_default();
+ rc = (jintLong)gdk_display_get_default();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_display_get_default_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_display_get_default");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gdk_display_get_default)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1display_1get_1default_FUNC);
@@ -3869,7 +3997,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1display_1get_1default)
#ifndef NO__1gdk_1display_1supports_1cursor_1color
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
@@ -3877,18 +4005,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
rc = (jboolean)gdk_display_supports_cursor_color(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_display_supports_cursor_color_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_display_supports_cursor_color");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gdk_display_supports_cursor_color)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1display_1supports_1cursor_1color_FUNC);
@@ -3898,7 +4017,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1display_1supports_1cursor_1color)
#ifndef NO__1gdk_1drag_1status
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1drag_1status_FUNC);
gdk_drag_status((GdkDragContext *)arg0, (GdkDragAction)arg1, (guint32)arg2);
@@ -3908,7 +4027,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drag_1status)
#ifndef NO__1gdk_1draw_1arc
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1arc_FUNC);
gdk_draw_arc((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
@@ -3918,7 +4037,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1arc)
#ifndef NO__1gdk_1draw_1drawable
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1drawable)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1drawable_FUNC);
gdk_draw_drawable((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkDrawable *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8);
@@ -3928,7 +4047,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1drawable)
#ifndef NO__1gdk_1draw_1image
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1image_FUNC);
gdk_draw_image((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkImage *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
@@ -3938,7 +4057,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1image)
#ifndef NO__1gdk_1draw_1layout
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1layout_FUNC);
gdk_draw_layout((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (PangoLayout *)arg4);
@@ -3948,7 +4067,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout)
#ifndef NO__1gdk_1draw_1layout_1with_1colors
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1layout_1with_1colors)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jobject arg5, jobject arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4, jobject arg5, jobject arg6)
{
GdkColor _arg5, *lparg5=NULL;
GdkColor _arg6, *lparg6=NULL;
@@ -3963,7 +4082,7 @@ fail:
#ifndef NO__1gdk_1draw_1line
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1line)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1line_FUNC);
gdk_draw_line((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5);
@@ -3973,7 +4092,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1line)
#ifndef NO__1gdk_1draw_1lines
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1lines)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
{
jint *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1lines_FUNC);
@@ -4001,24 +4120,16 @@ fail:
#ifndef NO__1gdk_1draw_1pixbuf
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1pixbuf_FUNC);
/*
gdk_draw_pixbuf((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GdkDrawable *, GdkGC *, GdkPixbuf *, gint, gint, gint, gint, gint, gint, GdkRgbDither, gint, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_draw_pixbuf_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_draw_pixbuf");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11);
+ LOAD_FUNCTION(fp, gdk_draw_pixbuf)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GdkDrawable *, GdkGC *, GdkPixbuf *, gint, gint, gint, gint, gint, gint, GdkRgbDither, gint, gint))fp)((GdkDrawable *)arg0, (GdkGC *)arg1, (GdkPixbuf *)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6, (gint)arg7, (gint)arg8, (GdkRgbDither)arg9, (gint)arg10, (gint)arg11);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1draw_1pixbuf_FUNC);
@@ -4027,7 +4138,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1pixbuf)
#ifndef NO__1gdk_1draw_1point
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1point)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1point_FUNC);
gdk_draw_point((GdkDrawable *)arg0, (GdkGC *)arg1, arg2, arg3);
@@ -4037,7 +4148,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1point)
#ifndef NO__1gdk_1draw_1polygon
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1polygon)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
{
jint *lparg3=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1polygon_FUNC);
@@ -4065,7 +4176,7 @@ fail:
#ifndef NO__1gdk_1draw_1rectangle
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
{
OS_NATIVE_ENTER(env, that, _1gdk_1draw_1rectangle_FUNC);
gdk_draw_rectangle((GdkDrawable *)arg0, (GdkGC *)arg1, (gint)arg2, (gint)arg3, (gint)arg4, (gint)arg5, (gint)arg6);
@@ -4075,7 +4186,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1draw_1rectangle)
#ifndef NO__1gdk_1drawable_1get_1depth
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1depth_FUNC);
@@ -4086,12 +4197,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1depth)
#endif
#ifndef NO__1gdk_1drawable_1get_1image
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1image_FUNC);
- rc = (jint)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
+ rc = (jintLong)gdk_drawable_get_image((GdkDrawable *)arg0, (gint)arg1, (gint)arg2, (gint)arg3, (gint)arg4);
OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1image_FUNC);
return rc;
}
@@ -4099,7 +4210,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1image)
#ifndef NO__1gdk_1drawable_1get_1size
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1drawable_1get_1size)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -4131,12 +4242,12 @@ fail:
#endif
#ifndef NO__1gdk_1drawable_1get_1visible_1region
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1drawable_1get_1visible_1region)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
- rc = (jint)gdk_drawable_get_visible_region((GdkDrawable *)arg0);
+ rc = (jintLong)gdk_drawable_get_visible_region((GdkDrawable *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1drawable_1get_1visible_1region_FUNC);
return rc;
}
@@ -4165,12 +4276,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1error_1trap_1push)
#endif
#ifndef NO__1gdk_1event_1copy
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1copy)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1copy)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1event_1copy_FUNC);
- rc = (jint)gdk_event_copy((GdkEvent *)arg0);
+ rc = (jintLong)gdk_event_copy((GdkEvent *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1event_1copy_FUNC);
return rc;
}
@@ -4178,7 +4289,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1copy)
#ifndef NO__1gdk_1event_1free
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1event_1free_FUNC);
gdk_event_free((GdkEvent *)arg0);
@@ -4187,12 +4298,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1free)
#endif
#ifndef NO__1gdk_1event_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_FUNC);
- rc = (jint)gdk_event_get();
+ rc = (jintLong)gdk_event_get();
OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_FUNC);
return rc;
}
@@ -4200,7 +4311,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get)
#ifndef NO__1gdk_1event_1get_1coords
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1coords)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -4218,12 +4329,12 @@ fail:
#endif
#ifndef NO__1gdk_1event_1get_1graphics_1expose
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1graphics_1expose_FUNC);
- rc = (jint)gdk_event_get_graphics_expose((GdkWindow *)arg0);
+ rc = (jintLong)gdk_event_get_graphics_expose((GdkWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1event_1get_1graphics_1expose_FUNC);
return rc;
}
@@ -4231,7 +4342,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1graphics_1expose)
#ifndef NO__1gdk_1event_1get_1root_1coords
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1root_1coords)
- (JNIEnv *env, jclass that, jint arg0, jdoubleArray arg1, jdoubleArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1, jdoubleArray arg2)
{
jdouble *lparg1=NULL;
jdouble *lparg2=NULL;
@@ -4250,7 +4361,7 @@ fail:
#ifndef NO__1gdk_1event_1get_1state
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1event_1get_1state)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
{
jint *lparg1=NULL;
jboolean rc = 0;
@@ -4266,7 +4377,7 @@ fail:
#ifndef NO__1gdk_1event_1get_1time
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1event_1get_1time_FUNC);
@@ -4278,7 +4389,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1get_1time)
#ifndef NO__1gdk_1event_1handler_1set
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1event_1handler_1set_FUNC);
gdk_event_handler_set((GdkEventFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2);
@@ -4287,24 +4398,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1handler_1set)
#endif
#ifndef NO__1gdk_1event_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1new)
(JNIEnv *env, jclass that, jint arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1event_1new_FUNC);
- rc = (jint)gdk_event_new(arg0);
+ rc = (jintLong)gdk_event_new(arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1event_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1event_1peek
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1peek)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1event_1peek)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1event_1peek_FUNC);
- rc = (jint)gdk_event_peek();
+ rc = (jintLong)gdk_event_peek();
OS_NATIVE_EXIT(env, that, _1gdk_1event_1peek_FUNC);
return rc;
}
@@ -4312,7 +4423,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1event_1peek)
#ifndef NO__1gdk_1event_1put
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1event_1put)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1event_1put_FUNC);
gdk_event_put((GdkEvent *)arg0);
@@ -4332,7 +4443,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1flush)
#ifndef NO__1gdk_1free_1text_1list
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1free_1text_1list)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1free_1text_1list_FUNC);
gdk_free_text_list((gchar **)arg0);
@@ -4342,7 +4453,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1free_1text_1list)
#ifndef NO__1gdk_1gc_1get_1values
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1get_1values)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkGCValues _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1get_1values_FUNC);
@@ -4355,12 +4466,12 @@ fail:
#endif
#ifndef NO__1gdk_1gc_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1gc_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1gc_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1new_FUNC);
- rc = (jint)gdk_gc_new((GdkDrawable *)arg0);
+ rc = (jintLong)gdk_gc_new((GdkDrawable *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1gc_1new_FUNC);
return rc;
}
@@ -4368,7 +4479,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1gc_1new)
#ifndef NO__1gdk_1gc_1set_1background
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1background)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1background_FUNC);
@@ -4381,7 +4492,7 @@ fail:
#ifndef NO__1gdk_1gc_1set_1clip_1mask
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1mask)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1mask_FUNC);
gdk_gc_set_clip_mask((GdkGC *)arg0, (GdkBitmap *)arg1);
@@ -4391,7 +4502,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1mask)
#ifndef NO__1gdk_1gc_1set_1clip_1origin
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1origin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1origin_FUNC);
gdk_gc_set_clip_origin((GdkGC *)arg0, (gint)arg1, (gint)arg2);
@@ -4401,7 +4512,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1origin)
#ifndef NO__1gdk_1gc_1set_1clip_1rectangle
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1rectangle)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1rectangle_FUNC);
@@ -4414,7 +4525,7 @@ fail:
#ifndef NO__1gdk_1gc_1set_1clip_1region
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1region)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1clip_1region_FUNC);
gdk_gc_set_clip_region((GdkGC *)arg0, (GdkRegion *)arg1);
@@ -4424,7 +4535,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1clip_1region)
#ifndef NO__1gdk_1gc_1set_1dashes
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1dashes)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jint arg3)
{
jbyte *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1dashes_FUNC);
@@ -4452,7 +4563,7 @@ fail:
#ifndef NO__1gdk_1gc_1set_1exposures
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1exposures)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1exposures_FUNC);
gdk_gc_set_exposures((GdkGC *)arg0, (gboolean)arg1);
@@ -4462,7 +4573,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1exposures)
#ifndef NO__1gdk_1gc_1set_1fill
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1fill_FUNC);
gdk_gc_set_fill((GdkGC *)arg0, (GdkFill)arg1);
@@ -4472,7 +4583,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1fill)
#ifndef NO__1gdk_1gc_1set_1foreground
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1foreground)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1foreground_FUNC);
@@ -4485,7 +4596,7 @@ fail:
#ifndef NO__1gdk_1gc_1set_1function
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1function_FUNC);
gdk_gc_set_function((GdkGC *)arg0, (GdkFunction)arg1);
@@ -4495,7 +4606,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1function)
#ifndef NO__1gdk_1gc_1set_1line_1attributes
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1line_1attributes)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1line_1attributes_FUNC);
gdk_gc_set_line_attributes((GdkGC *)arg0, (gint)arg1, (GdkLineStyle)arg2, (GdkCapStyle)arg3, (GdkJoinStyle)arg4);
@@ -4505,7 +4616,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1line_1attributes)
#ifndef NO__1gdk_1gc_1set_1stipple
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1stipple_FUNC);
gdk_gc_set_stipple((GdkGC *)arg0, (GdkPixmap *)arg1);
@@ -4515,7 +4626,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1stipple)
#ifndef NO__1gdk_1gc_1set_1subwindow
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1subwindow_FUNC);
gdk_gc_set_subwindow((GdkGC *)arg0, (GdkSubwindowMode)arg1);
@@ -4525,7 +4636,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1subwindow)
#ifndef NO__1gdk_1gc_1set_1tile
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1tile)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1tile_FUNC);
gdk_gc_set_tile((GdkGC *)arg0, (GdkPixmap *)arg1);
@@ -4535,7 +4646,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1tile)
#ifndef NO__1gdk_1gc_1set_1ts_1origin
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1ts_1origin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1ts_1origin_FUNC);
gdk_gc_set_ts_origin((GdkGC *)arg0, arg1, arg2);
@@ -4545,7 +4656,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1ts_1origin)
#ifndef NO__1gdk_1gc_1set_1values
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1gc_1set_1values)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
{
GdkGCValues _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1gc_1set_1values_FUNC);
@@ -4567,12 +4678,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1keyboard_1ungrab)
#endif
#ifndef NO__1gdk_1keymap_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1keymap_1get_1default_FUNC);
- rc = (jint)gdk_keymap_get_default();
+ rc = (jintLong)gdk_keymap_get_default();
OS_NATIVE_EXIT(env, that, _1gdk_1keymap_1get_1default_FUNC);
return rc;
}
@@ -4580,7 +4691,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keymap_1get_1default)
#ifndef NO__1gdk_1keymap_1translate_1keyboard_1state
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1keymap_1translate_1keyboard_1state)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
{
jint *lparg4=NULL;
jint *lparg5=NULL;
@@ -4628,12 +4739,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1keyval_1to_1unicode)
#endif
#ifndef NO__1gdk_1pango_1context_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1get_FUNC);
- rc = (jint)gdk_pango_context_get();
+ rc = (jintLong)gdk_pango_context_get();
OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1get_FUNC);
return rc;
}
@@ -4641,7 +4752,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1context_1get)
#ifndef NO__1gdk_1pango_1context_1set_1colormap
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC);
gdk_pango_context_set_colormap((PangoContext *)arg0, (GdkColormap *)arg1);
@@ -4650,14 +4761,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap)
#endif
#ifndef NO__1gdk_1pango_1layout_1get_1clip_1region
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pango_1layout_1get_1clip_1region)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
{
jint *lparg3=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
- rc = (jint)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, lparg3, arg4);
+ rc = (jintLong)gdk_pango_layout_get_clip_region((PangoLayout *)arg0, arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1pango_1layout_1get_1clip_1region_FUNC);
@@ -4667,7 +4778,7 @@ fail:
#ifndef NO__1gdk_1pixbuf_1copy_1area
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jint arg6, jint arg7)
{
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1copy_1area_FUNC);
gdk_pixbuf_copy_area((GdkPixbuf *)arg0, arg1, arg2, arg3, arg4, (GdkPixbuf *)arg5, arg6, arg7);
@@ -4676,12 +4787,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1copy_1area)
#endif
#ifndef NO__1gdk_1pixbuf_1get_1from_1drawable
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
- rc = (jint)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkColormap *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+ rc = (jintLong)gdk_pixbuf_get_from_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkColormap *)arg2, arg3, arg4, arg5, arg6, arg7, arg8);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1from_1drawable_FUNC);
return rc;
}
@@ -4689,7 +4800,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1from_1drawable)
#ifndef NO__1gdk_1pixbuf_1get_1has_1alpha
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1has_1alpha_FUNC);
@@ -4701,7 +4812,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1has_1alpha)
#ifndef NO__1gdk_1pixbuf_1get_1height
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1height_FUNC);
@@ -4712,12 +4823,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1height)
#endif
#ifndef NO__1gdk_1pixbuf_1get_1pixels
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
- rc = (jint)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
+ rc = (jintLong)gdk_pixbuf_get_pixels((const GdkPixbuf *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1get_1pixels_FUNC);
return rc;
}
@@ -4725,7 +4836,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1pixels)
#ifndef NO__1gdk_1pixbuf_1get_1rowstride
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1rowstride_FUNC);
@@ -4737,7 +4848,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1rowstride)
#ifndef NO__1gdk_1pixbuf_1get_1width
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1get_1width_FUNC);
@@ -4749,39 +4860,39 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1get_1width)
#ifndef NO__1gdk_1pixbuf_1loader_1close
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1close)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
rc = (jboolean)gdk_pixbuf_loader_close((GdkPixbufLoader *)arg0, (GError **)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1close_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixbuf_1loader_1get_1pixbuf
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1get_1pixbuf)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
- rc = (jint)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
+ rc = (jintLong)gdk_pixbuf_loader_get_pixbuf((GdkPixbufLoader *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1get_1pixbuf_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixbuf_1loader_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
- rc = (jint)gdk_pixbuf_loader_new();
+ rc = (jintLong)gdk_pixbuf_loader_new();
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1new_FUNC);
return rc;
}
@@ -4789,45 +4900,45 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1new)
#ifndef NO__1gdk_1pixbuf_1loader_1write
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1loader_1write)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3)
{
- jint *lparg3=NULL;
+ jintLong *lparg3=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(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)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1loader_1write_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixbuf_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new)
(JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1new_FUNC);
- rc = (jint)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
+ rc = (jintLong)gdk_pixbuf_new((GdkColorspace)arg0, (gboolean)arg1, arg2, arg3, arg4);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixbuf_1new_1from_1file
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
- (JNIEnv *env, jclass that, jbyteArray arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1new_1from_1file)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
{
jbyte *lparg0=NULL;
- jint *lparg1=NULL;
- jint rc = 0;
+ jintLong *lparg1=NULL;
+ jintLong rc = 0;
OS_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)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1);
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ rc = (jintLong)gdk_pixbuf_new_from_file((const char *)lparg0, (GError**)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1new_1from_1file_FUNC);
return rc;
@@ -4836,24 +4947,24 @@ fail:
#ifndef NO__1gdk_1pixbuf_1render_1pixmap_1and_1mask
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1pixmap_1and_1mask)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jint arg3)
{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
+ jintLong *lparg1=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1pixmap_1and_1mask_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;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gdk_pixbuf_render_pixmap_and_mask((GdkPixbuf *)arg0, (GdkDrawable **)lparg1, (GdkBitmap **)lparg2, arg3);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1render_1pixmap_1and_1mask_FUNC);
}
#endif
#ifndef NO__1gdk_1pixbuf_1render_1to_1drawable
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
{
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1to_1drawable_FUNC);
gdk_pixbuf_render_to_drawable((GdkPixbuf *)arg0, (GdkDrawable *)arg1, (GdkGC *)arg2, arg3, arg4, arg5, arg6, arg7, arg8, (GdkRgbDither)arg9, arg10, arg11);
@@ -4863,7 +4974,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable)
#ifndef NO__1gdk_1pixbuf_1render_1to_1drawable_1alpha
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable_1alpha)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12)
{
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1render_1to_1drawable_1alpha_FUNC);
gdk_pixbuf_render_to_drawable_alpha((GdkPixbuf *)arg0, (GdkDrawable *)arg1, arg2, arg3, arg4, arg5, arg6, arg7, (GdkPixbufAlphaMode)arg8, arg9, (GdkRgbDither)arg10, arg11, arg12);
@@ -4871,54 +4982,48 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1render_1to_1drawable_1alpha)
}
#endif
-#ifndef NO__1gdk_1pixbuf_1save_1to_1buffer
-JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1buffer)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jbyteArray arg3, jintArray arg4, jbyteArray arg5)
+#ifndef NO__1gdk_1pixbuf_1save_1to_1bufferv
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1pixbuf_1save_1to_1bufferv)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jbyteArray arg3, jintLongArray arg4, jintLongArray arg5, jintLongArray arg6)
{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
+ jintLong *lparg1=NULL;
+ jintLong *lparg2=NULL;
jbyte *lparg3=NULL;
- jint *lparg4=NULL;
- jbyte *lparg5=NULL;
+ jintLong *lparg4=NULL;
+ jintLong *lparg5=NULL;
+ jintLong *lparg6=NULL;
jboolean rc = 0;
- OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1save_1to_1buffer_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;
+ OS_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 (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
- if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, 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;
/*
- rc = (jboolean)gdk_pixbuf_save_to_buffer((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (GError **)lparg4, (char *)lparg5);
+ rc = (jboolean)gdk_pixbuf_save_to_bufferv((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(GdkPixbuf *, gchar **, gsize *, const char *, GError **, char *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_pixbuf_save_to_buffer_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_pixbuf_save_to_buffer");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, (GError **)lparg4, (char *)lparg5);
+ LOAD_FUNCTION(fp, gdk_pixbuf_save_to_bufferv)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GdkPixbuf *, gchar **, gsize *, const char *, jintLong *, jintLong *, GError **))fp)((GdkPixbuf *)arg0, (gchar **)lparg1, (gsize *)lparg2, (const char *)lparg3, lparg4, lparg5, (GError **)lparg6);
}
}
fail:
- if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+ 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 (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
- OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1buffer_FUNC);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+ OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1save_1to_1bufferv_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixbuf_1scale
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jdouble arg6, jdouble arg7, jdouble arg8, jdouble arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jdouble arg6, jdouble arg7, jdouble arg8, jdouble arg9, jint arg10)
{
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_FUNC);
gdk_pixbuf_scale((const GdkPixbuf *)arg0, (GdkPixbuf *)arg1, arg2, arg3, arg4, arg5, (double)arg6, (double)arg7, (double)arg8, (double)arg9, arg10);
@@ -4927,36 +5032,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale)
#endif
#ifndef NO__1gdk_1pixbuf_1scale_1simple
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixbuf_1scale_1simple)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
- rc = (jint)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
+ rc = (jintLong)gdk_pixbuf_scale_simple((const GdkPixbuf *)arg0, arg1, arg2, (GdkInterpType)arg3);
OS_NATIVE_EXIT(env, that, _1gdk_1pixbuf_1scale_1simple_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixmap_1foreign_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1foreign_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1foreign_1new_FUNC);
- rc = (jint)gdk_pixmap_foreign_new(arg0);
+ rc = (jintLong)gdk_pixmap_foreign_new(arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1foreign_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1pixmap_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pixmap_1new_FUNC);
- rc = (jint)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
+ rc = (jintLong)gdk_pixmap_new((GdkWindow *)arg0, (gint)arg1, (gint)arg2, (gint)arg3);
OS_NATIVE_EXIT(env, that, _1gdk_1pixmap_1new_FUNC);
return rc;
}
@@ -4964,7 +5069,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pixmap_1new)
#ifndef NO__1gdk_1pointer_1grab
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1pointer_1grab)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jint arg2, jintLong arg3, jintLong arg4, jint arg5)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1pointer_1grab_FUNC);
@@ -4998,24 +5103,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pointer_1ungrab)
#ifndef NO__1gdk_1property_1get
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1property_1get)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8, jintArray arg9)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9)
{
- jint *lparg6=NULL;
+ jintLong *lparg6=NULL;
jint *lparg7=NULL;
jint *lparg8=NULL;
- jint *lparg9=NULL;
+ jintLong *lparg9=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC);
- if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
- if (arg9) if ((lparg9 = (*env)->GetIntArrayElements(env, arg9, NULL)) == NULL) goto fail;
+ if (arg9) if ((lparg9 = (*env)->GetIntLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9);
fail:
- if (arg9 && lparg9) (*env)->ReleaseIntArrayElements(env, arg9, lparg9, 0);
+ if (arg9 && lparg9) (*env)->ReleaseIntLongArrayElements(env, arg9, lparg9, 0);
if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
- if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
+ if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
return rc;
}
@@ -5023,7 +5128,7 @@ fail:
#ifndef NO__1gdk_1region_1destroy
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1region_1destroy_FUNC);
gdk_region_destroy((GdkRegion *)arg0);
@@ -5033,7 +5138,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1destroy)
#ifndef NO__1gdk_1region_1empty
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1empty_FUNC);
@@ -5045,7 +5150,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1empty)
#ifndef NO__1gdk_1region_1get_1clipbox
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1clipbox)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1clipbox_FUNC);
@@ -5059,24 +5164,24 @@ fail:
#ifndef NO__1gdk_1region_1get_1rectangles
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1get_1rectangles)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jint *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1get_1rectangles_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
gdk_region_get_rectangles((GdkRegion *)arg0, (GdkRectangle **)lparg1, (gint *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1region_1get_1rectangles_FUNC);
}
#endif
#ifndef NO__1gdk_1region_1intersect
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1region_1intersect_FUNC);
gdk_region_intersect((GdkRegion *)arg0, (GdkRegion *)arg1);
@@ -5085,12 +5190,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1intersect)
#endif
#ifndef NO__1gdk_1region_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1new_FUNC);
- rc = (jint)gdk_region_new();
+ rc = (jintLong)gdk_region_new();
OS_NATIVE_EXIT(env, that, _1gdk_1region_1new_FUNC);
return rc;
}
@@ -5098,7 +5203,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1new)
#ifndef NO__1gdk_1region_1offset
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1region_1offset_FUNC);
gdk_region_offset((GdkRegion *)arg0, (gint)arg1, (gint)arg2);
@@ -5108,7 +5213,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1offset)
#ifndef NO__1gdk_1region_1point_1in
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1point_1in_FUNC);
@@ -5119,14 +5224,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1region_1point_1in)
#endif
#ifndef NO__1gdk_1region_1polygon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1polygon)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1polygon)
(JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
{
jint *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1polygon_FUNC);
if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gdk_region_polygon((GdkPoint *)lparg0, arg1, (GdkFillRule)arg2);
+ rc = (jintLong)gdk_region_polygon((GdkPoint *)lparg0, arg1, (GdkFillRule)arg2);
fail:
if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1region_1polygon_FUNC);
@@ -5135,14 +5240,14 @@ fail:
#endif
#ifndef NO__1gdk_1region_1rect_1in
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rect_1in)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1rect_1in_FUNC);
if (arg1) if ((lparg1 = getGdkRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
- rc = (jint)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
+ rc = (jintLong)gdk_region_rect_in((GdkRegion *)arg0, (GdkRectangle *)lparg1);
fail:
OS_NATIVE_EXIT(env, that, _1gdk_1region_1rect_1in_FUNC);
return rc;
@@ -5150,14 +5255,14 @@ fail:
#endif
#ifndef NO__1gdk_1region_1rectangle
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1region_1rectangle)
(JNIEnv *env, jclass that, jobject arg0)
{
GdkRectangle _arg0, *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1rectangle_FUNC);
if (arg0) if ((lparg0 = getGdkRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
- rc = (jint)gdk_region_rectangle(lparg0);
+ rc = (jintLong)gdk_region_rectangle(lparg0);
fail:
OS_NATIVE_EXIT(env, that, _1gdk_1region_1rectangle_FUNC);
return rc;
@@ -5166,7 +5271,7 @@ fail:
#ifndef NO__1gdk_1region_1subtract
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1region_1subtract_FUNC);
gdk_region_subtract((GdkRegion *)arg0, (GdkRegion *)arg1);
@@ -5176,7 +5281,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1subtract)
#ifndef NO__1gdk_1region_1union
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_FUNC);
gdk_region_union((GdkRegion *)arg0, (GdkRegion *)arg1);
@@ -5186,7 +5291,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union)
#ifndef NO__1gdk_1region_1union_1with_1rect
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1region_1union_1with_1rect)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1region_1union_1with_1rect_FUNC);
@@ -5208,27 +5313,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1rgb_1init)
#endif
#ifndef NO__1gdk_1screen_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1default_FUNC);
/*
- rc = (jint)gdk_screen_get_default();
+ rc = (jintLong)gdk_screen_get_default();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_screen_get_default_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_default");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gdk_screen_get_default)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1default_FUNC);
@@ -5238,7 +5334,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1default)
#ifndef NO__1gdk_1screen_1get_1monitor_1at_1point
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
@@ -5246,18 +5342,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
rc = (jint)gdk_screen_get_monitor_at_point((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GdkScreen *, gint, gint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_screen_get_monitor_at_point_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_monitor_at_point");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
+ LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_point)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, gint, gint))fp)((GdkScreen *)arg0, (gint)arg1, (gint)arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1point_FUNC);
@@ -5267,7 +5354,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1point)
#ifndef NO__1gdk_1screen_1get_1monitor_1at_1window
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
@@ -5275,18 +5362,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
rc = (jint)gdk_screen_get_monitor_at_window((GdkScreen *)arg0, (GdkWindow *)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GdkScreen *, GdkWindow *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_screen_get_monitor_at_window_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_monitor_at_window");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GdkScreen *)arg0, (GdkWindow *)arg1);
+ LOAD_FUNCTION(fp, gdk_screen_get_monitor_at_window)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *, GdkWindow *))fp)((GdkScreen *)arg0, (GdkWindow *)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1monitor_1at_1window_FUNC);
@@ -5296,7 +5374,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1at_1window)
#ifndef NO__1gdk_1screen_1get_1monitor_1geometry
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkRectangle _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1monitor_1geometry_FUNC);
@@ -5305,17 +5383,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1screen_1get_1monitor_1geometry)
gdk_screen_get_monitor_geometry((GdkScreen *)arg0, arg1, lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GdkScreen *, jint, GdkRectangle *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_screen_get_monitor_geometry_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_monitor_geometry");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GdkScreen *)arg0, arg1, lparg2);
+ LOAD_FUNCTION(fp, gdk_screen_get_monitor_geometry)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GdkScreen *, jint, GdkRectangle *))fp)((GdkScreen *)arg0, arg1, lparg2);
}
}
fail:
@@ -5326,7 +5396,7 @@ fail:
#ifndef NO__1gdk_1screen_1get_1n_1monitors
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
@@ -5334,18 +5404,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
rc = (jint)gdk_screen_get_n_monitors((GdkScreen *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GdkScreen *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_screen_get_n_monitors_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_n_monitors");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GdkScreen *)arg0);
+ LOAD_FUNCTION(fp, gdk_screen_get_n_monitors)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1n_1monitors_FUNC);
@@ -5355,7 +5416,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1n_1monitors)
#ifndef NO__1gdk_1screen_1get_1number
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1screen_1get_1number_FUNC);
@@ -5363,18 +5424,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1screen_1get_1number)
rc = (jint)gdk_screen_get_number((GdkScreen *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GdkScreen *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_screen_get_number_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_screen_get_number");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GdkScreen *)arg0);
+ LOAD_FUNCTION(fp, gdk_screen_get_number)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1screen_1get_1number_FUNC);
@@ -5434,15 +5486,15 @@ fail:
#ifndef NO__1gdk_1text_1property_1to_1utf8_1list
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1text_1property_1to_1utf8_1list)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jintLongArray arg4)
{
- jint *lparg4=NULL;
+ jintLong *lparg4=NULL;
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1text_1property_1to_1utf8_1list_FUNC);
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
rc = (jint)gdk_text_property_to_utf8_list((GdkAtom)arg0, arg1, (guchar *)arg2, arg3, (gchar ***)lparg4);
fail:
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1text_1property_1to_1utf8_1list_FUNC);
return rc;
}
@@ -5462,26 +5514,26 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1unicode_1to_1keyval)
#ifndef NO__1gdk_1utf8_1to_1compound_1text
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1utf8_1to_1compound_1text)
- (JNIEnv *env, jclass that, jbyteArray arg0, jintArray arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1, jintArray arg2, jintLongArray arg3, jintArray arg4)
{
jbyte *lparg0=NULL;
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jint *lparg2=NULL;
- jint *lparg3=NULL;
+ jintLong *lparg3=NULL;
jint *lparg4=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1compound_1text_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
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 (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
rc = (jboolean)gdk_utf8_to_compound_text((const gchar *)lparg0, (GdkAtom *)lparg1, (gint *)lparg2, (guchar **)lparg3, (gint *)lparg4);
fail:
if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1compound_1text_FUNC);
return rc;
@@ -5489,14 +5541,14 @@ fail:
#endif
#ifndef NO__1gdk_1utf8_1to_1string_1target
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1utf8_1to_1string_1target)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gdk_utf8_to_string_target((const gchar *)lparg0);
+ rc = (jintLong)gdk_utf8_to_string_target((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1utf8_1to_1string_1target_FUNC);
@@ -5505,12 +5557,12 @@ fail:
#endif
#ifndef NO__1gdk_1visual_1get_1system
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1visual_1get_1system_FUNC);
- rc = (jint)gdk_visual_get_system();
+ rc = (jintLong)gdk_visual_get_system();
OS_NATIVE_EXIT(env, that, _1gdk_1visual_1get_1system_FUNC);
return rc;
}
@@ -5518,7 +5570,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1visual_1get_1system)
#ifndef NO__1gdk_1window_1add_1filter
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1add_1filter_FUNC);
gdk_window_add_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
@@ -5527,16 +5579,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1add_1filter)
#endif
#ifndef NO__1gdk_1window_1at_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1at_1pointer)
(JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
{
jint *lparg0=NULL;
jint *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1at_1pointer_FUNC);
if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
+ rc = (jintLong)gdk_window_at_pointer((gint *)lparg0, (gint *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
@@ -5547,7 +5599,7 @@ fail:
#ifndef NO__1gdk_1window_1begin_1paint_1rect
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1begin_1paint_1rect)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1begin_1paint_1rect_FUNC);
@@ -5560,7 +5612,7 @@ fail:
#ifndef NO__1gdk_1window_1clear_1area
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1clear_1area)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1clear_1area_FUNC);
gdk_window_clear_area((GdkWindow *)arg0, arg1, arg2, arg3, arg4);
@@ -5570,7 +5622,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1clear_1area)
#ifndef NO__1gdk_1window_1destroy
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1destroy_FUNC);
gdk_window_destroy((GdkWindow *)arg0);
@@ -5580,7 +5632,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1destroy)
#ifndef NO__1gdk_1window_1end_1paint
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1end_1paint_FUNC);
gdk_window_end_paint((GdkWindow *)arg0);
@@ -5590,7 +5642,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1end_1paint)
#ifndef NO__1gdk_1window_1focus
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1focus_FUNC);
gdk_window_focus((GdkWindow *)arg0, arg1);
@@ -5600,7 +5652,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1focus)
#ifndef NO__1gdk_1window_1freeze_1updates
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1freeze_1updates)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1freeze_1updates_FUNC);
gdk_window_freeze_updates((GdkWindow *)arg0);
@@ -5609,12 +5661,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1freeze_1updates)
#endif
#ifndef NO__1gdk_1window_1get_1children
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1children_FUNC);
- rc = (jint)gdk_window_get_children((GdkWindow *)arg0);
+ rc = (jintLong)gdk_window_get_children((GdkWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1children_FUNC);
return rc;
}
@@ -5622,7 +5674,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1children)
#ifndef NO__1gdk_1window_1get_1events
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1events_FUNC);
@@ -5634,7 +5686,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1events)
#ifndef NO__1gdk_1window_1get_1frame_1extents
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1frame_1extents)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1frame_1extents_FUNC);
@@ -5648,27 +5700,27 @@ fail:
#ifndef NO__1gdk_1window_1get_1internal_1paint_1info
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1internal_1paint_1info)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2, jintArray arg3)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jint *lparg2=NULL;
jint *lparg3=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
gdk_window_get_internal_paint_info((GdkWindow *)arg0, (GdkDrawable **)lparg1, (gint *)lparg2, (gint *)lparg3);
fail:
if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1internal_1paint_1info_FUNC);
}
#endif
#ifndef NO__1gdk_1window_1get_1origin
JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1origin)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -5686,30 +5738,30 @@ fail:
#endif
#ifndef NO__1gdk_1window_1get_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1parent)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1parent_FUNC);
- rc = (jint)gdk_window_get_parent((GdkWindow *)arg0);
+ rc = (jintLong)gdk_window_get_parent((GdkWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1parent_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1window_1get_1pointer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1get_1pointer)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
jint *lparg3=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1pointer_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;
if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
- rc = (jint)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
+ rc = (jintLong)gdk_window_get_pointer((GdkWindow *)arg0, (gint *)lparg1, (gint *)lparg2, (GdkModifierType *)lparg3);
fail:
if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
@@ -5721,7 +5773,7 @@ fail:
#ifndef NO__1gdk_1window_1get_1position
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1position)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -5738,21 +5790,21 @@ fail:
#ifndef NO__1gdk_1window_1get_1user_1data
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1get_1user_1data)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
gdk_window_get_user_data((GdkWindow *)arg0, (gpointer *)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gdk_1window_1get_1user_1data_FUNC);
}
#endif
#ifndef NO__1gdk_1window_1hide
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1hide_FUNC);
gdk_window_hide((GdkWindow *)arg0);
@@ -5762,7 +5814,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1hide)
#ifndef NO__1gdk_1window_1invalidate_1rect
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1rect)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jboolean arg2)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1rect_FUNC);
@@ -5775,7 +5827,7 @@ fail:
#ifndef NO__1gdk_1window_1invalidate_1region
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1invalidate_1region_FUNC);
gdk_window_invalidate_region((GdkWindow *)arg0, (GdkRegion *)arg1, (gboolean)arg2);
@@ -5785,7 +5837,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1invalidate_1region)
#ifndef NO__1gdk_1window_1is_1visible
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1is_1visible_FUNC);
@@ -5796,12 +5848,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gdk_1window_1is_1visible)
#endif
#ifndef NO__1gdk_1window_1lookup
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1lookup)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1lookup)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1lookup_FUNC);
- rc = (jint)gdk_window_lookup(arg0);
+ rc = (jintLong)gdk_window_lookup(arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1window_1lookup_FUNC);
return rc;
}
@@ -5809,7 +5861,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1lookup)
#ifndef NO__1gdk_1window_1lower
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1lower_FUNC);
gdk_window_lower((GdkWindow *)arg0);
@@ -5819,7 +5871,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1lower)
#ifndef NO__1gdk_1window_1move
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1move_FUNC);
gdk_window_move((GdkWindow *)arg0, arg1, arg2);
@@ -5828,14 +5880,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1move)
#endif
#ifndef NO__1gdk_1window_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1window_1new)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1window_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
{
GdkWindowAttr _arg1, *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1window_1new_FUNC);
if (arg1) if ((lparg1 = getGdkWindowAttrFields(env, arg1, &_arg1)) == NULL) goto fail;
- rc = (jint)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
+ rc = (jintLong)gdk_window_new((GdkWindow *)arg0, lparg1, arg2);
fail:
OS_NATIVE_EXIT(env, that, _1gdk_1window_1new_FUNC);
return rc;
@@ -5854,7 +5906,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1all_1updates)
#ifndef NO__1gdk_1window_1process_1updates
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1process_1updates_FUNC);
gdk_window_process_updates((GdkWindow *)arg0, (gboolean)arg1);
@@ -5864,7 +5916,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1process_1updates)
#ifndef NO__1gdk_1window_1raise
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1raise_FUNC);
gdk_window_raise((GdkWindow *)arg0);
@@ -5874,7 +5926,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1raise)
#ifndef NO__1gdk_1window_1remove_1filter
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1remove_1filter_FUNC);
gdk_window_remove_filter((GdkWindow *)arg0, (GdkFilterFunc)arg1, (gpointer)arg2);
@@ -5884,7 +5936,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1remove_1filter)
#ifndef NO__1gdk_1window_1resize
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1resize_FUNC);
gdk_window_resize((GdkWindow *)arg0, arg1, arg2);
@@ -5894,7 +5946,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1resize)
#ifndef NO__1gdk_1window_1scroll
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1scroll_FUNC);
gdk_window_scroll((GdkWindow *)arg0, arg1, arg2);
@@ -5904,24 +5956,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1scroll)
#ifndef NO__1gdk_1window_1set_1accept_1focus
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1accept_1focus_FUNC);
/*
gdk_window_set_accept_focus((GdkWindow *)arg0, (gboolean)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GdkWindow *, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_window_set_accept_focus_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_window_set_accept_focus");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GdkWindow *)arg0, (gboolean)arg1);
+ LOAD_FUNCTION(fp, gdk_window_set_accept_focus)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1accept_1focus_FUNC);
@@ -5930,7 +5974,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1accept_1focus)
#ifndef NO__1gdk_1window_1set_1back_1pixmap
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1back_1pixmap_FUNC);
gdk_window_set_back_pixmap((GdkWindow *)arg0, (GdkPixmap *)arg1, (gboolean)arg2);
@@ -5940,7 +5984,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1back_1pixmap)
#ifndef NO__1gdk_1window_1set_1cursor
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1cursor)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1cursor_FUNC);
gdk_window_set_cursor((GdkWindow *)arg0, (GdkCursor *)arg1);
@@ -5960,7 +6004,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1debug_1updates)
#ifndef NO__1gdk_1window_1set_1decorations
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1decorations_FUNC);
gdk_window_set_decorations((GdkWindow *)arg0, (GdkWMDecoration)arg1);
@@ -5970,7 +6014,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1decorations)
#ifndef NO__1gdk_1window_1set_1events
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1events_FUNC);
gdk_window_set_events((GdkWindow *)arg0, arg1);
@@ -5980,7 +6024,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1events)
#ifndef NO__1gdk_1window_1set_1icon
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1icon_FUNC);
gdk_window_set_icon((GdkWindow *)arg0, (GdkWindow *)arg1, (GdkPixmap *)arg2, (GdkBitmap *)arg3);
@@ -5990,7 +6034,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon)
#ifndef NO__1gdk_1window_1set_1icon_1list
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon_1list)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1icon_1list_FUNC);
gdk_window_set_icon_list((GdkWindow *)arg0, (GList *)arg1);
@@ -6000,24 +6044,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1icon_1list)
#ifndef NO__1gdk_1window_1set_1keep_1above
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1keep_1above_FUNC);
/*
gdk_window_set_keep_above((GdkWindow *)arg0, (gboolean)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GdkWindow *, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_window_set_keep_above_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_window_set_keep_above");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GdkWindow *)arg0, (gboolean)arg1);
+ LOAD_FUNCTION(fp, gdk_window_set_keep_above)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GdkWindow *, gboolean))fp)((GdkWindow *)arg0, (gboolean)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1window_1set_1keep_1above_FUNC);
@@ -6026,7 +6062,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1keep_1above)
#ifndef NO__1gdk_1window_1set_1override_1redirect
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1override_1redirect_FUNC);
gdk_window_set_override_redirect((GdkWindow *)arg0, (gboolean)arg1);
@@ -6036,7 +6072,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1override_1redirect)
#ifndef NO__1gdk_1window_1set_1user_1data
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1set_1user_1data_FUNC);
gdk_window_set_user_data((GdkWindow *)arg0, (gpointer)arg1);
@@ -6046,7 +6082,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1set_1user_1data)
#ifndef NO__1gdk_1window_1shape_1combine_1region
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1shape_1combine_1region_FUNC);
gdk_window_shape_combine_region((GdkWindow *)arg0, (GdkRegion *)arg1, arg2, arg3);
@@ -6056,7 +6092,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1shape_1combine_1region)
#ifndef NO__1gdk_1window_1show
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_FUNC);
gdk_window_show((GdkWindow *)arg0);
@@ -6066,7 +6102,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show)
#ifndef NO__1gdk_1window_1show_1unraised
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1show_1unraised_FUNC);
gdk_window_show_unraised((GdkWindow *)arg0);
@@ -6076,7 +6112,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1show_1unraised)
#ifndef NO__1gdk_1window_1thaw_1updates
JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1thaw_1updates)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gdk_1window_1thaw_1updates_FUNC);
gdk_window_thaw_updates((GdkWindow *)arg0);
@@ -6085,75 +6121,66 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1window_1thaw_1updates)
#endif
#ifndef NO__1gdk_1x11_1atom_1to_1xatom
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1atom_1to_1xatom)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
- rc = (jint)gdk_x11_atom_to_xatom((GdkAtom)arg0);
+ rc = (jintLong)gdk_x11_atom_to_xatom((GdkAtom)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1atom_1to_1xatom_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1x11_1colormap_1get_1xcolormap
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1colormap_1get_1xcolormap)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC);
- rc = (jint)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0);
+ rc = (jintLong)gdk_x11_colormap_get_xcolormap((GdkColormap *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1colormap_1get_1xcolormap_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1x11_1drawable_1get_1xdisplay
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xdisplay)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC);
- rc = (jint)gdk_x11_drawable_get_xdisplay((GdkDrawable *)arg0);
+ rc = (jintLong)gdk_x11_drawable_get_xdisplay((GdkDrawable *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xdisplay_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1x11_1drawable_1get_1xid
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1drawable_1get_1xid)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
- rc = (jint)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
+ rc = (jintLong)gdk_x11_drawable_get_xid((GdkDrawable *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1drawable_1get_1xid_FUNC);
return rc;
}
#endif
#ifndef NO__1gdk_1x11_1screen_1get_1window_1manager_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
/*
- rc = (jint)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
+ rc = (jintLong)gdk_x11_screen_get_window_manager_name((GdkScreen *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GdkScreen *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_x11_screen_get_window_manager_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_x11_screen_get_window_manager_name");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GdkScreen *)arg0);
+ LOAD_FUNCTION(fp, gdk_x11_screen_get_window_manager_name)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *))fp)((GdkScreen *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1get_1window_1manager_1name_FUNC);
@@ -6162,27 +6189,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1get_1window_1manager_1name)
#endif
#ifndef NO__1gdk_1x11_1screen_1lookup_1visual
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
/*
- rc = (jint)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
+ rc = (jintLong)gdk_x11_screen_lookup_visual((GdkScreen *)arg0, (VisualID)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GdkScreen *, VisualID);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gdk_x11_screen_lookup_visual_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gdk_x11_screen_lookup_visual");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GdkScreen *)arg0, (VisualID)arg1);
+ LOAD_FUNCTION(fp, gdk_x11_screen_lookup_visual)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GdkScreen *, VisualID))fp)((GdkScreen *)arg0, (VisualID)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1screen_1lookup_1visual_FUNC);
@@ -6191,24 +6209,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1screen_1lookup_1visual)
#endif
#ifndef NO__1gdk_1x11_1visual_1get_1xvisual
-JNIEXPORT jint JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gdk_1x11_1visual_1get_1xvisual)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
- rc = (jint)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
+ rc = (jintLong)gdk_x11_visual_get_xvisual((GdkVisual *)arg0);
OS_NATIVE_EXIT(env, that, _1gdk_1x11_1visual_1get_1xvisual_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1accel_1group_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1accel_1group_1new_FUNC);
- rc = (jint)gtk_accel_group_new();
+ rc = (jintLong)gtk_accel_group_new();
OS_NATIVE_EXIT(env, that, _1gtk_1accel_1group_1new_FUNC);
return rc;
}
@@ -6216,7 +6234,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1accel_1group_1new)
#ifndef NO__1gtk_1accel_1groups_1activate
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1accel_1groups_1activate)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1accel_1groups_1activate_FUNC);
@@ -6228,7 +6246,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1accel_1groups_1activate)
#ifndef NO__1gtk_1accel_1label_1set_1accel_1widget
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1accel_1label_1set_1accel_1widget_FUNC);
gtk_accel_label_set_accel_widget((GtkAccelLabel *)arg0, (GtkWidget *)arg1);
@@ -6238,7 +6256,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1accel_1label_1set_1accel_1widget)
#ifndef NO__1gtk_1adjustment_1changed
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1changed)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1changed_FUNC);
gtk_adjustment_changed((GtkAdjustment *)arg0);
@@ -6247,12 +6265,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1changed)
#endif
#ifndef NO__1gtk_1adjustment_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
(JNIEnv *env, jclass that, jdouble arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1new_FUNC);
- rc = (jint)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5);
+ rc = (jintLong)gtk_adjustment_new((gdouble)arg0, (gdouble)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, arg5);
OS_NATIVE_EXIT(env, that, _1gtk_1adjustment_1new_FUNC);
return rc;
}
@@ -6260,7 +6278,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1adjustment_1new)
#ifndef NO__1gtk_1adjustment_1set_1value
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1value)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1set_1value_FUNC);
gtk_adjustment_set_value((GtkAdjustment *)arg0, (gdouble)arg1);
@@ -6270,7 +6288,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1set_1value)
#ifndef NO__1gtk_1adjustment_1value_1changed
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1value_1changed)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1adjustment_1value_1changed_FUNC);
gtk_adjustment_value_changed((GtkAdjustment *)arg0);
@@ -6279,12 +6297,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1adjustment_1value_1changed)
#endif
#ifndef NO__1gtk_1arrow_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1arrow_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1arrow_1new)
(JNIEnv *env, jclass that, jint arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1new_FUNC);
- rc = (jint)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
+ rc = (jintLong)gtk_arrow_new((GtkArrowType)arg0, (GtkShadowType)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1arrow_1new_FUNC);
return rc;
}
@@ -6292,7 +6310,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1arrow_1new)
#ifndef NO__1gtk_1arrow_1set
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1arrow_1set)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1arrow_1set_FUNC);
gtk_arrow_set((GtkArrow *)arg0, (GtkArrowType)arg1, (GtkShadowType)arg2);
@@ -6301,20 +6319,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1arrow_1set)
#endif
#ifndef NO__1gtk_1bin_1get_1child
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1bin_1get_1child)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1bin_1get_1child_FUNC);
- rc = (jint)gtk_bin_get_child((GtkBin *)arg0);
+ rc = (jintLong)gtk_bin_get_child((GtkBin *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1bin_1get_1child_FUNC);
return rc;
}
#endif
+#ifndef NO__1gtk_1border_1free
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1border_1free)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1border_1free_FUNC);
+ gtk_border_free((GtkBorder *)arg0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1border_1free_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1box_1set_1child_1packing
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1child_1packing)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jboolean arg3, jint arg4, jint arg5)
{
OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1child_1packing_FUNC);
gtk_box_set_child_packing((GtkBox *)arg0, (GtkWidget *)arg1, arg2, arg3, arg4, arg5);
@@ -6324,7 +6352,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1child_1packing)
#ifndef NO__1gtk_1box_1set_1spacing
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1spacing)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1box_1set_1spacing_FUNC);
gtk_box_set_spacing((GtkBox *)arg0, arg1);
@@ -6334,7 +6362,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1box_1set_1spacing)
#ifndef NO__1gtk_1button_1clicked
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1clicked)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1button_1clicked_FUNC);
gtk_button_clicked((GtkButton *)arg0);
@@ -6344,7 +6372,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1clicked)
#ifndef NO__1gtk_1button_1get_1relief
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1get_1relief)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1button_1get_1relief_FUNC);
@@ -6355,12 +6383,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1get_1relief)
#endif
#ifndef NO__1gtk_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1button_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1button_1new_FUNC);
- rc = (jint)gtk_button_new();
+ rc = (jintLong)gtk_button_new();
OS_NATIVE_EXIT(env, that, _1gtk_1button_1new_FUNC);
return rc;
}
@@ -6368,7 +6396,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1button_1new)
#ifndef NO__1gtk_1button_1set_1relief
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1relief)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1button_1set_1relief_FUNC);
gtk_button_set_relief((GtkButton *)arg0, (GtkReliefStyle)arg1);
@@ -6378,24 +6406,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1button_1set_1relief)
#ifndef NO__1gtk_1calendar_1display_1options
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1display_1options_FUNC);
/*
gtk_calendar_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkCalendar *, GtkCalendarDisplayOptions);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_calendar_display_options_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_display_options");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
+ LOAD_FUNCTION(fp, gtk_calendar_display_options)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1display_1options_FUNC);
@@ -6404,7 +6424,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1display_1options)
#ifndef NO__1gtk_1calendar_1get_1date
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2, jintArray arg3)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -6417,17 +6437,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1get_1date)
gtk_calendar_get_date((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkCalendar *, guint *, guint *, guint *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_calendar_get_date_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_get_date");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3);
+ LOAD_FUNCTION(fp, gtk_calendar_get_date)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkCalendar *, guint *, guint *, guint *))fp)((GtkCalendar *)arg0, (guint *)lparg1, (guint *)lparg2, (guint *)lparg3);
}
}
fail:
@@ -6439,27 +6451,18 @@ fail:
#endif
#ifndef NO__1gtk_1calendar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1calendar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1calendar_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1new_FUNC);
/*
- rc = (jint)gtk_calendar_new();
+ rc = (jintLong)gtk_calendar_new();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_calendar_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gtk_calendar_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1new_FUNC);
@@ -6469,24 +6472,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1calendar_1new)
#ifndef NO__1gtk_1calendar_1select_1day
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1day_FUNC);
/*
gtk_calendar_select_day((GtkCalendar *)arg0, (guint)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkCalendar *, guint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_calendar_select_day_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_select_day");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkCalendar *)arg0, (guint)arg1);
+ LOAD_FUNCTION(fp, gtk_calendar_select_day)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkCalendar *, guint))fp)((GtkCalendar *)arg0, (guint)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1day_FUNC);
@@ -6495,7 +6490,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1select_1day)
#ifndef NO__1gtk_1calendar_1select_1month
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1select_1month_FUNC);
@@ -6503,18 +6498,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
rc = (jboolean)gtk_calendar_select_month((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(GtkCalendar *, guint, guint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_calendar_select_month_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_select_month");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
+ LOAD_FUNCTION(fp, gtk_calendar_select_month)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkCalendar *, guint, guint))fp)((GtkCalendar *)arg0, (guint)arg1, (guint)arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1select_1month_FUNC);
@@ -6524,24 +6510,16 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1calendar_1select_1month)
#ifndef NO__1gtk_1calendar_1set_1display_1options
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
/*
gtk_calendar_set_display_options((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkCalendar *, GtkCalendarDisplayOptions);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_calendar_set_display_options_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_calendar_set_display_options");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
+ LOAD_FUNCTION(fp, gtk_calendar_set_display_options)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkCalendar *, GtkCalendarDisplayOptions))fp)((GtkCalendar *)arg0, (GtkCalendarDisplayOptions)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1calendar_1set_1display_1options_FUNC);
@@ -6550,24 +6528,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1calendar_1set_1display_1options)
#ifndef NO__1gtk_1cell_1layout_1clear
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1clear_FUNC);
/*
gtk_cell_layout_clear(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_cell_layout_clear_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_cell_layout_clear");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_cell_layout_clear)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1clear_FUNC);
@@ -6576,24 +6546,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1clear)
#ifndef NO__1gtk_1cell_1layout_1pack_1start
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
/*
gtk_cell_layout_pack_start(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_cell_layout_pack_start_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_cell_layout_pack_start");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, gtk_cell_layout_pack_start)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong, jboolean))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1cell_1layout_1pack_1start_FUNC);
@@ -6602,7 +6564,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1pack_1start)
#ifndef NO__1gtk_1cell_1renderer_1get_1size
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1get_1size)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
{
GdkRectangle _arg2, *lparg2=NULL;
jint *lparg3=NULL;
@@ -6627,48 +6589,48 @@ fail:
#endif
#ifndef NO__1gtk_1cell_1renderer_1pixbuf_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1pixbuf_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
- rc = (jint)gtk_cell_renderer_pixbuf_new();
+ rc = (jintLong)gtk_cell_renderer_pixbuf_new();
OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1pixbuf_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1cell_1renderer_1text_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1text_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
- rc = (jint)gtk_cell_renderer_text_new();
+ rc = (jintLong)gtk_cell_renderer_text_new();
OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1text_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1cell_1renderer_1toggle_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1cell_1renderer_1toggle_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
- rc = (jint)gtk_cell_renderer_toggle_new();
+ rc = (jintLong)gtk_cell_renderer_toggle_new();
OS_NATIVE_EXIT(env, that, _1gtk_1cell_1renderer_1toggle_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1check_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1check_1button_1new_FUNC);
- rc = (jint)gtk_check_button_new();
+ rc = (jintLong)gtk_check_button_new();
OS_NATIVE_EXIT(env, that, _1gtk_1check_1button_1new_FUNC);
return rc;
}
@@ -6676,7 +6638,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1button_1new)
#ifndef NO__1gtk_1check_1menu_1item_1get_1active
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1get_1active_FUNC);
@@ -6687,14 +6649,14 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1get_1active)
#endif
#ifndef NO__1gtk_1check_1menu_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1new_1with_1label)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
+ rc = (jintLong)gtk_check_menu_item_new_with_label((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1check_1menu_1item_1new_1with_1label_FUNC);
@@ -6704,7 +6666,7 @@ fail:
#ifndef NO__1gtk_1check_1menu_1item_1set_1active
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1check_1menu_1item_1set_1active_FUNC);
gtk_check_menu_item_set_active((GtkCheckMenuItem *)arg0, (gboolean)arg1);
@@ -6713,12 +6675,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1check_1menu_1item_1set_1active)
#endif
#ifndef NO__1gtk_1check_1version
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1version)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1check_1version)
(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1check_1version_FUNC);
- rc = (jint)gtk_check_version(arg0, arg1, arg2);
+ rc = (jintLong)gtk_check_version(arg0, arg1, arg2);
OS_NATIVE_EXIT(env, that, _1gtk_1check_1version_FUNC);
return rc;
}
@@ -6726,7 +6688,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1check_1version)
#ifndef NO__1gtk_1clipboard_1clear
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1clear)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1clear_FUNC);
gtk_clipboard_clear((GtkClipboard *)arg0);
@@ -6735,12 +6697,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1clipboard_1clear)
#endif
#ifndef NO__1gtk_1clipboard_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1get_FUNC);
- rc = (jint)gtk_clipboard_get((GdkAtom)arg0);
+ rc = (jintLong)gtk_clipboard_get((GdkAtom)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1get_FUNC);
return rc;
}
@@ -6748,7 +6710,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1get)
#ifndef NO__1gtk_1clipboard_1set_1with_1data
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jintLong arg4, jintLong arg5)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1set_1with_1data_FUNC);
@@ -6759,26 +6721,26 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1clipboard_1set_1with_1data)
#endif
#ifndef NO__1gtk_1clipboard_1wait_1for_1contents
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1clipboard_1wait_1for_1contents)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
- rc = (jint)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
+ rc = (jintLong)gtk_clipboard_wait_for_contents((GtkClipboard *)arg0, (GdkAtom)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1clipboard_1wait_1for_1contents_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1color_1selection_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1color_1selection_1dialog_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_color_selection_dialog_new((const gchar *)lparg0);
+ rc = (jintLong)gtk_color_selection_dialog_new((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1color_1selection_1dialog_1new_FUNC);
@@ -6788,7 +6750,7 @@ fail:
#ifndef NO__1gtk_1color_1selection_1get_1current_1color
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1get_1current_1color)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1get_1current_1color_FUNC);
@@ -6802,7 +6764,7 @@ fail:
#ifndef NO__1gtk_1color_1selection_1set_1current_1color
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1current_1color)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1current_1color_FUNC);
@@ -6815,7 +6777,7 @@ fail:
#ifndef NO__1gtk_1color_1selection_1set_1has_1palette
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1color_1selection_1set_1has_1palette_FUNC);
gtk_color_selection_set_has_palette((GtkColorSelection *)arg0, arg1);
@@ -6824,27 +6786,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1color_1selection_1set_1has_1palette)
#endif
#ifndef NO__1gtk_1combo_1box_1entry_1new_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1entry_1new_1text_FUNC);
/*
- rc = (jint)gtk_combo_box_entry_new_text();
+ rc = (jintLong)gtk_combo_box_entry_new_text();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_entry_new_text_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_entry_new_text");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gtk_combo_box_entry_new_text)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1entry_1new_1text_FUNC);
@@ -6854,7 +6807,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1entry_1new_1text)
#ifndef NO__1gtk_1combo_1box_1get_1active
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
@@ -6862,18 +6815,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
rc = (jint)gtk_combo_box_get_active(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_get_active_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_get_active");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_combo_box_get_active)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1active_FUNC);
@@ -6882,27 +6826,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1active)
#endif
#ifndef NO__1gtk_1combo_1box_1get_1model
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
/*
- rc = (jint)gtk_combo_box_get_model(arg0);
+ rc = (jintLong)gtk_combo_box_get_model(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_get_model_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_get_model");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_combo_box_get_model)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1get_1model_FUNC);
@@ -6912,7 +6847,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1get_1model)
#ifndef NO__1gtk_1combo_1box_1insert_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2)
{
jbyte *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1insert_1text_FUNC);
@@ -6921,17 +6856,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1insert_1text)
gtk_combo_box_insert_text(arg0, arg1, lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_insert_text_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_insert_text");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, lparg2);
+ LOAD_FUNCTION(fp, gtk_combo_box_insert_text)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint, jbyte *))fp)(arg0, arg1, lparg2);
}
}
fail:
@@ -6941,27 +6868,18 @@ fail:
#endif
#ifndef NO__1gtk_1combo_1box_1new_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1new_1text_FUNC);
/*
- rc = (jint)gtk_combo_box_new_text();
+ rc = (jintLong)gtk_combo_box_new_text();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_new_text_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_new_text");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gtk_combo_box_new_text)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1new_1text_FUNC);
@@ -6971,24 +6889,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1box_1new_1text)
#ifndef NO__1gtk_1combo_1box_1popdown
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popdown_FUNC);
/*
gtk_combo_box_popdown(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_popdown_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_popdown");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_combo_box_popdown)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popdown_FUNC);
@@ -6997,24 +6907,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popdown)
#ifndef NO__1gtk_1combo_1box_1popup
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1popup_FUNC);
/*
gtk_combo_box_popup(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_popup_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_popup");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_combo_box_popup)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1popup_FUNC);
@@ -7023,24 +6925,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1popup)
#ifndef NO__1gtk_1combo_1box_1remove_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1remove_1text_FUNC);
/*
gtk_combo_box_remove_text(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_remove_text_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_remove_text");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_combo_box_remove_text)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1remove_1text_FUNC);
@@ -7049,24 +6943,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1remove_1text)
#ifndef NO__1gtk_1combo_1box_1set_1active
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
/*
gtk_combo_box_set_active(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_set_active_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_set_active");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_combo_box_set_active)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1active_FUNC);
@@ -7075,24 +6961,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1active)
#ifndef NO__1gtk_1combo_1box_1set_1focus_1on_1click
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
/*
gtk_combo_box_set_focus_on_click(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_combo_box_set_focus_on_click_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_combo_box_set_focus_on_click");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_combo_box_set_focus_on_click)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1focus_1on_1click_FUNC);
@@ -7101,7 +6979,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
#ifndef NO__1gtk_1combo_1disable_1activate
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1disable_1activate)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1disable_1activate_FUNC);
gtk_combo_disable_activate((GtkCombo *)arg0);
@@ -7110,12 +6988,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1disable_1activate)
#endif
#ifndef NO__1gtk_1combo_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1combo_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1new_FUNC);
- rc = (jint)gtk_combo_new();
+ rc = (jintLong)gtk_combo_new();
OS_NATIVE_EXIT(env, that, _1gtk_1combo_1new_FUNC);
return rc;
}
@@ -7123,7 +7001,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1combo_1new)
#ifndef NO__1gtk_1combo_1set_1case_1sensitive
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1case_1sensitive)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1set_1case_1sensitive_FUNC);
gtk_combo_set_case_sensitive((GtkCombo *)arg0, (gboolean)arg1);
@@ -7133,7 +7011,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1case_1sensitive)
#ifndef NO__1gtk_1combo_1set_1popdown_1strings
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1popdown_1strings)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1combo_1set_1popdown_1strings_FUNC);
gtk_combo_set_popdown_strings((GtkCombo *)arg0, (GList *)arg1);
@@ -7143,7 +7021,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1set_1popdown_1strings)
#ifndef NO__1gtk_1container_1add
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC);
gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1);
@@ -7153,7 +7031,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
#ifndef NO__1gtk_1container_1forall
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1forall)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1container_1forall_FUNC);
gtk_container_forall((GtkContainer *)arg0, (GtkCallback)arg1, (gpointer)arg2);
@@ -7163,7 +7041,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1forall)
#ifndef NO__1gtk_1container_1get_1border_1width
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1border_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1border_1width_FUNC);
@@ -7174,12 +7052,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1border_1width)
#endif
#ifndef NO__1gtk_1container_1get_1children
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1container_1get_1children_FUNC);
- rc = (jint)gtk_container_get_children((GtkContainer *)arg0);
+ rc = (jintLong)gtk_container_get_children((GtkContainer *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1container_1get_1children_FUNC);
return rc;
}
@@ -7187,7 +7065,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1container_1get_1children)
#ifndef NO__1gtk_1container_1remove
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1remove)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1container_1remove_FUNC);
gtk_container_remove((GtkContainer *)arg0, (GtkWidget *)arg1);
@@ -7197,7 +7075,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1remove)
#ifndef NO__1gtk_1container_1resize_1children
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1resize_1children)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1container_1resize_1children_FUNC);
gtk_container_resize_children((GtkContainer *)arg0);
@@ -7207,7 +7085,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1resize_1children)
#ifndef NO__1gtk_1container_1set_1border_1width
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1container_1set_1border_1width_FUNC);
gtk_container_set_border_width((GtkContainer *)arg0, (guint)arg1);
@@ -7216,14 +7094,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1set_1border_1width)
#endif
#ifndef NO__1gtk_1dialog_1add_1button
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1dialog_1add_1button)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1add_1button_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
+ rc = (jintLong)gtk_dialog_add_button((GtkDialog *)arg0, (const gchar *)lparg1, (gint)arg2);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1dialog_1add_1button_FUNC);
@@ -7233,7 +7111,7 @@ fail:
#ifndef NO__1gtk_1dialog_1run
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1run)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1dialog_1run_FUNC);
@@ -7244,12 +7122,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1dialog_1run)
#endif
#ifndef NO__1gtk_1drag_1begin
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1begin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1begin)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1begin_FUNC);
- rc = (jint)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
+ rc = (jintLong)gtk_drag_begin((GtkWidget *)arg0, (GtkTargetList *)arg1, (GdkDragAction)arg2, (gint)arg3, (GdkEvent *)arg4);
OS_NATIVE_EXIT(env, that, _1gtk_1drag_1begin_FUNC);
return rc;
}
@@ -7257,7 +7135,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1begin)
#ifndef NO__1gtk_1drag_1check_1threshold
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1drag_1check_1threshold)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1check_1threshold_FUNC);
@@ -7268,12 +7146,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1drag_1check_1threshold)
#endif
#ifndef NO__1gtk_1drag_1dest_1find_1target
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
- rc = (jint)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
+ rc = (jintLong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
OS_NATIVE_EXIT(env, that, _1gtk_1drag_1dest_1find_1target_FUNC);
return rc;
}
@@ -7281,7 +7159,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drag_1dest_1find_1target)
#ifndef NO__1gtk_1drag_1dest_1set
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1set)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3, jint arg4)
{
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1set_FUNC);
gtk_drag_dest_set((GtkWidget *)arg0, (GtkDestDefaults)arg1, (const GtkTargetEntry *)arg2, (gint)arg3, (GdkDragAction)arg4);
@@ -7291,7 +7169,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1set)
#ifndef NO__1gtk_1drag_1dest_1unset
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1unset)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1dest_1unset_FUNC);
gtk_drag_dest_unset((GtkWidget *)arg0);
@@ -7301,7 +7179,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1dest_1unset)
#ifndef NO__1gtk_1drag_1finish
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1finish)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1, jboolean arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jboolean arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1finish_FUNC);
gtk_drag_finish((GdkDragContext *)arg0, (gboolean)arg1, (gboolean)arg2, (guint32)arg3);
@@ -7311,7 +7189,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1finish)
#ifndef NO__1gtk_1drag_1get_1data
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1get_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1get_1data_FUNC);
gtk_drag_get_data((GtkWidget *)arg0, (GdkDragContext *)arg1, (GdkAtom)arg2, (guint32)arg3);
@@ -7321,7 +7199,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1get_1data)
#ifndef NO__1gtk_1drag_1set_1icon_1pixbuf
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1drag_1set_1icon_1pixbuf_FUNC);
gtk_drag_set_icon_pixbuf((GdkDragContext *)arg0, (GdkPixbuf *)arg1, arg2, arg3);
@@ -7330,12 +7208,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1drag_1set_1icon_1pixbuf)
#endif
#ifndef NO__1gtk_1drawing_1area_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1drawing_1area_1new_FUNC);
- rc = (jint)gtk_drawing_area_new();
+ rc = (jintLong)gtk_drawing_area_new();
OS_NATIVE_EXIT(env, that, _1gtk_1drawing_1area_1new_FUNC);
return rc;
}
@@ -7343,7 +7221,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1drawing_1area_1new)
#ifndef NO__1gtk_1editable_1copy_1clipboard
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1copy_1clipboard_FUNC);
gtk_editable_copy_clipboard((GtkEditable *)arg0);
@@ -7353,7 +7231,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1copy_1clipboard)
#ifndef NO__1gtk_1editable_1cut_1clipboard
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1cut_1clipboard)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1cut_1clipboard_FUNC);
gtk_editable_cut_clipboard((GtkEditable *)arg0);
@@ -7363,7 +7241,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1cut_1clipboard)
#ifndef NO__1gtk_1editable_1delete_1selection
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1selection)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1selection_FUNC);
gtk_editable_delete_selection((GtkEditable *)arg0);
@@ -7373,7 +7251,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1selection)
#ifndef NO__1gtk_1editable_1delete_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1delete_1text_FUNC);
gtk_editable_delete_text((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
@@ -7382,12 +7260,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1delete_1text)
#endif
#ifndef NO__1gtk_1editable_1get_1chars
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1chars_FUNC);
- rc = (jint)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
+ rc = (jintLong)gtk_editable_get_chars((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
OS_NATIVE_EXIT(env, that, _1gtk_1editable_1get_1chars_FUNC);
return rc;
}
@@ -7395,7 +7273,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1chars)
#ifndef NO__1gtk_1editable_1get_1editable
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1editable_FUNC);
@@ -7407,7 +7285,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1editable)
#ifndef NO__1gtk_1editable_1get_1position
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1position)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1get_1position_FUNC);
@@ -7419,7 +7297,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1editable_1get_1position)
#ifndef NO__1gtk_1editable_1get_1selection_1bounds
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1editable_1get_1selection_1bounds)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -7438,7 +7316,7 @@ fail:
#ifndef NO__1gtk_1editable_1insert_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1insert_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
{
jbyte *lparg1=NULL;
jint *lparg3=NULL;
@@ -7455,7 +7333,7 @@ fail:
#ifndef NO__1gtk_1editable_1paste_1clipboard
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1paste_1clipboard)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1paste_1clipboard_FUNC);
gtk_editable_paste_clipboard((GtkEditable *)arg0);
@@ -7465,7 +7343,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1paste_1clipboard)
#ifndef NO__1gtk_1editable_1select_1region
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1select_1region)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1select_1region_FUNC);
gtk_editable_select_region((GtkEditable *)arg0, (gint)arg1, (gint)arg2);
@@ -7475,7 +7353,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1select_1region)
#ifndef NO__1gtk_1editable_1set_1editable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1editable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1editable_FUNC);
gtk_editable_set_editable((GtkEditable *)arg0, (gboolean)arg1);
@@ -7485,7 +7363,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1editable)
#ifndef NO__1gtk_1editable_1set_1position
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1position)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1editable_1set_1position_FUNC);
gtk_editable_set_position((GtkEditable *)arg0, (gint)arg1);
@@ -7493,9 +7371,29 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1editable_1set_1position)
}
#endif
+#ifndef NO__1gtk_1entry_1get_1inner_1border
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1inner_1border)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1inner_1border_FUNC);
+/*
+ rc = (jintLong)gtk_entry_get_inner_border(arg0);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_entry_get_inner_border)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1inner_1border_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gtk_1entry_1get_1invisible_1char
JNIEXPORT jchar JNICALL OS_NATIVE(_1gtk_1entry_1get_1invisible_1char)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jchar rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1invisible_1char_FUNC);
@@ -7506,12 +7404,12 @@ JNIEXPORT jchar JNICALL OS_NATIVE(_1gtk_1entry_1get_1invisible_1char)
#endif
#ifndef NO__1gtk_1entry_1get_1layout
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1layout_FUNC);
- rc = (jint)gtk_entry_get_layout((GtkEntry *)arg0);
+ rc = (jintLong)gtk_entry_get_layout((GtkEntry *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1layout_FUNC);
return rc;
}
@@ -7519,7 +7417,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout)
#ifndef NO__1gtk_1entry_1get_1layout_1offsets
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1get_1layout_1offsets)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -7536,7 +7434,7 @@ fail:
#ifndef NO__1gtk_1entry_1get_1max_1length
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1max_1length)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1max_1length_FUNC);
@@ -7547,12 +7445,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1max_1length)
#endif
#ifndef NO__1gtk_1entry_1get_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1text_FUNC);
- rc = (jint)gtk_entry_get_text((GtkEntry *)arg0);
+ rc = (jintLong)gtk_entry_get_text((GtkEntry *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1entry_1get_1text_FUNC);
return rc;
}
@@ -7560,7 +7458,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1get_1text)
#ifndef NO__1gtk_1entry_1get_1visibility
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1entry_1get_1visibility)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1get_1visibility_FUNC);
@@ -7571,12 +7469,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1entry_1get_1visibility)
#endif
#ifndef NO__1gtk_1entry_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1entry_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1new_FUNC);
- rc = (jint)gtk_entry_new();
+ rc = (jintLong)gtk_entry_new();
OS_NATIVE_EXIT(env, that, _1gtk_1entry_1new_FUNC);
return rc;
}
@@ -7584,7 +7482,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1new)
#ifndef NO__1gtk_1entry_1set_1activates_1default
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1activates_1default)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1activates_1default_FUNC);
gtk_entry_set_activates_default((GtkEntry *)arg0, (gboolean)arg1);
@@ -7594,24 +7492,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1activates_1default)
#ifndef NO__1gtk_1entry_1set_1alignment
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment)
- (JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1alignment_FUNC);
/*
gtk_entry_set_alignment((GtkEntry *)arg0, (gfloat)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkEntry *, gfloat);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_entry_set_alignment_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_entry_set_alignment");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkEntry *)arg0, (gfloat)arg1);
+ LOAD_FUNCTION(fp, gtk_entry_set_alignment)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkEntry *, gfloat))fp)((GtkEntry *)arg0, (gfloat)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1entry_1set_1alignment_FUNC);
@@ -7620,7 +7510,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1alignment)
#ifndef NO__1gtk_1entry_1set_1has_1frame
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1has_1frame)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1has_1frame_FUNC);
gtk_entry_set_has_frame((GtkEntry *)arg0, (gboolean)arg1);
@@ -7630,7 +7520,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1has_1frame)
#ifndef NO__1gtk_1entry_1set_1invisible_1char
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1invisible_1char)
- (JNIEnv *env, jclass that, jint arg0, jchar arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jchar arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1invisible_1char_FUNC);
gtk_entry_set_invisible_char((GtkEntry *)arg0, (gint)arg1);
@@ -7640,7 +7530,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1invisible_1char)
#ifndef NO__1gtk_1entry_1set_1max_1length
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1max_1length)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1max_1length_FUNC);
gtk_entry_set_max_length((GtkEntry *)arg0, (gint)arg1);
@@ -7650,7 +7540,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1max_1length)
#ifndef NO__1gtk_1entry_1set_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1text_FUNC);
@@ -7664,7 +7554,7 @@ fail:
#ifndef NO__1gtk_1entry_1set_1visibility
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1visibility)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1set_1visibility_FUNC);
gtk_entry_set_visibility((GtkEntry *)arg0, (gboolean)arg1);
@@ -7674,7 +7564,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1entry_1set_1visibility)
#ifndef NO__1gtk_1entry_1text_1index_1to_1layout_1index
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
@@ -7682,18 +7572,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
rc = (jint)gtk_entry_text_index_to_layout_index(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_entry_text_index_to_layout_index_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_entry_text_index_to_layout_index");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_entry_text_index_to_layout_index)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1entry_1text_1index_1to_1layout_1index_FUNC);
@@ -7703,24 +7584,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
#ifndef NO__1gtk_1enumerate_1printers
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1enumerate_1printers)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
/*
gtk_enumerate_printers(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, gpointer, GDestroyNotify, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_enumerate_printers_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_enumerate_printers");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
+ LOAD_FUNCTION(fp, gtk_enumerate_printers)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, gpointer, GDestroyNotify, gboolean))fp)(arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1enumerate_1printers_FUNC);
@@ -7741,7 +7614,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1events_1pending)
#ifndef NO__1gtk_1expander_1get_1expanded
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1expanded_FUNC);
@@ -7749,18 +7622,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
rc = (jboolean)gtk_expander_get_expanded(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_get_expanded_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_get_expanded");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_expander_get_expanded)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1expanded_FUNC);
@@ -7769,27 +7633,18 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1expander_1get_1expanded)
#endif
#ifndef NO__1gtk_1expander_1get_1label_1widget
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1expander_1get_1label_1widget_FUNC);
/*
- rc = (jint)gtk_expander_get_label_widget(arg0);
+ rc = (jintLong)gtk_expander_get_label_widget(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_get_label_widget_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_get_label_widget");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_expander_get_label_widget)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1expander_1get_1label_1widget_FUNC);
@@ -7798,29 +7653,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1get_1label_1widget)
#endif
#ifndef NO__1gtk_1expander_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1expander_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1expander_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1expander_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_expander_new((const gchar *)lparg0);
+ rc = (jintLong)gtk_expander_new((const gchar *)lparg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(const gchar *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((const gchar *)lparg0);
+ LOAD_FUNCTION(fp, gtk_expander_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0);
}
}
fail:
@@ -7832,24 +7678,16 @@ fail:
#ifndef NO__1gtk_1expander_1set_1expanded
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1expanded_FUNC);
/*
gtk_expander_set_expanded(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_set_expanded_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_set_expanded");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_expander_set_expanded)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1expanded_FUNC);
@@ -7858,7 +7696,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1expanded)
#ifndef NO__1gtk_1expander_1set_1label
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_FUNC);
@@ -7867,17 +7705,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label)
gtk_expander_set_label(arg0, (const gchar *)lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, const gchar *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_set_label_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_set_label");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, (const gchar *)lparg1);
+ LOAD_FUNCTION(fp, gtk_expander_set_label)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
}
}
fail:
@@ -7888,24 +7718,16 @@ fail:
#ifndef NO__1gtk_1expander_1set_1label_1widget
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
/*
gtk_expander_set_label_widget(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_expander_set_label_widget_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_expander_set_label_widget");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_expander_set_label_widget)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1expander_1set_1label_1widget_FUNC);
@@ -7914,24 +7736,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1expander_1set_1label_1widget)
#ifndef NO__1gtk_1file_1chooser_1add_1filter
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
/*
gtk_file_chooser_add_filter(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_add_filter_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_add_filter");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_add_filter)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1add_1filter_FUNC);
@@ -7939,27 +7753,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1add_1filter)
#endif
#ifndef NO__1gtk_1file_1chooser_1get_1current_1folder
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC);
/*
- rc = (jint)gtk_file_chooser_get_current_folder(arg0);
+ rc = (jintLong)gtk_file_chooser_get_current_folder(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_get_current_folder_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_current_folder");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_file_chooser_get_current_folder)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1current_1folder_FUNC);
@@ -7968,27 +7773,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1current_1folder)
#endif
#ifndef NO__1gtk_1file_1chooser_1get_1filename
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
/*
- rc = (jint)gtk_file_chooser_get_filename(arg0);
+ rc = (jintLong)gtk_file_chooser_get_filename(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_get_filename_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_filename");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_file_chooser_get_filename)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filename_FUNC);
@@ -7997,27 +7793,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filename)
#endif
#ifndef NO__1gtk_1file_1chooser_1get_1filenames
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
/*
- rc = (jint)gtk_file_chooser_get_filenames(arg0);
+ rc = (jintLong)gtk_file_chooser_get_filenames(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_get_filenames_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_filenames");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_file_chooser_get_filenames)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filenames_FUNC);
@@ -8026,27 +7813,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filenames)
#endif
#ifndef NO__1gtk_1file_1chooser_1get_1filter
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
/*
- rc = (jint)gtk_file_chooser_get_filter(arg0);
+ rc = (jintLong)gtk_file_chooser_get_filter(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_get_filter_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_get_filter");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_file_chooser_get_filter)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1filter_FUNC);
@@ -8054,35 +7832,89 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1filter)
}
#endif
+#ifndef NO__1gtk_1file_1chooser_1get_1uri
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uri)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC);
+/*
+ rc = (jintLong)gtk_file_chooser_get_uri(arg0);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_file_chooser_get_uri)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uri_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1file_1chooser_1get_1uris
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1get_1uris)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC);
+/*
+ rc = (jintLong)gtk_file_chooser_get_uris(arg0);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_file_chooser_get_uris)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1get_1uris_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gtk_1file_1chooser_1set_1current_1folder
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
/*
gtk_file_chooser_set_current_folder(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_current_folder_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_current_folder");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_FUNC);
}
#endif
+#ifndef NO__1gtk_1file_1chooser_1set_1current_1folder_1uri
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1folder_1uri)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+ jbyte *lparg1=NULL;
+ OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC);
+ if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+ gtk_file_chooser_set_current_folder_uri(arg0, lparg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_current_folder_uri)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
+ }
+ }
+fail:
+ if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1file_1chooser_1set_1current_1name
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1current_1name_FUNC);
@@ -8091,17 +7923,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1current_1name)
gtk_file_chooser_set_current_name(arg0, lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_current_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_current_name");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, lparg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_current_name)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
}
}
fail:
@@ -8112,24 +7936,16 @@ fail:
#ifndef NO__1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
/*
gtk_file_chooser_set_do_overwrite_confirmation(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_do_overwrite_confirmation_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_do_overwrite_confirmation");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_do_overwrite_confirmation)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC);
@@ -8138,24 +7954,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1do_1overwrite_1confi
#ifndef NO__1gtk_1file_1chooser_1set_1extra_1widget
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
/*
gtk_file_chooser_set_extra_widget(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_extra_widget_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_extra_widget");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_extra_widget)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1extra_1widget_FUNC);
@@ -8164,24 +7972,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1extra_1widget)
#ifndef NO__1gtk_1file_1chooser_1set_1filename
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
/*
gtk_file_chooser_set_filename(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_filename_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_filename");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_filename)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filename_FUNC);
@@ -8190,59 +7990,83 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filename)
#ifndef NO__1gtk_1file_1chooser_1set_1filter
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1filter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
/*
gtk_file_chooser_set_filter(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_filter_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_filter");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_filter)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1filter_FUNC);
}
#endif
+#ifndef NO__1gtk_1file_1chooser_1set_1local_1only
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1local_1only)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC);
+/*
+ gtk_file_chooser_set_local_only(arg0, arg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_local_only)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1local_1only_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1file_1chooser_1set_1select_1multiple
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1select_1multiple)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
/*
gtk_file_chooser_set_select_multiple(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_chooser_set_select_multiple_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_chooser_set_select_multiple");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_select_multiple)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1select_1multiple_FUNC);
}
#endif
+#ifndef NO__1gtk_1file_1chooser_1set_1uri
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1chooser_1set_1uri)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+ jbyte *lparg1=NULL;
+ OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC);
+ if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+ gtk_file_chooser_set_uri(arg0, lparg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_file_chooser_set_uri)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
+ }
+ }
+fail:
+ if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1file_1chooser_1set_1uri_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1file_1filter_1add_1pattern
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1add_1pattern_FUNC);
@@ -8251,17 +8075,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1add_1pattern)
gtk_file_filter_add_pattern(arg0, lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_filter_add_pattern_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_add_pattern");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, lparg1);
+ LOAD_FUNCTION(fp, gtk_file_filter_add_pattern)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
}
}
fail:
@@ -8271,27 +8087,18 @@ fail:
#endif
#ifndef NO__1gtk_1file_1filter_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
/*
- rc = (jint)gtk_file_filter_get_name(arg0);
+ rc = (jintLong)gtk_file_filter_get_name(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_filter_get_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_get_name");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_file_filter_get_name)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1get_1name_FUNC);
@@ -8300,27 +8107,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1get_1name)
#endif
#ifndef NO__1gtk_1file_1filter_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1new_FUNC);
/*
- rc = (jint)gtk_file_filter_new();
+ rc = (jintLong)gtk_file_filter_new();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_filter_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gtk_file_filter_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1file_1filter_1new_FUNC);
@@ -8330,7 +8128,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1filter_1new)
#ifndef NO__1gtk_1file_1filter_1set_1name
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1filter_1set_1name_FUNC);
@@ -8339,17 +8137,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1filter_1set_1name)
gtk_file_filter_set_name(arg0, lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_file_filter_set_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_file_filter_set_name");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, lparg1);
+ LOAD_FUNCTION(fp, gtk_file_filter_set_name)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
}
}
fail:
@@ -8359,24 +8149,24 @@ fail:
#endif
#ifndef NO__1gtk_1file_1selection_1get_1filename
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1filename)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1filename)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1get_1filename_FUNC);
- rc = (jint)gtk_file_selection_get_filename((GtkFileSelection *)arg0);
+ rc = (jintLong)gtk_file_selection_get_filename((GtkFileSelection *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1get_1filename_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1file_1selection_1get_1selections
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1get_1selections_FUNC);
- rc = (jint)gtk_file_selection_get_selections((GtkFileSelection *)arg0);
+ rc = (jintLong)gtk_file_selection_get_selections((GtkFileSelection *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1get_1selections_FUNC);
return rc;
}
@@ -8384,7 +8174,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1get_1selections)
#ifndef NO__1gtk_1file_1selection_1hide_1fileop_1buttons
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1hide_1fileop_1buttons)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1hide_1fileop_1buttons_FUNC);
gtk_file_selection_hide_fileop_buttons((GtkFileSelection *)arg0);
@@ -8393,14 +8183,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1hide_1fileop_1buttons)
#endif
#ifndef NO__1gtk_1file_1selection_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1file_1selection_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1selection_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_file_selection_new((const gchar *)lparg0);
+ rc = (jintLong)gtk_file_selection_new((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1file_1selection_1new_FUNC);
@@ -8410,7 +8200,7 @@ fail:
#ifndef NO__1gtk_1file_1selection_1set_1filename
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1filename)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1set_1filename_FUNC);
gtk_file_selection_set_filename((GtkFileSelection *)arg0, (const gchar *)arg1);
@@ -8420,7 +8210,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1filename)
#ifndef NO__1gtk_1file_1selection_1set_1select_1multiple
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1select_1multiple)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1file_1selection_1set_1select_1multiple_FUNC);
gtk_file_selection_set_select_multiple((GtkFileSelection *)arg0, (gboolean)arg1);
@@ -8430,7 +8220,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1file_1selection_1set_1select_1multiple)
#ifndef NO__1gtk_1fixed_1move
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1move)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1move_FUNC);
gtk_fixed_move((GtkFixed *)arg0, (GtkWidget *)arg1, (gint)arg2, (gint)arg3);
@@ -8439,12 +8229,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1move)
#endif
#ifndef NO__1gtk_1fixed_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1fixed_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1fixed_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1new_FUNC);
- rc = (jint)gtk_fixed_new();
+ rc = (jintLong)gtk_fixed_new();
OS_NATIVE_EXIT(env, that, _1gtk_1fixed_1new_FUNC);
return rc;
}
@@ -8452,7 +8242,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1fixed_1new)
#ifndef NO__1gtk_1fixed_1set_1has_1window
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1set_1has_1window)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1fixed_1set_1has_1window_FUNC);
gtk_fixed_set_has_window((GtkFixed *)arg0, (gboolean)arg1);
@@ -8461,26 +8251,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1fixed_1set_1has_1window)
#endif
#ifndef NO__1gtk_1font_1selection_1dialog_1get_1font_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1get_1font_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
- rc = (jint)gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)arg0);
+ rc = (jintLong)gtk_font_selection_dialog_get_font_name((GtkFontSelectionDialog *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1get_1font_1name_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1font_1selection_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_font_selection_dialog_new((const gchar *)lparg0);
+ rc = (jintLong)gtk_font_selection_dialog_new((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1font_1selection_1dialog_1new_FUNC);
@@ -8490,7 +8280,7 @@ fail:
#ifndef NO__1gtk_1font_1selection_1dialog_1set_1font_1name
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1font_1selection_1dialog_1set_1font_1name)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
jboolean rc = 0;
@@ -8505,26 +8295,26 @@ fail:
#endif
#ifndef NO__1gtk_1frame_1get_1label_1widget
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1frame_1get_1label_1widget)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
- rc = (jint)gtk_frame_get_label_widget((GtkFrame *)arg0);
+ rc = (jintLong)gtk_frame_get_label_widget((GtkFrame *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1frame_1get_1label_1widget_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1frame_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1frame_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1frame_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1frame_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_frame_new((const gchar *)lparg0);
+ rc = (jintLong)gtk_frame_new((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1frame_1new_FUNC);
@@ -8534,7 +8324,7 @@ fail:
#ifndef NO__1gtk_1frame_1set_1label
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_FUNC);
@@ -8548,7 +8338,7 @@ fail:
#ifndef NO__1gtk_1frame_1set_1label_1widget
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1label_1widget_FUNC);
gtk_frame_set_label_widget((GtkFrame *)arg0, (GtkWidget *)arg1);
@@ -8558,7 +8348,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1label_1widget)
#ifndef NO__1gtk_1frame_1set_1shadow_1type
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1frame_1set_1shadow_1type_FUNC);
gtk_frame_set_shadow_type((GtkFrame *)arg0, (GtkShadowType)arg1);
@@ -8567,12 +8357,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1frame_1set_1shadow_1type)
#endif
#ifndef NO__1gtk_1get_1current_1event
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1current_1event)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1get_1current_1event_FUNC);
- rc = (jint)gtk_get_current_event();
+ rc = (jintLong)gtk_get_current_event();
OS_NATIVE_EXIT(env, that, _1gtk_1get_1current_1event_FUNC);
return rc;
}
@@ -8607,24 +8397,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1current_1event_1time)
#endif
#ifndef NO__1gtk_1get_1default_1language
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1default_1language)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1get_1default_1language_FUNC);
- rc = (jint)gtk_get_default_language();
+ rc = (jintLong)gtk_get_default_language();
OS_NATIVE_EXIT(env, that, _1gtk_1get_1default_1language_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1get_1event_1widget
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1get_1event_1widget_FUNC);
- rc = (jint)gtk_get_event_widget((GdkEvent *)arg0);
+ rc = (jintLong)gtk_get_event_widget((GdkEvent *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1get_1event_1widget_FUNC);
return rc;
}
@@ -8632,7 +8422,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1get_1event_1widget)
#ifndef NO__1gtk_1grab_1add
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1grab_1add_FUNC);
gtk_grab_add((GtkWidget *)arg0);
@@ -8641,12 +8431,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1add)
#endif
#ifndef NO__1gtk_1grab_1get_1current
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1grab_1get_1current_FUNC);
- rc = (jint)gtk_grab_get_current();
+ rc = (jintLong)gtk_grab_get_current();
OS_NATIVE_EXIT(env, that, _1gtk_1grab_1get_1current_FUNC);
return rc;
}
@@ -8654,7 +8444,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1grab_1get_1current)
#ifndef NO__1gtk_1grab_1remove
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1grab_1remove_FUNC);
gtk_grab_remove((GtkWidget *)arg0);
@@ -8663,62 +8453,62 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1grab_1remove)
#endif
#ifndef NO__1gtk_1hbox_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hbox_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hbox_1new)
(JNIEnv *env, jclass that, jboolean arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1hbox_1new_FUNC);
- rc = (jint)gtk_hbox_new((gboolean)arg0, (gint)arg1);
+ rc = (jintLong)gtk_hbox_new((gboolean)arg0, (gint)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1hbox_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1hscale_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hscale_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hscale_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1hscale_1new_FUNC);
- rc = (jint)gtk_hscale_new((GtkAdjustment *)arg0);
+ rc = (jintLong)gtk_hscale_new((GtkAdjustment *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1hscale_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1hscrollbar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hscrollbar_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1hscrollbar_1new_FUNC);
- rc = (jint)gtk_hscrollbar_new((GtkAdjustment *)arg0);
+ rc = (jintLong)gtk_hscrollbar_new((GtkAdjustment *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1hscrollbar_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1hseparator_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1hseparator_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1hseparator_1new_FUNC);
- rc = (jint)gtk_hseparator_new();
+ rc = (jintLong)gtk_hseparator_new();
OS_NATIVE_EXIT(env, that, _1gtk_1hseparator_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1icon_1factory_1lookup_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1factory_1lookup_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1factory_1lookup_1default)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1icon_1factory_1lookup_1default_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_icon_factory_lookup_default((const gchar *)lparg0);
+ rc = (jintLong)gtk_icon_factory_lookup_default((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1icon_1factory_1lookup_1default_FUNC);
@@ -8727,12 +8517,12 @@ fail:
#endif
#ifndef NO__1gtk_1icon_1set_1render_1icon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jintLong arg6)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1icon_1set_1render_1icon_FUNC);
- rc = (jint)gtk_icon_set_render_icon((GtkIconSet *)arg0, (GtkStyle *)arg1, (GtkTextDirection)arg2, (GtkStateType)arg3, (GtkIconSize)arg4, (GtkWidget *)arg5, (const char *)arg6);
+ rc = (jintLong)gtk_icon_set_render_icon((GtkIconSet *)arg0, (GtkStyle *)arg1, (GtkTextDirection)arg2, (GtkStateType)arg3, (GtkIconSize)arg4, (GtkWidget *)arg5, (const char *)arg6);
OS_NATIVE_EXIT(env, that, _1gtk_1icon_1set_1render_1icon_FUNC);
return rc;
}
@@ -8740,7 +8530,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1set_1render_1icon)
#ifndef NO__1gtk_1icon_1source_1free
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1free_FUNC);
gtk_icon_source_free((GtkIconSource *)arg0);
@@ -8749,12 +8539,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1free)
#endif
#ifndef NO__1gtk_1icon_1source_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1new_FUNC);
- rc = (jint)gtk_icon_source_new();
+ rc = (jintLong)gtk_icon_source_new();
OS_NATIVE_EXIT(env, that, _1gtk_1icon_1source_1new_FUNC);
return rc;
}
@@ -8762,7 +8552,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1icon_1source_1new)
#ifndef NO__1gtk_1icon_1source_1set_1pixbuf
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1set_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1icon_1source_1set_1pixbuf_FUNC);
gtk_icon_source_set_pixbuf((GtkIconSource *)arg0, (GdkPixbuf *)arg1);
@@ -8772,7 +8562,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1icon_1source_1set_1pixbuf)
#ifndef NO__1gtk_1im_1context_1filter_1keypress
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1im_1context_1filter_1keypress)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1filter_1keypress_FUNC);
@@ -8784,7 +8574,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1im_1context_1filter_1keypress)
#ifndef NO__1gtk_1im_1context_1focus_1in
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1in)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1in_FUNC);
gtk_im_context_focus_in((GtkIMContext *)arg0);
@@ -8794,7 +8584,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1in)
#ifndef NO__1gtk_1im_1context_1focus_1out
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1out)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1focus_1out_FUNC);
gtk_im_context_focus_out((GtkIMContext *)arg0);
@@ -8804,31 +8594,31 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1focus_1out)
#ifndef NO__1gtk_1im_1context_1get_1preedit_1string
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1preedit_1string)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2, jintArray arg3)
{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
+ jintLong *lparg1=NULL;
+ jintLong *lparg2=NULL;
jint *lparg3=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1preedit_1string_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;
+ 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 (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
gtk_im_context_get_preedit_string((GtkIMContext *)arg0, (gchar **)lparg1, (PangoAttrList **)lparg2, (gint *)lparg3);
fail:
if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
}
#endif
#ifndef NO__1gtk_1im_1context_1get_1type
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1type_FUNC);
- rc = (jint)gtk_im_context_get_type();
+ rc = (jintLong)gtk_im_context_get_type();
OS_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1type_FUNC);
return rc;
}
@@ -8836,7 +8626,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1context_1get_1type)
#ifndef NO__1gtk_1im_1context_1reset
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1reset)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1reset_FUNC);
gtk_im_context_reset((GtkIMContext *)arg0);
@@ -8846,7 +8636,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1reset)
#ifndef NO__1gtk_1im_1context_1set_1client_1window
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1client_1window)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1client_1window_FUNC);
gtk_im_context_set_client_window((GtkIMContext *)arg0, (GdkWindow *)arg1);
@@ -8856,7 +8646,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1client_1window)
#ifndef NO__1gtk_1im_1context_1set_1cursor_1location
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1context_1set_1cursor_1location)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1im_1context_1set_1cursor_1location_FUNC);
@@ -8869,7 +8659,7 @@ fail:
#ifndef NO__1gtk_1im_1multicontext_1append_1menuitems
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1append_1menuitems_FUNC);
gtk_im_multicontext_append_menuitems((GtkIMMulticontext *)arg0, (GtkMenuShell *)arg1);
@@ -8878,26 +8668,26 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1append_1menuitems)
#endif
#ifndef NO__1gtk_1im_1multicontext_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1im_1multicontext_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1im_1multicontext_1new_FUNC);
- rc = (jint)gtk_im_multicontext_new();
+ rc = (jintLong)gtk_im_multicontext_new();
OS_NATIVE_EXIT(env, that, _1gtk_1im_1multicontext_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1image_1menu_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1new_1with_1label)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
+ rc = (jintLong)gtk_image_menu_item_new_with_label((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1image_1menu_1item_1new_1with_1label_FUNC);
@@ -8907,7 +8697,7 @@ fail:
#ifndef NO__1gtk_1image_1menu_1item_1set_1image
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1image_1menu_1item_1set_1image_FUNC);
gtk_image_menu_item_set_image((GtkImageMenuItem *)arg0, (GtkWidget *)arg1);
@@ -8916,36 +8706,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1menu_1item_1set_1image)
#endif
#ifndef NO__1gtk_1image_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_FUNC);
- rc = (jint)gtk_image_new();
+ rc = (jintLong)gtk_image_new();
OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1image_1new_1from_1pixbuf
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
- rc = (jint)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
+ rc = (jintLong)gtk_image_new_from_pixbuf((GdkPixbuf *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixbuf_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1image_1new_1from_1pixmap
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1image_1new_1from_1pixmap_FUNC);
- rc = (jint)gtk_image_new_from_pixmap((GdkPixmap *)arg0, (GdkBitmap *)arg1);
+ rc = (jintLong)gtk_image_new_from_pixmap((GdkPixmap *)arg0, (GdkBitmap *)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1image_1new_1from_1pixmap_FUNC);
return rc;
}
@@ -8953,7 +8743,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixmap)
#ifndef NO__1gtk_1image_1set_1from_1pixbuf
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixbuf_FUNC);
gtk_image_set_from_pixbuf((GtkImage *)arg0, (GdkPixbuf *)arg1);
@@ -8963,7 +8753,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
#ifndef NO__1gtk_1image_1set_1from_1pixmap
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixmap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1pixmap_FUNC);
gtk_image_set_from_pixmap((GtkImage *)arg0, (GdkBitmap *)arg1, (GdkBitmap *)arg2);
@@ -8973,30 +8763,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixmap)
#ifndef NO__1gtk_1init_1check
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1init_1check)
- (JNIEnv *env, jclass that, jintArray arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLongArray arg0, jintLongArray arg1)
{
- jint *lparg0=NULL;
- jint *lparg1=NULL;
+ jintLong *lparg0=NULL;
+ jintLong *lparg1=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1init_1check_FUNC);
- if (arg0) if ((lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL)) == NULL) goto fail;
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
rc = (jboolean)gtk_init_check((int *)lparg0, (char ***)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
- if (arg0 && lparg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+ if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1init_1check_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1label_1get_1layout
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC);
- rc = (jint)gtk_label_get_layout((GtkLabel *)arg0);
+ rc = (jintLong)gtk_label_get_layout((GtkLabel *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC);
return rc;
}
@@ -9004,7 +8794,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
#ifndef NO__1gtk_1label_1get_1mnemonic_1keyval
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1mnemonic_1keyval_FUNC);
@@ -9015,14 +8805,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
#endif
#ifndef NO__1gtk_1label_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_label_new((const gchar *)lparg0);
+ rc = (jintLong)gtk_label_new((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_FUNC);
@@ -9031,14 +8821,14 @@ fail:
#endif
#ifndef NO__1gtk_1label_1new_1with_1mnemonic
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1label_1new_1with_1mnemonic)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_label_new_with_mnemonic((const gchar *)lparg0);
+ rc = (jintLong)gtk_label_new_with_mnemonic((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1label_1new_1with_1mnemonic_FUNC);
@@ -9048,7 +8838,7 @@ fail:
#ifndef NO__1gtk_1label_1set_1attributes
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1attributes)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1attributes_FUNC);
gtk_label_set_attributes((GtkLabel *)arg0, (PangoAttrList *)arg1);
@@ -9058,7 +8848,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1attributes)
#ifndef NO__1gtk_1label_1set_1justify
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1justify)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1justify_FUNC);
gtk_label_set_justify((GtkLabel *)arg0, (GtkJustification)arg1);
@@ -9068,7 +8858,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1justify)
#ifndef NO__1gtk_1label_1set_1line_1wrap
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_FUNC);
gtk_label_set_line_wrap((GtkLabel *)arg0, (gboolean)arg1);
@@ -9078,57 +8868,71 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap)
#ifndef NO__1gtk_1label_1set_1line_1wrap_1mode
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1line_1wrap_1mode)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
/*
gtk_label_set_line_wrap_mode(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_label_set_line_wrap_mode_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_label_set_line_wrap_mode");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_label_set_line_wrap_mode)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1line_1wrap_1mode_FUNC);
}
#endif
-#ifndef NO__1gtk_1label_1set_1text__II
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1gtk_1label_1set_1text__II) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
+#endif
gtk_label_set_text((GtkLabel *)arg0, (const gchar *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__JJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1label_1set_1text__I_3B
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__I_3B)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+#if (!defined(NO__1gtk_1label_1set_1text__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1label_1set_1text__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
{
jbyte *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
gtk_label_set_text((GtkLabel *)arg0, (const gchar *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__I_3B_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1label_1set_1text__J_3B_FUNC);
+#endif
}
#endif
#ifndef NO__1gtk_1label_1set_1text_1with_1mnemonic
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1label_1set_1text_1with_1mnemonic)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1label_1set_1text_1with_1mnemonic_FUNC);
@@ -9142,7 +8946,7 @@ fail:
#ifndef NO__1gtk_1list_1append_1items
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1append_1items)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1append_1items_FUNC);
gtk_list_append_items((GtkList *)arg0, (GList *)arg1);
@@ -9152,7 +8956,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1append_1items)
#ifndef NO__1gtk_1list_1clear_1items
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1clear_1items)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1clear_1items_FUNC);
gtk_list_clear_items((GtkList *)arg0, arg1, arg2);
@@ -9162,7 +8966,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1clear_1items)
#ifndef NO__1gtk_1list_1insert_1items
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1insert_1items)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1insert_1items_FUNC);
gtk_list_insert_items((GtkList *)arg0, (GList *)arg1, arg2);
@@ -9171,14 +8975,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1insert_1items)
#endif
#ifndef NO__1gtk_1list_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1list_1item_1new_1with_1label)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1list_1item_1new_1with_1label)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1list_1item_1new_1with_1label_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_list_item_new_with_label((const gchar *)lparg0);
+ rc = (jintLong)gtk_list_item_new_with_label((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1list_1item_1new_1with_1label_FUNC);
@@ -9188,7 +8992,7 @@ fail:
#ifndef NO__1gtk_1list_1remove_1items
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1remove_1items)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1remove_1items_FUNC);
gtk_list_remove_items((GtkList *)arg0, (GList *)arg1);
@@ -9198,7 +9002,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1remove_1items)
#ifndef NO__1gtk_1list_1select_1item
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1select_1item)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1select_1item_FUNC);
gtk_list_select_item((GtkList *)arg0, arg1);
@@ -9208,7 +9012,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1select_1item)
#ifndef NO__1gtk_1list_1store_1append
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1append)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1append_FUNC);
gtk_list_store_append((GtkListStore *)arg0, (GtkTreeIter *)arg1);
@@ -9218,7 +9022,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1append)
#ifndef NO__1gtk_1list_1store_1clear
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1clear)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1clear_FUNC);
gtk_list_store_clear((GtkListStore *)arg0);
@@ -9228,7 +9032,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1clear)
#ifndef NO__1gtk_1list_1store_1insert
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1insert)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1insert_FUNC);
gtk_list_store_insert((GtkListStore *)arg0, (GtkTreeIter *)arg1, (gint)arg2);
@@ -9237,16 +9041,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1insert)
#endif
#ifndef NO__1gtk_1list_1store_1newv
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1list_1store_1newv)
+ (JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
- jint rc = 0;
+ jintLong *lparg1=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ rc = (jintLong)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC);
return rc;
}
@@ -9254,7 +9058,7 @@ fail:
#ifndef NO__1gtk_1list_1store_1remove
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1remove)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1remove_FUNC);
gtk_list_store_remove((GtkListStore *)arg0, (GtkTreeIter *)arg1);
@@ -9262,66 +9066,121 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1remove)
}
#endif
-#ifndef NO__1gtk_1list_1store_1set__IIIII
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIIJ_FUNC);
+#endif
gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIII_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIIJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1list_1store_1set__IIIJI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIJJ_FUNC);
+#endif
gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIJI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIJJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#endif
{
GdkColor _arg3, *lparg3=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1list_1store_1set__IIIZI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIZI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJIZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJIZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJIZJ_FUNC);
+#endif
gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__IIIZI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJIZJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1list_1store_1set__III_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__III_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1list_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1list_1store_1set__JJI_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1store_1set__JJI_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#endif
{
jbyte *lparg3=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1list_1store_1set__JJI_3BJ_FUNC);
+#endif
if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
gtk_list_store_set((GtkListStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__III_3BI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1list_1store_1set__JJI_3BJ_FUNC);
+#endif
}
#endif
#ifndef NO__1gtk_1list_1unselect_1all
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1all)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1unselect_1all_FUNC);
gtk_list_unselect_all((GtkList *)arg0);
@@ -9331,7 +9190,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1all)
#ifndef NO__1gtk_1list_1unselect_1item
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1list_1unselect_1item)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1list_1unselect_1item_FUNC);
gtk_list_unselect_item((GtkList *)arg0, arg1);
@@ -9351,7 +9210,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main)
#ifndef NO__1gtk_1main_1do_1event
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1main_1do_1event)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1main_1do_1event_FUNC);
gtk_main_do_event((GdkEvent *)arg0);
@@ -9384,24 +9243,36 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1major_1version)
#endif
#ifndef NO__1gtk_1menu_1bar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC);
- rc = (jint)gtk_menu_bar_new();
+ rc = (jintLong)gtk_menu_bar_new();
OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
return rc;
}
#endif
+#ifndef NO__1gtk_1menu_1get_1attach_1widget
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1get_1attach_1widget)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1menu_1get_1attach_1widget_FUNC);
+ rc = (jintLong)gtk_menu_get_attach_widget((GtkMenu *)arg0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1menu_1get_1attach_1widget_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO__1gtk_1menu_1item_1get_1submenu
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
- rc = (jint)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
+ rc = (jintLong)gtk_menu_item_get_submenu((GtkMenuItem *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1menu_1item_1get_1submenu_FUNC);
return rc;
}
@@ -9409,7 +9280,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1item_1get_1submenu)
#ifndef NO__1gtk_1menu_1item_1remove_1submenu
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1remove_1submenu)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1remove_1submenu_FUNC);
gtk_menu_item_remove_submenu((GtkMenuItem *)arg0);
@@ -9419,7 +9290,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1remove_1submenu)
#ifndef NO__1gtk_1menu_1item_1set_1submenu
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1set_1submenu)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1item_1set_1submenu_FUNC);
gtk_menu_item_set_submenu((GtkMenuItem *)arg0, (GtkWidget *)arg1);
@@ -9428,12 +9299,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1item_1set_1submenu)
#endif
#ifndef NO__1gtk_1menu_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1menu_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1new_FUNC);
- rc = (jint)gtk_menu_new();
+ rc = (jintLong)gtk_menu_new();
OS_NATIVE_EXIT(env, that, _1gtk_1menu_1new_FUNC);
return rc;
}
@@ -9441,7 +9312,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1new)
#ifndef NO__1gtk_1menu_1popdown
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popdown)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popdown_FUNC);
gtk_menu_popdown((GtkMenu *)arg0);
@@ -9451,7 +9322,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popdown)
#ifndef NO__1gtk_1menu_1popup
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5, jint arg6)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1popup_FUNC);
gtk_menu_popup((GtkMenu *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (GtkMenuPositionFunc)arg3, (gpointer)arg4, (guint)arg5, (guint32)arg6);
@@ -9461,7 +9332,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1popup)
#ifndef NO__1gtk_1menu_1shell_1deactivate
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deactivate)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1deactivate_FUNC);
gtk_menu_shell_deactivate((GtkMenuShell *)arg0);
@@ -9471,7 +9342,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1deactivate)
#ifndef NO__1gtk_1menu_1shell_1insert
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1insert)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1insert_FUNC);
gtk_menu_shell_insert((GtkMenuShell *)arg0, (GtkWidget *)arg1, (gint)arg2);
@@ -9481,7 +9352,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1insert)
#ifndef NO__1gtk_1menu_1shell_1select_1item
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1select_1item)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1select_1item_FUNC);
gtk_menu_shell_select_item((GtkMenuShell *)arg0, (GtkWidget *)arg1);
@@ -9491,24 +9362,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1select_1item)
#ifndef NO__1gtk_1menu_1shell_1set_1take_1focus
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
/*
gtk_menu_shell_set_take_focus((GtkMenuShell *)arg0, (gboolean)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkMenuShell *, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_menu_shell_set_take_focus_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_menu_shell_set_take_focus");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkMenuShell *)arg0, (gboolean)arg1);
+ LOAD_FUNCTION(fp, gtk_menu_shell_set_take_focus)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkMenuShell *, gboolean))fp)((GtkMenuShell *)arg0, (gboolean)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1menu_1shell_1set_1take_1focus_FUNC);
@@ -9516,14 +9379,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1menu_1shell_1set_1take_1focus)
#endif
#ifndef NO__1gtk_1message_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1message_1dialog_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
{
jbyte *lparg4=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1message_1dialog_1new_FUNC);
if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
- rc = (jint)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
+ rc = (jintLong)gtk_message_dialog_new((GtkWindow *)arg0, (GtkDialogFlags)arg1, (GtkMessageType)arg2, (GtkButtonsType)arg3, (const gchar *)lparg4);
fail:
if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1message_1dialog_1new_FUNC);
@@ -9557,7 +9420,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1minor_1version)
#ifndef NO__1gtk_1misc_1set_1alignment
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1misc_1set_1alignment)
- (JNIEnv *env, jclass that, jint arg0, jfloat arg1, jfloat arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1, jfloat arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1misc_1set_1alignment_FUNC);
gtk_misc_set_alignment((GtkMisc *)arg0, (gfloat)arg1, (gfloat)arg2);
@@ -9567,7 +9430,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1misc_1set_1alignment)
#ifndef NO__1gtk_1notebook_1get_1current_1page
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1get_1current_1page)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1current_1page_FUNC);
@@ -9579,7 +9442,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1get_1current_1page)
#ifndef NO__1gtk_1notebook_1get_1scrollable
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1notebook_1get_1scrollable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1get_1scrollable_FUNC);
@@ -9591,7 +9454,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1notebook_1get_1scrollable)
#ifndef NO__1gtk_1notebook_1insert_1page
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1insert_1page)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1insert_1page_FUNC);
gtk_notebook_insert_page((GtkNotebook *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2, (gint)arg3);
@@ -9600,12 +9463,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1insert_1page)
#endif
#ifndef NO__1gtk_1notebook_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1notebook_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1new_FUNC);
- rc = (jint)gtk_notebook_new();
+ rc = (jintLong)gtk_notebook_new();
OS_NATIVE_EXIT(env, that, _1gtk_1notebook_1new_FUNC);
return rc;
}
@@ -9613,7 +9476,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1notebook_1new)
#ifndef NO__1gtk_1notebook_1next_1page
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1next_1page)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1next_1page_FUNC);
gtk_notebook_next_page((GtkNotebook *)arg0);
@@ -9623,7 +9486,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1next_1page)
#ifndef NO__1gtk_1notebook_1prev_1page
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1prev_1page)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1prev_1page_FUNC);
gtk_notebook_prev_page((GtkNotebook *)arg0);
@@ -9633,7 +9496,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1prev_1page)
#ifndef NO__1gtk_1notebook_1remove_1page
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1remove_1page)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1remove_1page_FUNC);
gtk_notebook_remove_page((GtkNotebook *)arg0, (gint)arg1);
@@ -9643,7 +9506,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1remove_1page)
#ifndef NO__1gtk_1notebook_1set_1current_1page
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1current_1page)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1current_1page_FUNC);
gtk_notebook_set_current_page((GtkNotebook *)arg0, (gint)arg1);
@@ -9653,7 +9516,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1current_1page)
#ifndef NO__1gtk_1notebook_1set_1scrollable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1scrollable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1scrollable_FUNC);
gtk_notebook_set_scrollable((GtkNotebook *)arg0, (gboolean)arg1);
@@ -9663,7 +9526,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1scrollable)
#ifndef NO__1gtk_1notebook_1set_1show_1tabs
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1show_1tabs_FUNC);
gtk_notebook_set_show_tabs((GtkNotebook *)arg0, (gboolean)arg1);
@@ -9673,7 +9536,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1show_1tabs)
#ifndef NO__1gtk_1notebook_1set_1tab_1pos
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1notebook_1set_1tab_1pos_FUNC);
gtk_notebook_set_tab_pos((GtkNotebook *)arg0, (GtkPositionType)arg1);
@@ -9683,7 +9546,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1notebook_1set_1tab_1pos)
#ifndef NO__1gtk_1object_1sink
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1object_1sink)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1object_1sink_FUNC);
gtk_object_sink((GtkObject *)arg0);
@@ -9693,7 +9556,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1object_1sink)
#ifndef NO__1gtk_1page_1setup_1get_1bottom_1margin
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
@@ -9701,18 +9564,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
rc = (jdouble)gtk_page_setup_get_bottom_margin(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_bottom_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_bottom_margin");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_bottom_margin)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1bottom_1margin_FUNC);
@@ -9722,7 +9576,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1bottom_1margin)
#ifndef NO__1gtk_1page_1setup_1get_1left_1margin
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
@@ -9730,18 +9584,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
rc = (jdouble)gtk_page_setup_get_left_margin(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_left_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_left_margin");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_left_margin)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1left_1margin_FUNC);
@@ -9751,7 +9596,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1left_1margin)
#ifndef NO__1gtk_1page_1setup_1get_1orientation
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
@@ -9759,18 +9604,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
rc = (jint)gtk_page_setup_get_orientation(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_orientation_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_orientation");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_orientation)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1orientation_FUNC);
@@ -9780,7 +9616,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1orientation)
#ifndef NO__1gtk_1page_1setup_1get_1page_1height
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
@@ -9788,18 +9624,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
rc = (jdouble)gtk_page_setup_get_page_height(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_page_height_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_page_height");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_page_height)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1height_FUNC);
@@ -9809,7 +9636,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1height)
#ifndef NO__1gtk_1page_1setup_1get_1page_1width
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
@@ -9817,18 +9644,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
rc = (jdouble)gtk_page_setup_get_page_width(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_page_width_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_page_width");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_page_width)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1page_1width_FUNC);
@@ -9838,7 +9656,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1page_1width)
#ifndef NO__1gtk_1page_1setup_1get_1paper_1height
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
@@ -9846,18 +9664,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
rc = (jdouble)gtk_page_setup_get_paper_height(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_paper_height_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_paper_height");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_paper_height)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1height_FUNC);
@@ -9866,27 +9675,18 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1height)
#endif
#ifndef NO__1gtk_1page_1setup_1get_1paper_1size
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
/*
- rc = (jint)gtk_page_setup_get_paper_size(arg0);
+ rc = (jintLong)gtk_page_setup_get_paper_size(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_paper_size_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_paper_size");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_paper_size)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1size_FUNC);
@@ -9896,7 +9696,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1size)
#ifndef NO__1gtk_1page_1setup_1get_1paper_1width
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
@@ -9904,18 +9704,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
rc = (jdouble)gtk_page_setup_get_paper_width(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_paper_width_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_paper_width");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_paper_width)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1paper_1width_FUNC);
@@ -9925,7 +9716,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1paper_1width)
#ifndef NO__1gtk_1page_1setup_1get_1right_1margin
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
@@ -9933,18 +9724,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
rc = (jdouble)gtk_page_setup_get_right_margin(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_right_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_right_margin");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_right_margin)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1right_1margin_FUNC);
@@ -9954,7 +9736,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1right_1margin)
#ifndef NO__1gtk_1page_1setup_1get_1top_1margin
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
@@ -9962,18 +9744,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
rc = (jdouble)gtk_page_setup_get_top_margin(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_get_top_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_get_top_margin");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_get_top_margin)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1get_1top_1margin_FUNC);
@@ -9982,27 +9755,18 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1page_1setup_1get_1top_1margin)
#endif
#ifndef NO__1gtk_1page_1setup_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1new_FUNC);
/*
- rc = (jint)gtk_page_setup_new();
+ rc = (jintLong)gtk_page_setup_new();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gtk_page_setup_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1new_FUNC);
@@ -10012,24 +9776,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1page_1setup_1new)
#ifndef NO__1gtk_1page_1setup_1set_1bottom_1margin
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
/*
gtk_page_setup_set_bottom_margin(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_bottom_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_bottom_margin");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, gtk_page_setup_set_bottom_margin)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1bottom_1margin_FUNC);
@@ -10038,24 +9794,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1bottom_1margin)
#ifndef NO__1gtk_1page_1setup_1set_1left_1margin
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
/*
gtk_page_setup_set_left_margin(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_left_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_left_margin");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, gtk_page_setup_set_left_margin)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1left_1margin_FUNC);
@@ -10064,24 +9812,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1left_1margin)
#ifndef NO__1gtk_1page_1setup_1set_1orientation
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
/*
gtk_page_setup_set_orientation(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_orientation_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_orientation");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_set_orientation)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1orientation_FUNC);
@@ -10090,24 +9830,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1orientation)
#ifndef NO__1gtk_1page_1setup_1set_1paper_1size
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
/*
gtk_page_setup_set_paper_size(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_paper_size_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_paper_size");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_page_setup_set_paper_size)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1paper_1size_FUNC);
@@ -10116,24 +9848,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1paper_1size)
#ifndef NO__1gtk_1page_1setup_1set_1right_1margin
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
/*
gtk_page_setup_set_right_margin(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_right_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_right_margin");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, gtk_page_setup_set_right_margin)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1right_1margin_FUNC);
@@ -10142,24 +9866,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1right_1margin)
#ifndef NO__1gtk_1page_1setup_1set_1top_1margin
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
/*
gtk_page_setup_set_top_margin(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jdouble, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_page_setup_set_top_margin_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_page_setup_set_top_margin");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, gtk_page_setup_set_top_margin)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jdouble, jint))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1page_1setup_1set_1top_1margin_FUNC);
@@ -10168,7 +9884,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1page_1setup_1set_1top_1margin)
#ifndef NO__1gtk_1paint_1arrow
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1arrow)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jboolean arg8, jint arg9, jint arg10, jint arg11, jint arg12)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10185,7 +9901,7 @@ fail:
#ifndef NO__1gtk_1paint_1box
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10202,7 +9918,7 @@ fail:
#ifndef NO__1gtk_1paint_1box_1gap
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1box_1gap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10219,7 +9935,7 @@ fail:
#ifndef NO__1gtk_1paint_1check
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1check)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10236,7 +9952,7 @@ fail:
#ifndef NO__1gtk_1paint_1expander
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1expander)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
{
GdkRectangle _arg3, *lparg3=NULL;
jbyte *lparg5=NULL;
@@ -10253,7 +9969,7 @@ fail:
#ifndef NO__1gtk_1paint_1extension
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1extension)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10270,7 +9986,7 @@ fail:
#ifndef NO__1gtk_1paint_1flat_1box
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1flat_1box)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10287,7 +10003,7 @@ fail:
#ifndef NO__1gtk_1paint_1focus
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1focus)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8, jint arg9)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8, jint arg9)
{
GdkRectangle _arg3, *lparg3=NULL;
jbyte *lparg5=NULL;
@@ -10303,7 +10019,7 @@ fail:
#ifndef NO__1gtk_1paint_1handle
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1handle)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10319,7 +10035,7 @@ fail:
#ifndef NO__1gtk_1paint_1hline
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1hline)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
{
GdkRectangle _arg3, *lparg3=NULL;
jbyte *lparg5=NULL;
@@ -10336,7 +10052,7 @@ fail:
#ifndef NO__1gtk_1paint_1layout
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1layout)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jintLong arg9)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10353,7 +10069,7 @@ fail:
#ifndef NO__1gtk_1paint_1option
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1option)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10370,7 +10086,7 @@ fail:
#ifndef NO__1gtk_1paint_1shadow
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1shadow)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10387,7 +10103,7 @@ fail:
#ifndef NO__1gtk_1paint_1shadow_1gap
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1shadow_1gap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10404,7 +10120,7 @@ fail:
#ifndef NO__1gtk_1paint_1slider
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1slider)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10421,7 +10137,7 @@ fail:
#ifndef NO__1gtk_1paint_1tab
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1tab)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4, jint arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jobject arg4, jintLong arg5, jbyteArray arg6, jint arg7, jint arg8, jint arg9, jint arg10)
{
GdkRectangle _arg4, *lparg4=NULL;
jbyte *lparg6=NULL;
@@ -10438,7 +10154,7 @@ fail:
#ifndef NO__1gtk_1paint_1vline
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paint_1vline)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4, jbyteArray arg5, jint arg6, jint arg7, jint arg8)
{
GdkRectangle _arg3, *lparg3=NULL;
jbyte *lparg5=NULL;
@@ -10455,24 +10171,16 @@ fail:
#ifndef NO__1gtk_1paper_1size_1free
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
/*
gtk_paper_size_free(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_free_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_free");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_paper_size_free)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1free_FUNC);
@@ -10480,27 +10188,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
#endif
#ifndef NO__1gtk_1paper_1size_1get_1display_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
/*
- rc = (jint)gtk_paper_size_get_display_name(arg0);
+ rc = (jintLong)gtk_paper_size_get_display_name(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_get_display_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_display_name");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_paper_size_get_display_name)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1display_1name_FUNC);
@@ -10510,7 +10209,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1display_1name)
#ifndef NO__1gtk_1paper_1size_1get_1height
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
@@ -10518,18 +10217,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
rc = (jdouble)gtk_paper_size_get_height(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_get_height_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_height");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_paper_size_get_height)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1height_FUNC);
@@ -10538,27 +10228,18 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1height)
#endif
#ifndef NO__1gtk_1paper_1size_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
/*
- rc = (jint)gtk_paper_size_get_name(arg0);
+ rc = (jintLong)gtk_paper_size_get_name(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_get_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_name");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_paper_size_get_name)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1name_FUNC);
@@ -10567,27 +10248,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1name)
#endif
#ifndef NO__1gtk_1paper_1size_1get_1ppd_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
/*
- rc = (jint)gtk_paper_size_get_ppd_name(arg0);
+ rc = (jintLong)gtk_paper_size_get_ppd_name(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_get_ppd_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_ppd_name");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_paper_size_get_ppd_name)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1ppd_1name_FUNC);
@@ -10597,7 +10269,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1ppd_1name)
#ifndef NO__1gtk_1paper_1size_1get_1width
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
@@ -10605,18 +10277,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
rc = (jdouble)gtk_paper_size_get_width(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_get_width_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_get_width");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_paper_size_get_width)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1get_1width_FUNC);
@@ -10626,7 +10289,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1paper_1size_1get_1width)
#ifndef NO__1gtk_1paper_1size_1is_1custom
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
@@ -10634,18 +10297,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
rc = (jboolean)gtk_paper_size_is_custom(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_is_custom_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_is_custom");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_paper_size_is_custom)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1is_1custom_FUNC);
@@ -10654,29 +10308,20 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1paper_1size_1is_1custom)
#endif
#ifndef NO__1gtk_1paper_1size_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_paper_size_new(lparg0);
+ rc = (jintLong)gtk_paper_size_new(lparg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jbyte *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(lparg0);
+ LOAD_FUNCTION(fp, gtk_paper_size_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0);
}
}
fail:
@@ -10687,31 +10332,22 @@ fail:
#endif
#ifndef NO__1gtk_1paper_1size_1new_1custom
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1custom)
(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3, jint arg4)
{
jbyte *lparg0=NULL;
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1custom_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4);
+ rc = (jintLong)gtk_paper_size_new_custom(lparg0, lparg1, arg2, arg3, arg4);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jbyte *, jbyte *, jdouble, jdouble, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_new_custom_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_new_custom");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(lparg0, lparg1, arg2, arg3, arg4);
+ LOAD_FUNCTION(fp, gtk_paper_size_new_custom)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble, jint))fp)(lparg0, lparg1, arg2, arg3, arg4);
}
}
fail:
@@ -10723,31 +10359,22 @@ fail:
#endif
#ifndef NO__1gtk_1paper_1size_1new_1from_1ppd
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1paper_1size_1new_1from_1ppd)
(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jdouble arg2, jdouble arg3)
{
jbyte *lparg0=NULL;
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1new_1from_1ppd_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3);
+ rc = (jintLong)gtk_paper_size_new_from_ppd(lparg0, lparg1, arg2, arg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jbyte *, jbyte *, jdouble, jdouble);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_paper_size_new_from_ppd_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_paper_size_new_from_ppd");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(lparg0, lparg1, arg2, arg3);
+ LOAD_FUNCTION(fp, gtk_paper_size_new_from_ppd)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jdouble, jdouble))fp)(lparg0, lparg1, arg2, arg3);
}
}
fail:
@@ -10759,51 +10386,42 @@ fail:
#endif
#ifndef NO__1gtk_1plug_1get_1id
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1plug_1get_1id_FUNC);
- rc = (jint)gtk_plug_get_id((GtkPlug *)arg0);
+ rc = (jintLong)gtk_plug_get_id((GtkPlug *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1plug_1get_1id_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1plug_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1plug_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1plug_1new_FUNC);
- rc = (jint)gtk_plug_new(arg0);
+ rc = (jintLong)gtk_plug_new(arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1plug_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1print_1job_1get_1printer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1printer_FUNC);
/*
- rc = (jint)gtk_print_job_get_printer(arg0);
+ rc = (jintLong)gtk_print_job_get_printer(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_get_printer_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_printer");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_job_get_printer)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1printer_FUNC);
@@ -10812,27 +10430,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1printer)
#endif
#ifndef NO__1gtk_1print_1job_1get_1settings
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1settings_FUNC);
/*
- rc = (jint)gtk_print_job_get_settings(arg0);
+ rc = (jintLong)gtk_print_job_get_settings(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_get_settings_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_settings");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_job_get_settings)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1settings_FUNC);
@@ -10842,7 +10451,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1settings)
#ifndef NO__1gtk_1print_1job_1get_1status
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1status_FUNC);
@@ -10850,18 +10459,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
rc = (jint)gtk_print_job_get_status(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_get_status_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_status");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_job_get_status)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1status_FUNC);
@@ -10870,60 +10470,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1status)
#endif
#ifndef NO__1gtk_1print_1job_1get_1surface
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1surface)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
- jint rc = 0;
+ jintLong *lparg1=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_print_job_get_surface(arg0, (GError **)lparg1);
+ rc = (jintLong)gtk_print_job_get_surface(arg0, (GError **)lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, GError **);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_get_surface_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_surface");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, (GError **)lparg1);
+ LOAD_FUNCTION(fp, gtk_print_job_get_surface)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, GError **))fp)(arg0, (GError **)lparg1);
}
}
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1surface_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1print_1job_1get_1title
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1get_1title_FUNC);
/*
- rc = (jint)gtk_print_job_get_title(arg0);
+ rc = (jintLong)gtk_print_job_get_title(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_get_title_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_get_title");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_job_get_title)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1get_1title_FUNC);
@@ -10932,29 +10514,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1get_1title)
#endif
#ifndef NO__1gtk_1print_1job_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1job_1new)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jintLong arg2, jintLong arg3)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3);
+ rc = (jintLong)gtk_print_job_new((const gchar *)lparg0, arg1, arg2, arg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(const gchar *, jint, jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((const gchar *)lparg0, arg1, arg2, arg3);
+ LOAD_FUNCTION(fp, gtk_print_job_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, jintLong, jintLong, jintLong))fp)((const gchar *)lparg0, arg1, arg2, arg3);
}
}
fail:
@@ -10966,24 +10539,16 @@ fail:
#ifndef NO__1gtk_1print_1job_1send
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1send_FUNC);
/*
gtk_print_job_send(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, gpointer, GDestroyNotify);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_send_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_send");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
+ LOAD_FUNCTION(fp, gtk_print_job_send)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer, GDestroyNotify))fp)(arg0, arg1, (gpointer)arg2, (GDestroyNotify)arg3);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1send_FUNC);
@@ -10992,34 +10557,25 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1job_1send)
#ifndef NO__1gtk_1print_1job_1set_1source_1file
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1job_1set_1source_1file)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2)
{
jbyte *lparg1=NULL;
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1job_1set_1source_1file_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
/*
rc = (jboolean)gtk_print_job_set_source_file(arg0, (const gchar *)lparg1, (GError **)lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint, const gchar *, GError **);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_job_set_source_file_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_job_set_source_file");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0, (const gchar *)lparg1, (GError **)lparg2);
+ LOAD_FUNCTION(fp, gtk_print_job_set_source_file)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, const gchar *, GError **))fp)(arg0, (const gchar *)lparg1, (GError **)lparg2);
}
}
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1print_1job_1set_1source_1file_FUNC);
return rc;
@@ -11028,24 +10584,16 @@ fail:
#ifndef NO__1gtk_1print_1settings_1foreach
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1foreach_FUNC);
/*
gtk_print_settings_foreach(arg0, arg1, (gpointer)arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint, gpointer);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_foreach_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_foreach");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1, (gpointer)arg2);
+ LOAD_FUNCTION(fp, gtk_print_settings_foreach)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong, gpointer))fp)(arg0, arg1, (gpointer)arg2);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1foreach_FUNC);
@@ -11053,29 +10601,20 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1foreach)
#endif
#ifndef NO__1gtk_1print_1settings_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_print_settings_get(arg0, (const gchar *)lparg1);
+ rc = (jintLong)gtk_print_settings_get(arg0, (const gchar *)lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, const gchar *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, (const gchar *)lparg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_get)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, const gchar *))fp)(arg0, (const gchar *)lparg1);
}
}
fail:
@@ -11087,7 +10626,7 @@ fail:
#ifndef NO__1gtk_1print_1settings_1get_1collate
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
@@ -11095,18 +10634,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
rc = (jboolean)gtk_print_settings_get_collate(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_collate_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_collate");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_collate)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1collate_FUNC);
@@ -11116,7 +10646,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1collate)
#ifndef NO__1gtk_1print_1settings_1get_1n_1copies
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
@@ -11124,18 +10654,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
rc = (jint)gtk_print_settings_get_n_copies(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_n_copies_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_n_copies");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_n_copies)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1n_1copies_FUNC);
@@ -11145,7 +10666,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1n_1copies)
#ifndef NO__1gtk_1print_1settings_1get_1orientation
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1orientation_FUNC);
@@ -11153,18 +10674,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
rc = (jint)gtk_print_settings_get_orientation(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_orientation_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_orientation");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_orientation)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1orientation_FUNC);
@@ -11173,29 +10685,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1orientation)
#endif
#ifndef NO__1gtk_1print_1settings_1get_1page_1ranges
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1page_1ranges)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
{
jint *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1page_1ranges_FUNC);
if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1);
+ rc = (jintLong)gtk_print_settings_get_page_ranges(arg0, (gint *)lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint, gint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_page_ranges_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_page_ranges");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, (gint *)lparg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_page_ranges)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, gint *))fp)(arg0, (gint *)lparg1);
}
}
fail:
@@ -11207,7 +10710,7 @@ fail:
#ifndef NO__1gtk_1print_1settings_1get_1paper_1height
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1paper_1height_FUNC);
@@ -11215,18 +10718,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
rc = (jdouble)gtk_print_settings_get_paper_height(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_paper_height_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_paper_height");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_paper_height)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1paper_1height_FUNC);
@@ -11236,7 +10730,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1height)
#ifndef NO__1gtk_1print_1settings_1get_1paper_1width
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1paper_1width_FUNC);
@@ -11244,18 +10738,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
rc = (jdouble)gtk_print_settings_get_paper_width(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(jint, jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_paper_width_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_paper_width");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_paper_width)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1paper_1width_FUNC);
@@ -11265,7 +10750,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1paper_1width)
#ifndef NO__1gtk_1print_1settings_1get_1print_1pages
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
@@ -11273,18 +10758,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
rc = (jint)gtk_print_settings_get_print_pages(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_print_pages_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_print_pages");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_print_pages)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1print_1pages_FUNC);
@@ -11293,27 +10769,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1print_1pages)
#endif
#ifndef NO__1gtk_1print_1settings_1get_1printer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1printer_FUNC);
/*
- rc = (jint)gtk_print_settings_get_printer(arg0);
+ rc = (jintLong)gtk_print_settings_get_printer(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_printer_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_printer");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_printer)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1printer_FUNC);
@@ -11323,7 +10790,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1printer)
#ifndef NO__1gtk_1print_1settings_1get_1resolution
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
@@ -11331,18 +10798,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
rc = (jint)gtk_print_settings_get_resolution(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_get_resolution_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_get_resolution");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_settings_get_resolution)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1get_1resolution_FUNC);
@@ -11351,27 +10809,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1get_1resolution)
#endif
#ifndef NO__1gtk_1print_1settings_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1new_FUNC);
/*
- rc = (jint)gtk_print_settings_new();
+ rc = (jintLong)gtk_print_settings_new();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, gtk_print_settings_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1new_FUNC);
@@ -11381,7 +10830,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1settings_1new)
#ifndef NO__1gtk_1print_1settings_1set
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
@@ -11392,17 +10841,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set)
gtk_print_settings_set(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, const gchar *, const gchar *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
+ LOAD_FUNCTION(fp, gtk_print_settings_set)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, const gchar *, const gchar *))fp)(arg0, (const gchar *)lparg1, (const gchar *)lparg2);
}
}
fail:
@@ -11414,24 +10855,16 @@ fail:
#ifndef NO__1gtk_1print_1settings_1set_1collate
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
/*
gtk_print_settings_set_collate(arg0, (gboolean)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_collate_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_collate");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, (gboolean)arg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_set_collate)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, gboolean))fp)(arg0, (gboolean)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1collate_FUNC);
@@ -11440,24 +10873,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1collate)
#ifndef NO__1gtk_1print_1settings_1set_1n_1copies
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
/*
gtk_print_settings_set_n_copies(arg0, (gint)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_n_copies_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_n_copies");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, (gint)arg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_set_n_copies)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1n_1copies_FUNC);
@@ -11466,24 +10891,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1n_1copies)
#ifndef NO__1gtk_1print_1settings_1set_1orientation
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
/*
gtk_print_settings_set_orientation(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_orientation_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_orientation");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_set_orientation)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1orientation_FUNC);
@@ -11492,7 +10909,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1orientation)
#ifndef NO__1gtk_1print_1settings_1set_1page_1ranges
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jint arg2)
{
jint *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1page_1ranges_FUNC);
@@ -11501,17 +10918,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1page_1ranges)
gtk_print_settings_set_page_ranges(arg0, lparg1, (gint)arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint *, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_page_ranges_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_page_ranges");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, lparg1, (gint)arg2);
+ LOAD_FUNCTION(fp, gtk_print_settings_set_page_ranges)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint *, gint))fp)(arg0, lparg1, (gint)arg2);
}
}
fail:
@@ -11522,24 +10931,16 @@ fail:
#ifndef NO__1gtk_1print_1settings_1set_1print_1pages
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
/*
gtk_print_settings_set_print_pages(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_print_pages_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_print_pages");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_set_print_pages)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1settings_1set_1print_1pages_FUNC);
@@ -11548,7 +10949,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1print_1pages)
#ifndef NO__1gtk_1print_1settings_1set_1printer
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1settings_1set_1printer_FUNC);
@@ -11557,17 +10958,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1settings_1set_1printer)
gtk_print_settings_set_printer(arg0, lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jbyte *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_settings_set_printer_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_settings_set_printer");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, lparg1);
+ LOAD_FUNCTION(fp, gtk_print_settings_set_printer)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
}
}
fail:
@@ -11578,7 +10971,7 @@ fail:
#ifndef NO__1gtk_1print_1unix_1dialog_1get_1current_1page
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
@@ -11586,18 +10979,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
rc = (jint)gtk_print_unix_dialog_get_current_page(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_get_current_page_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_current_page");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_current_page)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1current_1page_FUNC);
@@ -11606,27 +10990,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1current_1page)
#endif
#ifndef NO__1gtk_1print_1unix_1dialog_1get_1page_1setup
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
/*
- rc = (jint)gtk_print_unix_dialog_get_page_setup(arg0);
+ rc = (jintLong)gtk_print_unix_dialog_get_page_setup(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_get_page_setup_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_page_setup");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_page_setup)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1page_1setup_FUNC);
@@ -11635,27 +11010,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1page_1setup)
#endif
#ifndef NO__1gtk_1print_1unix_1dialog_1get_1selected_1printer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1printer)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
/*
- rc = (jint)gtk_print_unix_dialog_get_selected_printer(arg0);
+ rc = (jintLong)gtk_print_unix_dialog_get_selected_printer(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_get_selected_printer_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_selected_printer");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_selected_printer)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1selected_1printer_FUNC);
@@ -11664,27 +11030,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1selected_1prin
#endif
#ifndef NO__1gtk_1print_1unix_1dialog_1get_1settings
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
/*
- rc = (jint)gtk_print_unix_dialog_get_settings(arg0);
+ rc = (jintLong)gtk_print_unix_dialog_get_settings(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_get_settings_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_get_settings");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_get_settings)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1get_1settings_FUNC);
@@ -11693,29 +11050,20 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1get_1settings)
#endif
#ifndef NO__1gtk_1print_1unix_1dialog_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1new)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
+ rc = (jintLong)gtk_print_unix_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(const gchar *, GtkWindow *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((const gchar *)lparg0, (GtkWindow *)arg1);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *, GtkWindow *))fp)((const gchar *)lparg0, (GtkWindow *)arg1);
}
}
fail:
@@ -11727,24 +11075,16 @@ fail:
#ifndef NO__1gtk_1print_1unix_1dialog_1set_1current_1page
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
/*
gtk_print_unix_dialog_set_current_page(arg0, (gint)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, gint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_current_page_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_current_page");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, (gint)arg1);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_current_page)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, gint))fp)(arg0, (gint)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1current_1page_FUNC);
@@ -11753,24 +11093,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1current_1page)
#ifndef NO__1gtk_1print_1unix_1dialog_1set_1manual_1capabilities
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabilities)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
/*
gtk_print_unix_dialog_set_manual_capabilities(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_manual_capabilities_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_manual_capabilities");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_manual_capabilities)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1manual_1capabilities_FUNC);
@@ -11779,24 +11111,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1manual_1capabi
#ifndef NO__1gtk_1print_1unix_1dialog_1set_1page_1setup
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
/*
gtk_print_unix_dialog_set_page_setup(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_page_setup_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_page_setup");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_page_setup)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1page_1setup_FUNC);
@@ -11805,24 +11129,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1page_1setup)
#ifndef NO__1gtk_1print_1unix_1dialog_1set_1settings
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
/*
gtk_print_unix_dialog_set_settings(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_print_unix_dialog_set_settings_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_print_unix_dialog_set_settings");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_print_unix_dialog_set_settings)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1print_1unix_1dialog_1set_1settings_FUNC);
@@ -11830,27 +11146,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1print_1unix_1dialog_1set_1settings)
#endif
#ifndef NO__1gtk_1printer_1get_1backend
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1backend_FUNC);
/*
- rc = (jint)gtk_printer_get_backend(arg0);
+ rc = (jintLong)gtk_printer_get_backend(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_printer_get_backend_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_printer_get_backend");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_printer_get_backend)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1backend_FUNC);
@@ -11859,27 +11166,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1backend)
#endif
#ifndef NO__1gtk_1printer_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1printer_1get_1name_FUNC);
/*
- rc = (jint)gtk_printer_get_name(arg0);
+ rc = (jintLong)gtk_printer_get_name(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_printer_get_name_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_printer_get_name");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_printer_get_name)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1printer_1get_1name_FUNC);
@@ -11889,7 +11187,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1printer_1get_1name)
#ifndef NO__1gtk_1printer_1is_1default
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1printer_1is_1default_FUNC);
@@ -11897,18 +11195,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
rc = (jboolean)gtk_printer_is_default(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_printer_is_default_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_printer_is_default");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, gtk_printer_is_default)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1printer_1is_1default_FUNC);
@@ -11917,12 +11206,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1printer_1is_1default)
#endif
#ifndef NO__1gtk_1progress_1bar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1new_FUNC);
- rc = (jint)gtk_progress_bar_new();
+ rc = (jintLong)gtk_progress_bar_new();
OS_NATIVE_EXIT(env, that, _1gtk_1progress_1bar_1new_FUNC);
return rc;
}
@@ -11930,7 +11219,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1progress_1bar_1new)
#ifndef NO__1gtk_1progress_1bar_1pulse
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1pulse)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1pulse_FUNC);
gtk_progress_bar_pulse((GtkProgressBar *)arg0);
@@ -11940,7 +11229,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1pulse)
#ifndef NO__1gtk_1progress_1bar_1set_1fraction
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1fraction_FUNC);
gtk_progress_bar_set_fraction((GtkProgressBar *)arg0, (gdouble)arg1);
@@ -11950,7 +11239,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1fraction)
#ifndef NO__1gtk_1progress_1bar_1set_1orientation
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1progress_1bar_1set_1orientation_FUNC);
gtk_progress_bar_set_orientation((GtkProgressBar *)arg0, (GtkProgressBarOrientation)arg1);
@@ -11959,62 +11248,62 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1progress_1bar_1set_1orientation)
#endif
#ifndef NO__1gtk_1radio_1button_1get_1group
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1button_1get_1group)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
- rc = (jint)gtk_radio_button_get_group((GtkRadioButton *)arg0);
+ rc = (jintLong)gtk_radio_button_get_group((GtkRadioButton *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1get_1group_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1radio_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1button_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1radio_1button_1new_FUNC);
- rc = (jint)gtk_radio_button_new((GSList *)arg0);
+ rc = (jintLong)gtk_radio_button_new((GSList *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1radio_1button_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1radio_1menu_1item_1get_1group
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1get_1group)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
- rc = (jint)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
+ rc = (jintLong)gtk_radio_menu_item_get_group((GtkRadioMenuItem *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1get_1group_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1radio_1menu_1item_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
- rc = (jint)gtk_radio_menu_item_new((GSList *)arg0);
+ rc = (jintLong)gtk_radio_menu_item_new((GSList *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1radio_1menu_1item_1new_1with_1label
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1radio_1menu_1item_1new_1with_1label)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
+ rc = (jintLong)gtk_radio_menu_item_new_with_label((GSList *)arg0, (const gchar *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1radio_1menu_1item_1new_1with_1label_FUNC);
@@ -12023,12 +11312,12 @@ fail:
#endif
#ifndef NO__1gtk_1range_1get_1adjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1range_1get_1adjustment_FUNC);
- rc = (jint)gtk_range_get_adjustment((GtkRange *)arg0);
+ rc = (jintLong)gtk_range_get_adjustment((GtkRange *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1range_1get_1adjustment_FUNC);
return rc;
}
@@ -12036,7 +11325,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1range_1get_1adjustment)
#ifndef NO__1gtk_1range_1set_1increments
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1increments)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1increments_FUNC);
gtk_range_set_increments((GtkRange *)arg0, arg1, arg2);
@@ -12046,7 +11335,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1increments)
#ifndef NO__1gtk_1range_1set_1inverted
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1inverted)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1inverted_FUNC);
gtk_range_set_inverted((GtkRange *)arg0, arg1);
@@ -12056,7 +11345,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1inverted)
#ifndef NO__1gtk_1range_1set_1range
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1range)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1range_FUNC);
gtk_range_set_range((GtkRange *)arg0, arg1, arg2);
@@ -12066,7 +11355,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1range)
#ifndef NO__1gtk_1range_1set_1value
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1range_1set_1value)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1range_1set_1value_FUNC);
gtk_range_set_value((GtkRange *)arg0, arg1);
@@ -12089,12 +11378,12 @@ fail:
#endif
#ifndef NO__1gtk_1rc_1style_1get_1bg_1pixmap_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
- rc = (jint)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
+ rc = (jintLong)gtk_rc_style_get_bg_pixmap_name((GtkRcStyle *)arg0, arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1rc_1style_1get_1bg_1pixmap_1name_FUNC);
return rc;
}
@@ -12102,7 +11391,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1bg_1pixmap_1name)
#ifndef NO__1gtk_1rc_1style_1get_1color_1flags
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1get_1color_1flags_FUNC);
@@ -12114,7 +11403,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1rc_1style_1get_1color_1flags)
#ifndef NO__1gtk_1rc_1style_1set_1bg
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_FUNC);
@@ -12127,7 +11416,7 @@ fail:
#ifndef NO__1gtk_1rc_1style_1set_1bg_1pixmap_1name
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1bg_1pixmap_1name_FUNC);
gtk_rc_style_set_bg_pixmap_name((GtkRcStyle *)arg0, arg1, (char *)arg2);
@@ -12137,7 +11426,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1bg_1pixmap_1name)
#ifndef NO__1gtk_1rc_1style_1set_1color_1flags
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1color_1flags_FUNC);
gtk_rc_style_set_color_flags((GtkRcStyle *)arg0, arg1, arg2);
@@ -12147,7 +11436,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1color_1flags)
#ifndef NO__1gtk_1rc_1style_1set_1fg
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1fg)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1fg_FUNC);
@@ -12160,7 +11449,7 @@ fail:
#ifndef NO__1gtk_1rc_1style_1set_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1rc_1style_1set_1text)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1rc_1style_1set_1text_FUNC);
@@ -12173,7 +11462,7 @@ fail:
#ifndef NO__1gtk_1scale_1set_1digits
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1digits_FUNC);
gtk_scale_set_digits((GtkScale *)arg0, (gint)arg1);
@@ -12183,7 +11472,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1digits)
#ifndef NO__1gtk_1scale_1set_1draw_1value
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1draw_1value)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1scale_1set_1draw_1value_FUNC);
gtk_scale_set_draw_value((GtkScale *)arg0, (gboolean)arg1);
@@ -12193,7 +11482,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scale_1set_1draw_1value)
#ifndef NO__1gtk_1scrolled_1window_1add_1with_1viewport
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1add_1with_1viewport_FUNC);
gtk_scrolled_window_add_with_viewport((GtkScrolledWindow *)arg0, (GtkWidget *)arg1);
@@ -12202,12 +11491,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1add_1with_1viewport)
#endif
#ifndef NO__1gtk_1scrolled_1window_1get_1hadjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
- rc = (jint)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
+ rc = (jintLong)gtk_scrolled_window_get_hadjustment((GtkScrolledWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1hadjustment_FUNC);
return rc;
}
@@ -12215,7 +11504,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1hadjustment)
#ifndef NO__1gtk_1scrolled_1window_1get_1policy
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1policy)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -12232,7 +11521,7 @@ fail:
#ifndef NO__1gtk_1scrolled_1window_1get_1shadow_1type
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1shadow_1type_FUNC);
@@ -12243,24 +11532,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1shadow_1type)
#endif
#ifndef NO__1gtk_1scrolled_1window_1get_1vadjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1get_1vadjustment)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
- rc = (jint)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
+ rc = (jintLong)gtk_scrolled_window_get_vadjustment((GtkScrolledWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1get_1vadjustment_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1scrolled_1window_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1new_FUNC);
- rc = (jint)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
+ rc = (jintLong)gtk_scrolled_window_new((GtkAdjustment *)arg0, (GtkAdjustment *)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1scrolled_1window_1new_FUNC);
return rc;
}
@@ -12268,7 +11557,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1new)
#ifndef NO__1gtk_1scrolled_1window_1set_1placement
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1placement)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1placement_FUNC);
gtk_scrolled_window_set_placement((GtkScrolledWindow *)arg0, (GtkCornerType)arg1);
@@ -12278,7 +11567,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1placement)
#ifndef NO__1gtk_1scrolled_1window_1set_1policy
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1policy_FUNC);
gtk_scrolled_window_set_policy((GtkScrolledWindow *)arg0, (GtkPolicyType)arg1, (GtkPolicyType)arg2);
@@ -12288,7 +11577,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1policy)
#ifndef NO__1gtk_1scrolled_1window_1set_1shadow_1type
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1scrolled_1window_1set_1shadow_1type_FUNC);
gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)arg0, (GtkShadowType)arg1);
@@ -12298,7 +11587,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1scrolled_1window_1set_1shadow_1type)
#ifndef NO__1gtk_1selection_1data_1free
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1free_FUNC);
gtk_selection_data_free((GtkSelectionData *)arg0);
@@ -12308,7 +11597,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1free)
#ifndef NO__1gtk_1selection_1data_1set
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1set)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4)
{
OS_NATIVE_ENTER(env, that, _1gtk_1selection_1data_1set_FUNC);
gtk_selection_data_set((GtkSelectionData *)arg0, (GdkAtom)arg1, (gint)arg2, (const guchar *)arg3, (gint)arg4);
@@ -12317,72 +11606,72 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1selection_1data_1set)
#endif
#ifndef NO__1gtk_1separator_1menu_1item_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1separator_1menu_1item_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
- rc = (jint)gtk_separator_menu_item_new();
+ rc = (jintLong)gtk_separator_menu_item_new();
OS_NATIVE_EXIT(env, that, _1gtk_1separator_1menu_1item_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1set_1locale
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1set_1locale)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1set_1locale)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1set_1locale_FUNC);
- rc = (jint)gtk_set_locale();
+ rc = (jintLong)gtk_set_locale();
OS_NATIVE_EXIT(env, that, _1gtk_1set_1locale_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1settings_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1settings_1get_1default)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1settings_1get_1default_FUNC);
- rc = (jint)gtk_settings_get_default();
+ rc = (jintLong)gtk_settings_get_default();
OS_NATIVE_EXIT(env, that, _1gtk_1settings_1get_1default_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1socket_1get_1id
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1socket_1get_1id)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1socket_1get_1id_FUNC);
- rc = (jint)gtk_socket_get_id((GtkSocket *)arg0);
+ rc = (jintLong)gtk_socket_get_id((GtkSocket *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1socket_1get_1id_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1socket_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1socket_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1socket_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1socket_1new_FUNC);
- rc = (jint)gtk_socket_new();
+ rc = (jintLong)gtk_socket_new();
OS_NATIVE_EXIT(env, that, _1gtk_1socket_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1spin_1button_1get_1adjustment
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
- rc = (jint)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
+ rc = (jintLong)gtk_spin_button_get_adjustment((GtkSpinButton*)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1get_1adjustment_FUNC);
return rc;
}
@@ -12390,7 +11679,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1adjustment)
#ifndef NO__1gtk_1spin_1button_1get_1digits
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1digits)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1get_1digits_FUNC);
@@ -12401,12 +11690,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1get_1digits)
#endif
#ifndef NO__1gtk_1spin_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jint arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1new_FUNC);
- rc = (jint)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
+ rc = (jintLong)gtk_spin_button_new((GtkAdjustment *)arg0, arg1, arg2);
OS_NATIVE_EXIT(env, that, _1gtk_1spin_1button_1new_FUNC);
return rc;
}
@@ -12414,7 +11703,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1spin_1button_1new)
#ifndef NO__1gtk_1spin_1button_1set_1digits
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1digits)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1digits_FUNC);
gtk_spin_button_set_digits((GtkSpinButton*)arg0, arg1);
@@ -12424,7 +11713,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1digits)
#ifndef NO__1gtk_1spin_1button_1set_1increments
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1increments)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1increments_FUNC);
gtk_spin_button_set_increments((GtkSpinButton*)arg0, arg1, arg2);
@@ -12434,7 +11723,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1increments)
#ifndef NO__1gtk_1spin_1button_1set_1range
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1range)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1, jdouble arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jdouble arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1range_FUNC);
gtk_spin_button_set_range((GtkSpinButton*)arg0, arg1, arg2);
@@ -12444,7 +11733,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1range)
#ifndef NO__1gtk_1spin_1button_1set_1value
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1value)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1value_FUNC);
gtk_spin_button_set_value((GtkSpinButton*)arg0, arg1);
@@ -12454,7 +11743,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1value)
#ifndef NO__1gtk_1spin_1button_1set_1wrap
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1wrap)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1set_1wrap_FUNC);
gtk_spin_button_set_wrap((GtkSpinButton*)arg0, arg1);
@@ -12464,7 +11753,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1set_1wrap)
#ifndef NO__1gtk_1spin_1button_1update
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1update)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1spin_1button_1update_FUNC);
gtk_spin_button_update((GtkSpinButton*)arg0);
@@ -12472,9 +11761,131 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1spin_1button_1update)
}
#endif
+#ifndef NO__1gtk_1status_1icon_1get_1geometry
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1geometry)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
+{
+ GdkRectangle _arg2, *lparg2=NULL;
+ jboolean rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1geometry_FUNC);
+ if (arg2) if ((lparg2 = getGdkRectangleFields(env, arg2, &_arg2)) == NULL) goto fail;
+/*
+ rc = (jboolean)gtk_status_icon_get_geometry(arg0, arg1, lparg2, arg3);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_status_icon_get_geometry)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong, jintLong, GdkRectangle *, jintLong))fp)(arg0, arg1, lparg2, arg3);
+ }
+ }
+fail:
+ if (arg2 && lparg2) setGdkRectangleFields(env, arg2, lparg2);
+ OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1get_1geometry_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1status_1icon_1get_1visible
+JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1status_1icon_1get_1visible)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jboolean rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1get_1visible_FUNC);
+/*
+ rc = (jboolean)gtk_status_icon_get_visible(arg0);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_status_icon_get_visible)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1get_1visible_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1status_1icon_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1status_1icon_1new)
+ (JNIEnv *env, jclass that)
+{
+ jintLong rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1new_FUNC);
+/*
+ rc = (jintLong)gtk_status_icon_new();
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_status_icon_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1new_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1status_1icon_1set_1from_1pixbuf
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1from_1pixbuf)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC);
+/*
+ gtk_status_icon_set_from_pixbuf(arg0, arg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_status_icon_set_from_pixbuf)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1status_1icon_1set_1tooltip
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1tooltip)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+{
+ jbyte *lparg1=NULL;
+ OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1tooltip_FUNC);
+ if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+ gtk_status_icon_set_tooltip(arg0, lparg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_status_icon_set_tooltip)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1);
+ }
+ }
+fail:
+ if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1tooltip_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1status_1icon_1set_1visible
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1status_1icon_1set_1visible)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1status_1icon_1set_1visible_FUNC);
+/*
+ gtk_status_icon_set_visible(arg0, arg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_status_icon_set_visible)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1status_1icon_1set_1visible_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1style_1get_1base
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1base)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1base_FUNC);
@@ -12488,7 +11899,7 @@ fail:
#ifndef NO__1gtk_1style_1get_1bg
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_FUNC);
@@ -12502,21 +11913,21 @@ fail:
#ifndef NO__1gtk_1style_1get_1bg_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1bg_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1bg_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_bg_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1bg_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1black
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkColor _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_FUNC);
@@ -12530,21 +11941,21 @@ fail:
#ifndef NO__1gtk_1style_1get_1black_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1black_1gc)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1black_1gc_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
gtk_style_get_black_gc((GtkStyle *)arg0, (GdkGC **)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1black_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1dark
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_FUNC);
@@ -12558,21 +11969,21 @@ fail:
#ifndef NO__1gtk_1style_1get_1dark_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1dark_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1dark_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_dark_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1dark_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1fg
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_FUNC);
@@ -12586,25 +11997,25 @@ fail:
#ifndef NO__1gtk_1style_1get_1fg_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1fg_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1fg_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_fg_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1fg_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1font_1desc
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
- rc = (jint)gtk_style_get_font_desc((GtkStyle *)arg0);
+ rc = (jintLong)gtk_style_get_font_desc((GtkStyle *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1font_1desc_FUNC);
return rc;
}
@@ -12612,7 +12023,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1font_1desc)
#ifndef NO__1gtk_1style_1get_1light
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_FUNC);
@@ -12626,35 +12037,35 @@ fail:
#ifndef NO__1gtk_1style_1get_1light_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1light_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1light_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_light_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1light_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1mid_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1mid_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1mid_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_mid_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1mid_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_FUNC);
@@ -12668,49 +12079,49 @@ fail:
#ifndef NO__1gtk_1style_1get_1text_1aa_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text_1aa_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_1aa_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_text_aa_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_1aa_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1text_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1text_1gc)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1text_1gc_FUNC);
- if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_style_get_text_gc((GtkStyle *)arg0, arg1, (GdkGC **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1text_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1white_1gc
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1style_1get_1white_1gc)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1white_1gc_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
gtk_style_get_white_gc((GtkStyle *)arg0, (GdkGC **)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1get_1white_1gc_FUNC);
}
#endif
#ifndef NO__1gtk_1style_1get_1xthickness
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1xthickness)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1xthickness_FUNC);
@@ -12722,7 +12133,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1xthickness)
#ifndef NO__1gtk_1style_1get_1ythickness
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1ythickness)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1get_1ythickness_FUNC);
@@ -12733,14 +12144,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1get_1ythickness)
#endif
#ifndef NO__1gtk_1style_1render_1icon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1style_1render_1icon)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jbyteArray arg6)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1style_1render_1icon)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintLong arg5, jbyteArray arg6)
{
jbyte *lparg6=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1style_1render_1icon_FUNC);
if (arg6) if ((lparg6 = (*env)->GetByteArrayElements(env, arg6, NULL)) == NULL) goto fail;
- rc = (jint)gtk_style_render_icon((GtkStyle *)arg0, (GtkIconSource *)arg1, arg2, arg3, arg4, (GtkWidget *)arg5, (const gchar *)lparg6);
+ rc = (jintLong)gtk_style_render_icon((GtkStyle *)arg0, (GtkIconSource *)arg1, arg2, arg3, arg4, (GtkWidget *)arg5, (const gchar *)lparg6);
fail:
if (arg6 && lparg6) (*env)->ReleaseByteArrayElements(env, arg6, lparg6, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1style_1render_1icon_FUNC);
@@ -12749,12 +12160,12 @@ fail:
#endif
#ifndef NO__1gtk_1target_1list_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1new_FUNC);
- rc = (jint)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
+ rc = (jintLong)gtk_target_list_new((const GtkTargetEntry *)arg0, (guint)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1target_1list_1new_FUNC);
return rc;
}
@@ -12762,7 +12173,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1target_1list_1new)
#ifndef NO__1gtk_1target_1list_1unref
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1target_1list_1unref)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1target_1list_1unref_FUNC);
gtk_target_list_unref((GtkTargetList *)arg0);
@@ -12772,7 +12183,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1target_1list_1unref)
#ifndef NO__1gtk_1text_1buffer_1copy_1clipboard
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1copy_1clipboard_FUNC);
gtk_text_buffer_copy_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1);
@@ -12782,7 +12193,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1copy_1clipboard)
#ifndef NO__1gtk_1text_1buffer_1cut_1clipboard
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1cut_1clipboard_FUNC);
gtk_text_buffer_cut_clipboard((GtkTextBuffer *)arg0, (GtkClipboard *)arg1, (gboolean)arg2);
@@ -12792,7 +12203,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1cut_1clipboard)
#ifndef NO__1gtk_1text_1buffer_1delete
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1delete)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
@@ -12809,7 +12220,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1get_1bounds
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1bounds)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
@@ -12826,7 +12237,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1get_1char_1count
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1char_1count)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1char_1count_FUNC);
@@ -12838,7 +12249,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1char_1count)
#ifndef NO__1gtk_1text_1buffer_1get_1end_1iter
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1end_1iter)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1end_1iter_FUNC);
@@ -12851,12 +12262,12 @@ fail:
#endif
#ifndef NO__1gtk_1text_1buffer_1get_1insert
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
- rc = (jint)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
+ rc = (jintLong)gtk_text_buffer_get_insert((GtkTextBuffer *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1insert_FUNC);
return rc;
}
@@ -12864,7 +12275,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1insert)
#ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1line
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1line)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1line_FUNC);
@@ -12878,7 +12289,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1mark
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1mark)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1mark_FUNC);
@@ -12892,7 +12303,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1get_1iter_1at_1offset
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1iter_1at_1offset)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1iter_1at_1offset_FUNC);
@@ -12906,7 +12317,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1get_1line_1count
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1line_1count_FUNC);
@@ -12917,12 +12328,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1line_1count)
#endif
#ifndef NO__1gtk_1text_1buffer_1get_1selection_1bound
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
- rc = (jint)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
+ rc = (jintLong)gtk_text_buffer_get_selection_bound((GtkTextBuffer *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1get_1selection_1bound_FUNC);
return rc;
}
@@ -12930,7 +12341,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bound)
#ifndef NO__1gtk_1text_1buffer_1get_1selection_1bounds
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1selection_1bounds)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2)
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
@@ -12948,16 +12359,16 @@ fail:
#endif
#ifndef NO__1gtk_1text_1buffer_1get_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1buffer_1get_1text)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jboolean arg3)
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1get_1text_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
- rc = (jint)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
+ rc = (jintLong)gtk_text_buffer_get_text((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (GtkTextIter *)lparg2, (gboolean)arg3);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
@@ -12966,40 +12377,62 @@ fail:
}
#endif
-#ifndef NO__1gtk_1text_1buffer_1insert__II_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1text_1buffer_1insert__II_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__JJ_3BI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__JJ_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#endif
{
jbyte *lparg2=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
+#endif
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)arg1, (const gchar *)lparg2, (gint)arg3);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__II_3BI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1text_1buffer_1insert__I_3B_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1text_1buffer_1insert__I_3B_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1text_1buffer_1insert__J_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__I_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1insert__J_3B_3BI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jint arg3)
+#endif
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_text_buffer_insert((GtkTextBuffer *)arg0, (GtkTextIter *)lparg1, (const gchar *)lparg2, (gint)arg3);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC);
+#endif
}
#endif
#ifndef NO__1gtk_1text_1buffer_1move_1mark
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1move_1mark)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2)
{
jbyte *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1move_1mark_FUNC);
@@ -13013,7 +12446,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1paste_1clipboard
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1paste_1clipboard)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jboolean arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jboolean arg3)
{
jbyte *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1paste_1clipboard_FUNC);
@@ -13027,7 +12460,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1place_1cursor
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1place_1cursor)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1place_1cursor_FUNC);
@@ -13041,7 +12474,7 @@ fail:
#ifndef NO__1gtk_1text_1buffer_1set_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1buffer_1set_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1buffer_1set_1text_FUNC);
@@ -13087,7 +12520,7 @@ fail:
#ifndef NO__1gtk_1text_1view_1buffer_1to_1window_1coords
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1buffer_1to_1window_1coords)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
{
jint *lparg4=NULL;
jint *lparg5=NULL;
@@ -13103,12 +12536,12 @@ fail:
#endif
#ifndef NO__1gtk_1text_1view_1get_1buffer
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
- rc = (jint)gtk_text_view_get_buffer((GtkTextView *)arg0);
+ rc = (jintLong)gtk_text_view_get_buffer((GtkTextView *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1buffer_FUNC);
return rc;
}
@@ -13116,7 +12549,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1buffer)
#ifndef NO__1gtk_1text_1view_1get_1editable
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1editable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1editable_FUNC);
@@ -13128,7 +12561,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1editable)
#ifndef NO__1gtk_1text_1view_1get_1iter_1at_1location
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1at_1location)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jint arg3)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1iter_1at_1location_FUNC);
@@ -13142,7 +12575,7 @@ fail:
#ifndef NO__1gtk_1text_1view_1get_1iter_1location
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1iter_1location)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2)
{
jbyte *lparg1=NULL;
GdkRectangle _arg2, *lparg2=NULL;
@@ -13159,7 +12592,7 @@ fail:
#ifndef NO__1gtk_1text_1view_1get_1line_1at_1y
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1line_1at_1y)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2, jintArray arg3)
{
jbyte *lparg1=NULL;
jint *lparg3=NULL;
@@ -13176,7 +12609,7 @@ fail:
#ifndef NO__1gtk_1text_1view_1get_1visible_1rect
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1visible_1rect)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1visible_1rect_FUNC);
@@ -13189,24 +12622,24 @@ fail:
#endif
#ifndef NO__1gtk_1text_1view_1get_1window
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1get_1window)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1get_1window_FUNC);
- rc = (jint)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
+ rc = (jintLong)gtk_text_view_get_window((GtkTextView *)arg0, (GtkTextWindowType)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1get_1window_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1text_1view_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1new_FUNC);
- rc = (jint)gtk_text_view_new();
+ rc = (jintLong)gtk_text_view_new();
OS_NATIVE_EXIT(env, that, _1gtk_1text_1view_1new_FUNC);
return rc;
}
@@ -13214,7 +12647,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1text_1view_1new)
#ifndef NO__1gtk_1text_1view_1scroll_1mark_1onscreen
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1mark_1onscreen)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1scroll_1mark_1onscreen_FUNC);
gtk_text_view_scroll_mark_onscreen((GtkTextView *)arg0, (GtkTextMark *)arg1);
@@ -13224,7 +12657,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1mark_1onscreen)
#ifndef NO__1gtk_1text_1view_1scroll_1to_1iter
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1text_1view_1scroll_1to_1iter)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jdouble arg2, jboolean arg3, jdouble arg4, jdouble arg5)
{
jbyte *lparg1=NULL;
jboolean rc = 0;
@@ -13240,7 +12673,7 @@ fail:
#ifndef NO__1gtk_1text_1view_1set_1editable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1editable_FUNC);
gtk_text_view_set_editable((GtkTextView *)arg0, (gboolean)arg1);
@@ -13250,7 +12683,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1editable)
#ifndef NO__1gtk_1text_1view_1set_1justification
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1justification)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1justification_FUNC);
gtk_text_view_set_justification((GtkTextView *)arg0, arg1);
@@ -13260,7 +12693,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1justification)
#ifndef NO__1gtk_1text_1view_1set_1tabs
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1tabs)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1tabs_FUNC);
gtk_text_view_set_tabs((GtkTextView *)arg0, (PangoTabArray *)arg1);
@@ -13270,7 +12703,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1tabs)
#ifndef NO__1gtk_1text_1view_1set_1wrap_1mode
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1text_1view_1set_1wrap_1mode_FUNC);
gtk_text_view_set_wrap_mode((GtkTextView *)arg0, arg1);
@@ -13280,7 +12713,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1set_1wrap_1mode)
#ifndef NO__1gtk_1text_1view_1window_1to_1buffer_1coords
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1text_1view_1window_1to_1buffer_1coords)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
{
jint *lparg4=NULL;
jint *lparg5=NULL;
@@ -13297,7 +12730,7 @@ fail:
#ifndef NO__1gtk_1timeout_1add
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1timeout_1add)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintLong arg2)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1timeout_1add_FUNC);
@@ -13319,7 +12752,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1timeout_1remove)
#ifndef NO__1gtk_1toggle_1button_1get_1active
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1active)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1active_FUNC);
@@ -13331,7 +12764,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1active)
#ifndef NO__1gtk_1toggle_1button_1get_1inconsistent
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1inconsistent)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1get_1inconsistent_FUNC);
@@ -13342,12 +12775,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1toggle_1button_1get_1inconsistent)
#endif
#ifndef NO__1gtk_1toggle_1button_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1new_FUNC);
- rc = (jint)gtk_toggle_button_new();
+ rc = (jintLong)gtk_toggle_button_new();
OS_NATIVE_EXIT(env, that, _1gtk_1toggle_1button_1new_FUNC);
return rc;
}
@@ -13355,7 +12788,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toggle_1button_1new)
#ifndef NO__1gtk_1toggle_1button_1set_1active
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1active)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1active_FUNC);
gtk_toggle_button_set_active((GtkToggleButton *)arg0, (gboolean)arg1);
@@ -13365,7 +12798,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1active)
#ifndef NO__1gtk_1toggle_1button_1set_1inconsistent
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1inconsistent_FUNC);
gtk_toggle_button_set_inconsistent((GtkToggleButton *)arg0, (gboolean)arg1);
@@ -13375,7 +12808,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1inconsistent)
#ifndef NO__1gtk_1toggle_1button_1set_1mode
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1mode)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1toggle_1button_1set_1mode_FUNC);
gtk_toggle_button_set_mode((GtkToggleButton *)arg0, (gboolean)arg1);
@@ -13385,7 +12818,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toggle_1button_1set_1mode)
#ifndef NO__1gtk_1toolbar_1insert_1widget
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1insert_1widget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
@@ -13401,12 +12834,12 @@ fail:
#endif
#ifndef NO__1gtk_1toolbar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1new_FUNC);
- rc = (jint)gtk_toolbar_new();
+ rc = (jintLong)gtk_toolbar_new();
OS_NATIVE_EXIT(env, that, _1gtk_1toolbar_1new_FUNC);
return rc;
}
@@ -13414,7 +12847,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1toolbar_1new)
#ifndef NO__1gtk_1toolbar_1set_1orientation
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1orientation)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1toolbar_1set_1orientation_FUNC);
gtk_toolbar_set_orientation((GtkToolbar *)arg0, (GtkOrientation)arg1);
@@ -13424,24 +12857,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1toolbar_1set_1orientation)
#ifndef NO__1gtk_1tooltip_1trigger_1tooltip_1query
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tooltip_1trigger_1tooltip_1query_FUNC);
/*
gtk_tooltip_trigger_tooltip_query((GdkDisplay*)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GdkDisplay*);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_tooltip_trigger_tooltip_query_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_tooltip_trigger_tooltip_query");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GdkDisplay*)arg0);
+ LOAD_FUNCTION(fp, gtk_tooltip_trigger_tooltip_query)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GdkDisplay*))fp)((GdkDisplay*)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1tooltip_1trigger_1tooltip_1query_FUNC);
@@ -13449,12 +12874,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltip_1trigger_1tooltip_1query)
#endif
#ifndef NO__1gtk_1tooltips_1data_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1data_1get_FUNC);
- rc = (jint)gtk_tooltips_data_get((GtkWidget *)arg0);
+ rc = (jintLong)gtk_tooltips_data_get((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1data_1get_FUNC);
return rc;
}
@@ -13462,7 +12887,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1data_1get)
#ifndef NO__1gtk_1tooltips_1disable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1disable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1disable_FUNC);
gtk_tooltips_disable((GtkTooltips *)arg0);
@@ -13472,7 +12897,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1disable)
#ifndef NO__1gtk_1tooltips_1enable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1enable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1enable_FUNC);
gtk_tooltips_enable((GtkTooltips *)arg0);
@@ -13482,7 +12907,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1enable)
#ifndef NO__1gtk_1tooltips_1force_1window
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1force_1window)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1force_1window_FUNC);
gtk_tooltips_force_window((GtkTooltips *)arg0);
@@ -13491,12 +12916,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1force_1window)
#endif
#ifndef NO__1gtk_1tooltips_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tooltips_1new_FUNC);
- rc = (jint)gtk_tooltips_new();
+ rc = (jintLong)gtk_tooltips_new();
OS_NATIVE_EXIT(env, that, _1gtk_1tooltips_1new_FUNC);
return rc;
}
@@ -13504,7 +12929,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tooltips_1new)
#ifndef NO__1gtk_1tooltips_1set_1tip
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tooltips_1set_1tip)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
@@ -13519,37 +12944,59 @@ fail:
}
#endif
-#ifndef NO__1gtk_1tree_1model_1get__III_3II
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1model_1get__III_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintArray arg3, jintLong arg4)
+#endif
{
jint *lparg3=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3IJ_FUNC);
+#endif
if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3IJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1tree_1model_1get__III_3JI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3JI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlongArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1model_1get__III_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1model_1get__JJI_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__III_3JI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1model_1get__JJI_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlongArray arg3, jintLong arg4)
+#endif
{
jlong *lparg3=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get__JJI_3JJ_FUNC);
+#endif
if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
gtk_tree_model_get((GtkTreeModel *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__III_3JI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get__JJI_3JJ_FUNC);
+#endif
}
#endif
#ifndef NO__1gtk_1tree_1model_1get_1iter
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_FUNC);
@@ -13561,7 +13008,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter)
#ifndef NO__1gtk_1tree_1model_1get_1iter_1first
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1iter_1first_FUNC);
@@ -13573,7 +13020,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1iter_1first)
#ifndef NO__1gtk_1tree_1model_1get_1n_1columns
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1n_1columns_FUNC);
@@ -13584,24 +13031,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1n_1columns)
#endif
#ifndef NO__1gtk_1tree_1model_1get_1path
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1path)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
- rc = (jint)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
+ rc = (jintLong)gtk_tree_model_get_path((GtkTreeModel *)arg0, (GtkTreeIter *)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1path_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1tree_1model_1get_1type
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
- rc = (jint)gtk_tree_model_get_type();
+ rc = (jintLong)gtk_tree_model_get_type();
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1model_1get_1type_FUNC);
return rc;
}
@@ -13609,7 +13056,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1get_1type)
#ifndef NO__1gtk_1tree_1model_1iter_1children
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1children)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1children_FUNC);
@@ -13621,7 +13068,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1children)
#ifndef NO__1gtk_1tree_1model_1iter_1n_1children
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1n_1children_FUNC);
@@ -13633,7 +13080,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1n_1children)
#ifndef NO__1gtk_1tree_1model_1iter_1next
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1next)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1next_FUNC);
@@ -13645,7 +13092,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1next)
#ifndef NO__1gtk_1tree_1model_1iter_1nth_1child
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1model_1iter_1nth_1child_FUNC);
@@ -13657,7 +13104,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1model_1iter_1nth_1child)
#ifndef NO__1gtk_1tree_1path_1append_1index
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1append_1index)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1append_1index_FUNC);
gtk_tree_path_append_index((GtkTreePath *)arg0, arg1);
@@ -13666,12 +13113,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1append_1index)
#endif
#ifndef NO__1gtk_1tree_1path_1compare
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1compare_FUNC);
- rc = (jint)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
+ rc = (jintLong)gtk_tree_path_compare((const GtkTreePath *)arg0, (const GtkTreePath *)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1compare_FUNC);
return rc;
}
@@ -13679,7 +13126,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1compare)
#ifndef NO__1gtk_1tree_1path_1down
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1down)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1down_FUNC);
gtk_tree_path_down((GtkTreePath *)arg0);
@@ -13689,7 +13136,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1down)
#ifndef NO__1gtk_1tree_1path_1free
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1free_FUNC);
gtk_tree_path_free((GtkTreePath *)arg0);
@@ -13699,7 +13146,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1free)
#ifndef NO__1gtk_1tree_1path_1get_1depth
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1depth)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1depth_FUNC);
@@ -13710,62 +13157,73 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1depth)
#endif
#ifndef NO__1gtk_1tree_1path_1get_1indices
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1get_1indices)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
- rc = (jint)gtk_tree_path_get_indices((GtkTreePath *)arg0);
+ rc = (jintLong)gtk_tree_path_get_indices((GtkTreePath *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1get_1indices_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1tree_1path_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_FUNC);
- rc = (jint)gtk_tree_path_new();
+ rc = (jintLong)gtk_tree_path_new();
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1tree_1path_1new_1first
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1first)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1first)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1first_FUNC);
- rc = (jint)gtk_tree_path_new_first();
+ rc = (jintLong)gtk_tree_path_new_first();
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1first_FUNC);
return rc;
}
#endif
-#ifndef NO__1gtk_1tree_1path_1new_1from_1string__I
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)
- (JNIEnv *env, jclass that, jint arg0)
+#if (!defined(NO__1gtk_1tree_1path_1new_1from_1string__I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1path_1new_1from_1string__J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
- rc = (jint)gtk_tree_path_new_from_string((const gchar *)arg0);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
+#endif
+ rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)arg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string__J_FUNC);
+#endif
return rc;
}
#endif
#ifndef NO__1gtk_1tree_1path_1new_1from_1string___3B
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1path_1new_1from_1string___3B)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)gtk_tree_path_new_from_string((const gchar *)lparg0);
+ rc = (jintLong)gtk_tree_path_new_from_string((const gchar *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1path_1new_1from_1string___3B_FUNC);
@@ -13775,7 +13233,7 @@ fail:
#ifndef NO__1gtk_1tree_1path_1next
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1next)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1next_FUNC);
gtk_tree_path_next((GtkTreePath *)arg0);
@@ -13785,7 +13243,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1path_1next)
#ifndef NO__1gtk_1tree_1path_1prev
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1prev)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1prev_FUNC);
@@ -13797,7 +13255,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1prev)
#ifndef NO__1gtk_1tree_1path_1up
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1up)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1path_1up_FUNC);
@@ -13809,7 +13267,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1path_1up)
#ifndef NO__1gtk_1tree_1selection_1count_1selected_1rows
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
@@ -13817,18 +13275,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
rc = (jint)gtk_tree_selection_count_selected_rows((GtkTreeSelection *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GtkTreeSelection *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_tree_selection_count_selected_rows_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_selection_count_selected_rows");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GtkTreeSelection *)arg0);
+ LOAD_FUNCTION(fp, gtk_tree_selection_count_selected_rows)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(GtkTreeSelection *))fp)((GtkTreeSelection *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1count_1selected_1rows_FUNC);
@@ -13838,48 +13287,39 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1count_1selected_1rows)
#ifndef NO__1gtk_1tree_1selection_1get_1selected
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLong arg2)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
rc = (jboolean)gtk_tree_selection_get_selected((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1, (GtkTreeIter *)arg2);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1tree_1selection_1get_1selected_1rows
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
- jint rc = 0;
+ jintLong *lparg1=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
- rc = (jint)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
+ rc = (jintLong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GtkTreeSelection *, GtkTreeModel **);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_tree_selection_get_selected_rows_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_selection_get_selected_rows");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
+ LOAD_FUNCTION(fp, gtk_tree_selection_get_selected_rows)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkTreeSelection *, GtkTreeModel **))fp)((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
}
}
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
return rc;
}
@@ -13887,7 +13327,7 @@ fail:
#ifndef NO__1gtk_1tree_1selection_1path_1is_1selected
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1path_1is_1selected_FUNC);
@@ -13899,7 +13339,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1selection_1path_1is_1selected)
#ifndef NO__1gtk_1tree_1selection_1select_1all
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1all)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1all_FUNC);
gtk_tree_selection_select_all((GtkTreeSelection *)arg0);
@@ -13909,7 +13349,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1all)
#ifndef NO__1gtk_1tree_1selection_1select_1iter
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1iter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1select_1iter_FUNC);
gtk_tree_selection_select_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
@@ -13919,7 +13359,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1select_1iter)
#ifndef NO__1gtk_1tree_1selection_1selected_1foreach
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1selected_1foreach)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1selected_1foreach_FUNC);
gtk_tree_selection_selected_foreach((GtkTreeSelection *)arg0, (GtkTreeSelectionForeachFunc)arg1, (gpointer)arg2);
@@ -13929,7 +13369,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1selected_1foreach)
#ifndef NO__1gtk_1tree_1selection_1set_1mode
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1mode)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1set_1mode_FUNC);
gtk_tree_selection_set_mode((GtkTreeSelection *)arg0, (GtkSelectionMode)arg1);
@@ -13939,7 +13379,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1set_1mode)
#ifndef NO__1gtk_1tree_1selection_1unselect_1all
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1all_FUNC);
gtk_tree_selection_unselect_all((GtkTreeSelection *)arg0);
@@ -13949,7 +13389,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1all)
#ifndef NO__1gtk_1tree_1selection_1unselect_1iter
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1unselect_1iter_FUNC);
gtk_tree_selection_unselect_iter((GtkTreeSelection *)arg0, (GtkTreeIter *)arg1);
@@ -13959,7 +13399,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1selection_1unselect_1iter)
#ifndef NO__1gtk_1tree_1store_1append
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1append)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1append_FUNC);
gtk_tree_store_append((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2);
@@ -13969,7 +13409,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1append)
#ifndef NO__1gtk_1tree_1store_1clear
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1clear)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1clear_FUNC);
gtk_tree_store_clear((GtkTreeStore *)arg0);
@@ -13979,7 +13419,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1clear)
#ifndef NO__1gtk_1tree_1store_1insert
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1insert)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1insert_FUNC);
gtk_tree_store_insert((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, (GtkTreeIter *)arg2, (gint)arg3);
@@ -13988,16 +13428,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1insert)
#endif
#ifndef NO__1gtk_1tree_1store_1newv
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1store_1newv)
+ (JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
{
- jint *lparg1=NULL;
- jint rc = 0;
+ jintLong *lparg1=NULL;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gtk_tree_store_newv(arg0, (GType *)lparg1);
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ rc = (jintLong)gtk_tree_store_newv(arg0, (GType *)lparg1);
fail:
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC);
return rc;
}
@@ -14005,7 +13445,7 @@ fail:
#ifndef NO__1gtk_1tree_1store_1remove
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1remove)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1remove_FUNC);
gtk_tree_store_remove((GtkTreeStore *)arg0, (GtkTreeIter *)arg1);
@@ -14013,66 +13453,121 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1remove)
}
#endif
-#ifndef NO__1gtk_1tree_1store_1set__IIIII
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIIII) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIIJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIIJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintLong arg4)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIIJ_FUNC);
+#endif
gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIII_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIIJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1tree_1store_1set__IIIJI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIIJI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIJJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jlong arg3, jintLong arg4)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIJJ_FUNC);
+#endif
gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIJI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIJJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jobject arg3, jintLong arg4)
+#endif
{
GdkColor _arg3, *lparg3=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
if (arg3) if ((lparg3 = getGdkColorFields(env, arg3, &_arg3)) == NULL) goto fail;
gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1tree_1store_1set__IIIZI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIZI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__IIIZI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJIZJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__IIIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJIZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jboolean arg3, jintLong arg4)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJIZJ_FUNC);
+#endif
gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, arg3, arg4);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__IIIZI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJIZJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1tree_1store_1set__III_3BI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__III_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1gtk_1tree_1store_1set__III_3BI) && !defined(JNI64)) || (!defined(NO__1gtk_1tree_1store_1set__JJI_3BJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__III_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1store_1set__JJI_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintLong arg4)
+#endif
{
jbyte *lparg3=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1set__JJI_3BJ_FUNC);
+#endif
if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
gtk_tree_store_set((GtkTreeStore *)arg0, (GtkTreeIter *)arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__III_3BI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1set__JJI_3BJ_FUNC);
+#endif
}
#endif
#ifndef NO__1gtk_1tree_1view_1collapse_1row
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1collapse_1row)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1collapse_1row_FUNC);
@@ -14084,7 +13579,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1collapse_1row)
#ifndef NO__1gtk_1tree_1view_1column_1add_1attribute
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1add_1attribute)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3)
{
jbyte *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1add_1attribute_FUNC);
@@ -14098,7 +13593,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1position
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1position)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintArray arg3)
{
jint *lparg2=NULL;
jint *lparg3=NULL;
@@ -14110,18 +13605,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1posit
rc = (jboolean)gtk_tree_view_column_cell_get_position((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_tree_view_column_cell_get_position_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_tree_view_column_cell_get_position");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
+ LOAD_FUNCTION(fp, gtk_tree_view_column_cell_get_position)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkTreeViewColumn *, GtkCellRenderer *, gint *, gint *))fp)((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gint *)lparg2, (gint *)lparg3);
}
}
fail:
@@ -14134,7 +13620,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1column_1cell_1get_1size
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1get_1size)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
{
GdkRectangle _arg1, *lparg1=NULL;
jint *lparg2=NULL;
@@ -14160,7 +13646,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1column_1cell_1set_1cell_1data
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1data)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jboolean arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jboolean arg4)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1cell_1set_1cell_1data_FUNC);
gtk_tree_view_column_cell_set_cell_data((GtkTreeViewColumn *)arg0, (GtkTreeModel *)arg1, (GtkTreeIter *)arg2, arg3, arg4);
@@ -14170,7 +13656,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1cell_1set_1cell_1dat
#ifndef NO__1gtk_1tree_1view_1column_1clear
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1clear)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1clear_FUNC);
gtk_tree_view_column_clear((GtkTreeViewColumn *)arg0);
@@ -14179,12 +13665,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1clear)
#endif
#ifndef NO__1gtk_1tree_1view_1column_1get_1cell_1renderers
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1cell_1renderers_FUNC);
- rc = (jint)gtk_tree_view_column_get_cell_renderers((GtkTreeViewColumn *)arg0);
+ rc = (jintLong)gtk_tree_view_column_get_cell_renderers((GtkTreeViewColumn *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1cell_1renderers_FUNC);
return rc;
}
@@ -14192,7 +13678,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1cell_1renderers
#ifndef NO__1gtk_1tree_1view_1column_1get_1fixed_1width
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1fixed_1width_FUNC);
@@ -14204,7 +13690,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1fixed_1width)
#ifndef NO__1gtk_1tree_1view_1column_1get_1reorderable
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1reorderable_FUNC);
@@ -14216,7 +13702,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1reorderable
#ifndef NO__1gtk_1tree_1view_1column_1get_1resizable
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1resizable_FUNC);
@@ -14228,7 +13714,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1resizable)
#ifndef NO__1gtk_1tree_1view_1column_1get_1sizing
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sizing)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sizing_FUNC);
@@ -14240,7 +13726,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sizing)
#ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1indicator
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1indicator)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sort_1indicator_FUNC);
@@ -14252,7 +13738,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1indic
#ifndef NO__1gtk_1tree_1view_1column_1get_1sort_1order
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1order)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1sort_1order_FUNC);
@@ -14264,7 +13750,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1sort_1order)
#ifndef NO__1gtk_1tree_1view_1column_1get_1spacing
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1spacing)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1spacing_FUNC);
@@ -14276,7 +13762,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1spacing)
#ifndef NO__1gtk_1tree_1view_1column_1get_1visible
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1visible_FUNC);
@@ -14288,7 +13774,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1visible)
#ifndef NO__1gtk_1tree_1view_1column_1get_1width
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1width_FUNC);
@@ -14299,12 +13785,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1get_1width)
#endif
#ifndef NO__1gtk_1tree_1view_1column_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
- rc = (jint)gtk_tree_view_column_new();
+ rc = (jintLong)gtk_tree_view_column_new();
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1new_FUNC);
return rc;
}
@@ -14312,7 +13798,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1new)
#ifndef NO__1gtk_1tree_1view_1column_1pack_1end
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1end_FUNC);
gtk_tree_view_column_pack_end((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
@@ -14322,7 +13808,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1end)
#ifndef NO__1gtk_1tree_1view_1column_1pack_1start
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1pack_1start_FUNC);
gtk_tree_view_column_pack_start((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (gboolean)arg2);
@@ -14332,7 +13818,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1pack_1start)
#ifndef NO__1gtk_1tree_1view_1column_1set_1alignment
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
- (JNIEnv *env, jclass that, jint arg0, jfloat arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jfloat arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1alignment_FUNC);
gtk_tree_view_column_set_alignment((GtkTreeViewColumn *)arg0, arg1);
@@ -14342,7 +13828,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1alignment)
#ifndef NO__1gtk_1tree_1view_1column_1set_1cell_1data_1func
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1func)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1cell_1data_1func_FUNC);
gtk_tree_view_column_set_cell_data_func((GtkTreeViewColumn *)arg0, (GtkCellRenderer *)arg1, (GtkTreeCellDataFunc)arg2, (gpointer)arg3, (GtkDestroyNotify)arg4);
@@ -14352,7 +13838,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1cell_1data_1fun
#ifndef NO__1gtk_1tree_1view_1column_1set_1clickable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1clickable_FUNC);
gtk_tree_view_column_set_clickable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14362,7 +13848,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1clickable)
#ifndef NO__1gtk_1tree_1view_1column_1set_1fixed_1width
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1fixed_1width_FUNC);
gtk_tree_view_column_set_fixed_width((GtkTreeViewColumn *)arg0, (gint)arg1);
@@ -14372,7 +13858,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1fixed_1width)
#ifndef NO__1gtk_1tree_1view_1column_1set_1min_1width
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1min_1width_FUNC);
gtk_tree_view_column_set_min_width((GtkTreeViewColumn *)arg0, (gint)arg1);
@@ -14382,7 +13868,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1min_1width)
#ifndef NO__1gtk_1tree_1view_1column_1set_1reorderable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1reorderable_FUNC);
gtk_tree_view_column_set_reorderable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14392,7 +13878,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1reorderable)
#ifndef NO__1gtk_1tree_1view_1column_1set_1resizable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1resizable_FUNC);
gtk_tree_view_column_set_resizable((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14402,7 +13888,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1resizable)
#ifndef NO__1gtk_1tree_1view_1column_1set_1sizing
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sizing_FUNC);
gtk_tree_view_column_set_sizing((GtkTreeViewColumn *)arg0, (GtkTreeViewColumnSizing)arg1);
@@ -14412,7 +13898,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sizing)
#ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1indicator
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1indicator_FUNC);
gtk_tree_view_column_set_sort_indicator((GtkTreeViewColumn *)arg0, (gboolean)arg1);
@@ -14422,7 +13908,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1indicator
#ifndef NO__1gtk_1tree_1view_1column_1set_1sort_1order
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1sort_1order_FUNC);
gtk_tree_view_column_set_sort_order((GtkTreeViewColumn *)arg0, (GtkSortType)arg1);
@@ -14432,7 +13918,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1sort_1order)
#ifndef NO__1gtk_1tree_1view_1column_1set_1title
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1title)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1title_FUNC);
@@ -14446,7 +13932,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1column_1set_1visible
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1visible_FUNC);
gtk_tree_view_column_set_visible((GtkTreeViewColumn *)arg0, arg1);
@@ -14456,7 +13942,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1visible)
#ifndef NO__1gtk_1tree_1view_1column_1set_1widget
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1set_1widget_FUNC);
gtk_tree_view_column_set_widget((GtkTreeViewColumn *)arg0, (GtkWidget *)arg1);
@@ -14465,12 +13951,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1column_1set_1widget)
#endif
#ifndef NO__1gtk_1tree_1view_1create_1row_1drag_1icon
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
- rc = (jint)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
+ rc = (jintLong)gtk_tree_view_create_row_drag_icon((GtkTreeView *)arg0, (GtkTreePath *)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1create_1row_1drag_1icon_FUNC);
return rc;
}
@@ -14478,7 +13964,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1create_1row_1drag_1icon)
#ifndef NO__1gtk_1tree_1view_1expand_1row
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1expand_1row)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1expand_1row_FUNC);
@@ -14490,7 +13976,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1expand_1row)
#ifndef NO__1gtk_1tree_1view_1get_1background_1area
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1background_1area)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
{
GdkRectangle _arg3, *lparg3=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1background_1area_FUNC);
@@ -14503,12 +13989,12 @@ fail:
#endif
#ifndef NO__1gtk_1tree_1view_1get_1bin_1window
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
- rc = (jint)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
+ rc = (jintLong)gtk_tree_view_get_bin_window((GtkTreeView *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1bin_1window_FUNC);
return rc;
}
@@ -14516,7 +14002,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1bin_1window)
#ifndef NO__1gtk_1tree_1view_1get_1cell_1area
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cell_1area)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
{
GdkRectangle _arg3, *lparg3=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cell_1area_FUNC);
@@ -14529,24 +14015,24 @@ fail:
#endif
#ifndef NO__1gtk_1tree_1view_1get_1column
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1column)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
- rc = (jint)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
+ rc = (jintLong)gtk_tree_view_get_column((GtkTreeView *)arg0, (gint)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1column_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1tree_1view_1get_1columns
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
- rc = (jint)gtk_tree_view_get_columns((GtkTreeView *)arg0);
+ rc = (jintLong)gtk_tree_view_get_columns((GtkTreeView *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1columns_FUNC);
return rc;
}
@@ -14554,28 +14040,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1columns)
#ifndef NO__1gtk_1tree_1view_1get_1cursor
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1cursor)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
+ jintLong *lparg1=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1cursor_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;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_tree_view_get_cursor((GtkTreeView *)arg0, (GtkTreePath **)lparg1, (GtkTreeViewColumn **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1cursor_FUNC);
}
#endif
#ifndef NO__1gtk_1tree_1view_1get_1expander_1column
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
- rc = (jint)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
+ rc = (jintLong)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
return rc;
}
@@ -14583,7 +14069,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
#ifndef NO__1gtk_1tree_1view_1get_1headers_1visible
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1headers_1visible_FUNC);
@@ -14595,24 +14081,24 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
#ifndef NO__1gtk_1tree_1view_1get_1path_1at_1pos
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintArray arg6)
{
- jint *lparg3=NULL;
- jint *lparg4=NULL;
+ jintLong *lparg3=NULL;
+ jintLong *lparg4=NULL;
jint *lparg5=NULL;
jint *lparg6=NULL;
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
- if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
- if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
rc = (jboolean)gtk_tree_view_get_path_at_pos((GtkTreeView *)arg0, (gint)arg1, (gint)arg2, (GtkTreePath **)lparg3, (GtkTreeViewColumn **)lparg4, (gint *)lparg5, (gint *)lparg6);
fail:
if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
- if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
- if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
+ if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+ if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
return rc;
}
@@ -14620,7 +14106,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1get_1rules_1hint
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1rules_1hint_FUNC);
@@ -14631,12 +14117,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1rules_1hint)
#endif
#ifndef NO__1gtk_1tree_1view_1get_1selection
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
- rc = (jint)gtk_tree_view_get_selection((GtkTreeView *)arg0);
+ rc = (jintLong)gtk_tree_view_get_selection((GtkTreeView *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1selection_FUNC);
return rc;
}
@@ -14644,7 +14130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1selection)
#ifndef NO__1gtk_1tree_1view_1get_1visible_1rect
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1get_1visible_1rect)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GdkRectangle _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1visible_1rect_FUNC);
@@ -14658,7 +14144,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1insert_1column
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1insert_1column)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1insert_1column_FUNC);
@@ -14670,7 +14156,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1insert_1column)
#ifndef NO__1gtk_1tree_1view_1move_1column_1after
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1move_1column_1after_FUNC);
gtk_tree_view_move_column_after((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1, (GtkTreeViewColumn *)arg2);
@@ -14679,12 +14165,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1move_1column_1after)
#endif
#ifndef NO__1gtk_1tree_1view_1new_1with_1model
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
- rc = (jint)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
+ rc = (jintLong)gtk_tree_view_new_with_model((GtkTreeModel *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1new_1with_1model_FUNC);
return rc;
}
@@ -14692,7 +14178,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1tree_1view_1new_1with_1model)
#ifndef NO__1gtk_1tree_1view_1remove_1column
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1remove_1column)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1remove_1column_FUNC);
gtk_tree_view_remove_column((GtkTreeView *)arg0, (GtkTreeViewColumn *)arg1);
@@ -14702,7 +14188,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1remove_1column)
#ifndef NO__1gtk_1tree_1view_1row_1expanded
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1row_1expanded)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1row_1expanded_FUNC);
@@ -14714,7 +14200,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1tree_1view_1row_1expanded)
#ifndef NO__1gtk_1tree_1view_1scroll_1to_1cell
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3, jfloat arg4, jfloat arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3, jfloat arg4, jfloat arg5)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1cell_FUNC);
gtk_tree_view_scroll_to_cell((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, (gboolean)arg3, (gfloat)arg4, (gfloat)arg5);
@@ -14724,7 +14210,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1cell)
#ifndef NO__1gtk_1tree_1view_1scroll_1to_1point
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1scroll_1to_1point_FUNC);
gtk_tree_view_scroll_to_point((GtkTreeView *)arg0, (gint)arg1, (gint)arg2);
@@ -14734,7 +14220,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1scroll_1to_1point)
#ifndef NO__1gtk_1tree_1view_1set_1cursor
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1cursor)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jboolean arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1cursor_FUNC);
gtk_tree_view_set_cursor((GtkTreeView *)arg0, (GtkTreePath *)arg1, (GtkTreeViewColumn *)arg2, arg3);
@@ -14744,7 +14230,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1cursor)
#ifndef NO__1gtk_1tree_1view_1set_1drag_1dest_1row
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC);
gtk_tree_view_set_drag_dest_row((GtkTreeView *)arg0, (GtkTreePath *)arg1, arg2);
@@ -14754,7 +14240,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1drag_1dest_1row)
#ifndef NO__1gtk_1tree_1view_1set_1enable_1search
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1enable_1search)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1enable_1search_FUNC);
gtk_tree_view_set_enable_search((GtkTreeView *)arg0, arg1);
@@ -14762,9 +14248,27 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1enable_1search)
}
#endif
+#ifndef NO__1gtk_1tree_1view_1set_1grid_1lines
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1grid_1lines)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
+/*
+ gtk_tree_view_set_grid_lines((GtkTreeView*)arg0, arg1);
+*/
+ {
+ LOAD_FUNCTION(fp, gtk_tree_view_set_grid_lines)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkTreeView*, jint))fp)((GtkTreeView*)arg0, arg1);
+ }
+ }
+ OS_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1set_1grid_1lines_FUNC);
+}
+#endif
+
#ifndef NO__1gtk_1tree_1view_1set_1headers_1visible
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1headers_1visible_FUNC);
gtk_tree_view_set_headers_visible((GtkTreeView *)arg0, (gboolean)arg1);
@@ -14774,7 +14278,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1headers_1visible)
#ifndef NO__1gtk_1tree_1view_1set_1model
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1model)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1model_FUNC);
gtk_tree_view_set_model((GtkTreeView *)arg0, (GtkTreeModel *)arg1);
@@ -14784,7 +14288,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1model)
#ifndef NO__1gtk_1tree_1view_1set_1rules_1hint
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1rules_1hint_FUNC);
gtk_tree_view_set_rules_hint((GtkTreeView *)arg0, arg1);
@@ -14794,7 +14298,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1rules_1hint)
#ifndef NO__1gtk_1tree_1view_1set_1search_1column
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1set_1search_1column_FUNC);
gtk_tree_view_set_search_column((GtkTreeView *)arg0, (gint)arg1);
@@ -14804,7 +14308,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1set_1search_1column)
#ifndef NO__1gtk_1tree_1view_1tree_1to_1widget_1coords
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1tree_1to_1widget_1coords)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
{
jint *lparg3=NULL;
jint *lparg4=NULL;
@@ -14821,7 +14325,7 @@ fail:
#ifndef NO__1gtk_1tree_1view_1unset_1rows_1drag_1dest
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
gtk_tree_view_unset_rows_drag_dest((GtkTreeView *)arg0);
@@ -14831,7 +14335,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1unset_1rows_1drag_1dest)
#ifndef NO__1gtk_1tree_1view_1widget_1to_1tree_1coords
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1tree_1view_1widget_1to_1tree_1coords)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
{
jint *lparg3=NULL;
jint *lparg4=NULL;
@@ -14847,48 +14351,70 @@ fail:
#endif
#ifndef NO__1gtk_1vbox_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vbox_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vbox_1new)
(JNIEnv *env, jclass that, jboolean arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1vbox_1new_FUNC);
- rc = (jint)gtk_vbox_new((gboolean)arg0, (gint)arg1);
+ rc = (jintLong)gtk_vbox_new((gboolean)arg0, (gint)arg1);
OS_NATIVE_EXIT(env, that, _1gtk_1vbox_1new_FUNC);
return rc;
}
#endif
-#ifndef NO__1gtk_1vscale_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscale_1new)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1gtk_1viewport_1get_1shadow_1type
+JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1viewport_1get_1shadow_1type)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1get_1shadow_1type_FUNC);
+ rc = (jint)gtk_viewport_get_shadow_type((GtkViewport *)arg0);
+ OS_NATIVE_EXIT(env, that, _1gtk_1viewport_1get_1shadow_1type_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1gtk_1viewport_1set_1shadow_1type
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1viewport_1set_1shadow_1type)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ OS_NATIVE_ENTER(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
+ gtk_viewport_set_shadow_type((GtkViewport *)arg0, (GtkShadowType)arg1);
+ OS_NATIVE_EXIT(env, that, _1gtk_1viewport_1set_1shadow_1type_FUNC);
+}
+#endif
+
+#ifndef NO__1gtk_1vscale_1new
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vscale_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1vscale_1new_FUNC);
- rc = (jint)gtk_vscale_new((GtkAdjustment *)arg0);
+ rc = (jintLong)gtk_vscale_new((GtkAdjustment *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1vscale_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1vscrollbar_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vscrollbar_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1vscrollbar_1new_FUNC);
- rc = (jint)gtk_vscrollbar_new((GtkAdjustment *)arg0);
+ rc = (jintLong)gtk_vscrollbar_new((GtkAdjustment *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1vscrollbar_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1vseparator_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1vseparator_1new_FUNC);
- rc = (jint)gtk_vseparator_new();
+ rc = (jintLong)gtk_vseparator_new();
OS_NATIVE_EXIT(env, that, _1gtk_1vseparator_1new_FUNC);
return rc;
}
@@ -14896,7 +14422,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1vseparator_1new)
#ifndef NO__1gtk_1widget_1add_1accelerator
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1accelerator)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jint arg4, jint arg5)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1accelerator_FUNC);
@@ -14910,7 +14436,7 @@ fail:
#ifndef NO__1gtk_1widget_1add_1events
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1events)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1add_1events_FUNC);
gtk_widget_add_events((GtkWidget *)arg0, (gint)arg1);
@@ -14920,7 +14446,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1add_1events)
#ifndef NO__1gtk_1widget_1child_1focus
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1child_1focus)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1child_1focus_FUNC);
@@ -14930,37 +14456,59 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1child_1focus)
}
#endif
-#ifndef NO__1gtk_1widget_1create_1pango_1layout__II
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1gtk_1widget_1create_1pango_1layout__II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+#endif
{
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
- rc = (jint)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
+#endif
+ rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__JJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO__1gtk_1widget_1create_1pango_1layout__I_3B
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+#if (!defined(NO__1gtk_1widget_1create_1pango_1layout__I_3B) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1create_1pango_1layout__J_3B) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__I_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#else
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1create_1pango_1layout__J_3B)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+#endif
{
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
+ rc = (jintLong)gtk_widget_create_pango_layout((GtkWidget *)arg0, (const gchar *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__I_3B_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC);
+#endif
return rc;
}
#endif
#ifndef NO__1gtk_1widget_1destroy
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1destroy_FUNC);
gtk_widget_destroy((GtkWidget *)arg0);
@@ -14970,7 +14518,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1destroy)
#ifndef NO__1gtk_1widget_1event
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1event)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1event_FUNC);
@@ -14981,12 +14529,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1event)
#endif
#ifndef NO__1gtk_1widget_1get_1accessible
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1accessible_FUNC);
- rc = (jint)gtk_widget_get_accessible((GtkWidget *)arg0);
+ rc = (jintLong)gtk_widget_get_accessible((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1accessible_FUNC);
return rc;
}
@@ -14994,7 +14542,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1accessible)
#ifndef NO__1gtk_1widget_1get_1child_1visible
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1get_1child_1visible)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1child_1visible_FUNC);
@@ -15017,12 +14565,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1direction)
#endif
#ifndef NO__1gtk_1widget_1get_1default_1style
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
- rc = (jint)gtk_widget_get_default_style();
+ rc = (jintLong)gtk_widget_get_default_style();
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1default_1style_FUNC);
return rc;
}
@@ -15030,7 +14578,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1default_1style)
#ifndef NO__1gtk_1widget_1get_1direction
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1direction)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1direction_FUNC);
@@ -15042,7 +14590,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1direction)
#ifndef NO__1gtk_1widget_1get_1events
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1events_FUNC);
@@ -15053,36 +14601,36 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1events)
#endif
#ifndef NO__1gtk_1widget_1get_1modifier_1style
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1modifier_1style)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
- rc = (jint)gtk_widget_get_modifier_style((GtkWidget *)arg0);
+ rc = (jintLong)gtk_widget_get_modifier_style((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1modifier_1style_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1widget_1get_1pango_1context
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1pango_1context)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
- rc = (jint)gtk_widget_get_pango_context((GtkWidget *)arg0);
+ rc = (jintLong)gtk_widget_get_pango_context((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1pango_1context_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1widget_1get_1parent
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1parent_FUNC);
- rc = (jint)gtk_widget_get_parent((GtkWidget *)arg0);
+ rc = (jintLong)gtk_widget_get_parent((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1parent_FUNC);
return rc;
}
@@ -15090,7 +14638,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1parent)
#ifndef NO__1gtk_1widget_1get_1size_1request
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1get_1size_1request)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -15106,24 +14654,24 @@ fail:
#endif
#ifndef NO__1gtk_1widget_1get_1style
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1style)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1style_FUNC);
- rc = (jint)gtk_widget_get_style((GtkWidget *)arg0);
+ rc = (jintLong)gtk_widget_get_style((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1style_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1widget_1get_1toplevel
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
- rc = (jint)gtk_widget_get_toplevel((GtkWidget *)arg0);
+ rc = (jintLong)gtk_widget_get_toplevel((GtkWidget *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1get_1toplevel_FUNC);
return rc;
}
@@ -15131,7 +14679,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1get_1toplevel)
#ifndef NO__1gtk_1widget_1grab_1focus
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1grab_1focus_FUNC);
gtk_widget_grab_focus((GtkWidget *)arg0);
@@ -15141,7 +14689,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1grab_1focus)
#ifndef NO__1gtk_1widget_1hide
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1hide)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1hide_FUNC);
gtk_widget_hide((GtkWidget *)arg0);
@@ -15151,7 +14699,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1hide)
#ifndef NO__1gtk_1widget_1is_1composited
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1composited_FUNC);
@@ -15159,18 +14707,9 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
rc = (jboolean)gtk_widget_is_composited((GtkWidget *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jboolean (*FPTR)(GtkWidget *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_widget_is_composited_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_widget_is_composited");
- initialized = 1;
- }
- if (fptr) {
- rc = (jboolean)(*fptr)((GtkWidget *)arg0);
+ LOAD_FUNCTION(fp, gtk_widget_is_composited)
+ if (fp) {
+ rc = (jboolean)((jboolean (CALLING_CONVENTION*)(GtkWidget *))fp)((GtkWidget *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1is_1composited_FUNC);
@@ -15180,7 +14719,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1composited)
#ifndef NO__1gtk_1widget_1is_1focus
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1focus)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1is_1focus_FUNC);
@@ -15192,7 +14731,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1is_1focus)
#ifndef NO__1gtk_1widget_1map
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1map)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1map_FUNC);
gtk_widget_map((GtkWidget *)arg0);
@@ -15202,7 +14741,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1map)
#ifndef NO__1gtk_1widget_1mnemonic_1activate
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1mnemonic_1activate)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1mnemonic_1activate_FUNC);
@@ -15214,7 +14753,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1mnemonic_1activate)
#ifndef NO__1gtk_1widget_1modify_1base
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1base)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1base_FUNC);
@@ -15227,7 +14766,7 @@ fail:
#ifndef NO__1gtk_1widget_1modify_1bg
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1bg)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1bg_FUNC);
@@ -15240,7 +14779,7 @@ fail:
#ifndef NO__1gtk_1widget_1modify_1fg
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1fg)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1fg_FUNC);
@@ -15253,7 +14792,7 @@ fail:
#ifndef NO__1gtk_1widget_1modify_1font
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1font)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1font_FUNC);
gtk_widget_modify_font((GtkWidget *)arg0, (PangoFontDescription *)arg1);
@@ -15263,7 +14802,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1font)
#ifndef NO__1gtk_1widget_1modify_1style
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1style)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1style_FUNC);
gtk_widget_modify_style((GtkWidget *)arg0, (GtkRcStyle *)arg1);
@@ -15273,7 +14812,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1style)
#ifndef NO__1gtk_1widget_1modify_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1modify_1text)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
GdkColor _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1modify_1text_FUNC);
@@ -15286,7 +14825,7 @@ fail:
#ifndef NO__1gtk_1widget_1queue_1resize
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1resize)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1queue_1resize_FUNC);
gtk_widget_queue_resize((GtkWidget *)arg0);
@@ -15296,7 +14835,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1queue_1resize)
#ifndef NO__1gtk_1widget_1realize
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1realize)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1realize_FUNC);
gtk_widget_realize((GtkWidget *)arg0);
@@ -15306,7 +14845,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1realize)
#ifndef NO__1gtk_1widget_1remove_1accelerator
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1remove_1accelerator)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1remove_1accelerator_FUNC);
gtk_widget_remove_accelerator((GtkWidget *)arg0, (GtkAccelGroup *)arg1, (guint)arg2, (GdkModifierType)arg3);
@@ -15316,7 +14855,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1remove_1accelerator)
#ifndef NO__1gtk_1widget_1reparent
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1reparent_FUNC);
gtk_widget_reparent((GtkWidget *)arg0, (GtkWidget *)arg1);
@@ -15326,7 +14865,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1reparent)
#ifndef NO__1gtk_1widget_1send_1expose
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1send_1expose)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1send_1expose_FUNC);
@@ -15338,7 +14877,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1widget_1send_1expose)
#ifndef NO__1gtk_1widget_1set_1app_1paintable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1app_1paintable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1app_1paintable_FUNC);
gtk_widget_set_app_paintable((GtkWidget *)arg0, arg1);
@@ -15358,7 +14897,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1default_1direction)
#ifndef NO__1gtk_1widget_1set_1direction
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1direction)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1direction_FUNC);
gtk_widget_set_direction((GtkWidget *)arg0, (GtkTextDirection)arg1);
@@ -15368,7 +14907,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1direction)
#ifndef NO__1gtk_1widget_1set_1double_1buffered
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1double_1buffered_FUNC);
gtk_widget_set_double_buffered((GtkWidget *)arg0, (gboolean)arg1);
@@ -15378,7 +14917,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1double_1buffered)
#ifndef NO__1gtk_1widget_1set_1name
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1name)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1name_FUNC);
@@ -15392,7 +14931,7 @@ fail:
#ifndef NO__1gtk_1widget_1set_1parent_1window
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1parent_1window)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1parent_1window_FUNC);
gtk_widget_set_parent_window((GtkWidget *)arg0, (GdkWindow *)arg1);
@@ -15402,7 +14941,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1parent_1window)
#ifndef NO__1gtk_1widget_1set_1redraw_1on_1allocate
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1redraw_1on_1allocate_FUNC);
gtk_widget_set_redraw_on_allocate((GtkWidget *)arg0, (gboolean)arg1);
@@ -15412,7 +14951,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1redraw_1on_1allocate)
#ifndef NO__1gtk_1widget_1set_1sensitive
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1sensitive)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1sensitive_FUNC);
gtk_widget_set_sensitive((GtkWidget *)arg0, (gboolean)arg1);
@@ -15422,7 +14961,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1sensitive)
#ifndef NO__1gtk_1widget_1set_1size_1request
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1size_1request)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1size_1request_FUNC);
gtk_widget_set_size_request((GtkWidget *)arg0, (gint)arg1, (gint)arg2);
@@ -15432,7 +14971,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1size_1request)
#ifndef NO__1gtk_1widget_1set_1state
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1state)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1state_FUNC);
gtk_widget_set_state((GtkWidget *)arg0, (GtkStateType)arg1);
@@ -15442,7 +14981,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1state)
#ifndef NO__1gtk_1widget_1set_1style
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1style)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1style_FUNC);
gtk_widget_set_style((GtkWidget *)arg0, (GtkStyle *)arg1);
@@ -15452,7 +14991,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1style)
#ifndef NO__1gtk_1widget_1set_1tooltip_1text
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1set_1tooltip_1text_FUNC);
@@ -15461,17 +15000,9 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1set_1tooltip_1text)
gtk_widget_set_tooltip_text((GtkWidget *)arg0, (const gchar *)lparg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkWidget *, const gchar *);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_widget_set_tooltip_text_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_widget_set_tooltip_text");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkWidget *)arg0, (const gchar *)lparg1);
+ LOAD_FUNCTION(fp, gtk_widget_set_tooltip_text)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkWidget *, const gchar *))fp)((GtkWidget *)arg0, (const gchar *)lparg1);
}
}
fail:
@@ -15482,7 +15013,7 @@ fail:
#ifndef NO__1gtk_1widget_1shape_1combine_1mask
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1shape_1combine_1mask)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1shape_1combine_1mask_FUNC);
gtk_widget_shape_combine_mask((GtkWidget *)arg0, (GdkBitmap *)arg1, (gint)arg2, (gint)arg3);
@@ -15492,7 +15023,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1shape_1combine_1mask)
#ifndef NO__1gtk_1widget_1show
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_FUNC);
gtk_widget_show((GtkWidget *)arg0);
@@ -15502,7 +15033,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show)
#ifndef NO__1gtk_1widget_1show_1now
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show_1now)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1show_1now_FUNC);
gtk_widget_show_now((GtkWidget *)arg0);
@@ -15512,7 +15043,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1show_1now)
#ifndef NO__1gtk_1widget_1size_1allocate
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1allocate)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GtkAllocation _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1allocate_FUNC);
@@ -15525,7 +15056,7 @@ fail:
#ifndef NO__1gtk_1widget_1size_1request
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1size_1request)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
{
GtkRequisition _arg1, *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1size_1request_FUNC);
@@ -15537,43 +15068,65 @@ fail:
}
#endif
-#ifndef NO__1gtk_1widget_1style_1get__I_3B_3II
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jintArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3II) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3IJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3II)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintArray arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
jint *lparg2=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC);
+#endif
}
#endif
-#ifndef NO__1gtk_1widget_1style_1get__I_3B_3JI
-JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jlongArray arg2, jint arg3)
+#if (!defined(NO__1gtk_1widget_1style_1get__I_3B_3JI) && !defined(JNI64)) || (!defined(NO__1gtk_1widget_1style_1get__J_3B_3JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__I_3B_3JI)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1style_1get__J_3B_3JJ)(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jlongArray arg2, jintLong arg3)
+#endif
{
jbyte *lparg1=NULL;
jlong *lparg2=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
+#endif
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
gtk_widget_style_get((GtkWidget *)arg0, (const gchar *)lparg1, lparg2, (const gchar *)NULL);
fail:
if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__I_3B_3JI_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC);
+#endif
}
#endif
#ifndef NO__1gtk_1widget_1translate_1coordinates
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1widget_1translate_1coordinates)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
{
jint *lparg4=NULL;
jint *lparg5=NULL;
@@ -15592,7 +15145,7 @@ fail:
#ifndef NO__1gtk_1widget_1unrealize
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1unrealize)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1widget_1unrealize_FUNC);
gtk_widget_unrealize((GtkWidget *)arg0);
@@ -15602,7 +15155,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1widget_1unrealize)
#ifndef NO__1gtk_1window_1activate_1default
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1activate_1default)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1activate_1default_FUNC);
@@ -15614,7 +15167,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1activate_1default)
#ifndef NO__1gtk_1window_1add_1accel_1group
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1add_1accel_1group)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1add_1accel_1group_FUNC);
gtk_window_add_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
@@ -15624,7 +15177,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1add_1accel_1group)
#ifndef NO__1gtk_1window_1deiconify
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1deiconify)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1deiconify_FUNC);
gtk_window_deiconify((GtkWindow *)arg0);
@@ -15634,7 +15187,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1deiconify)
#ifndef NO__1gtk_1window_1fullscreen
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1fullscreen)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1fullscreen_FUNC);
gtk_window_fullscreen((GtkWindow *)arg0);
@@ -15643,39 +15196,30 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1fullscreen)
#endif
#ifndef NO__1gtk_1window_1get_1focus
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1focus)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1focus_FUNC);
- rc = (jint)gtk_window_get_focus((GtkWindow *)arg0);
+ rc = (jintLong)gtk_window_get_focus((GtkWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1focus_FUNC);
return rc;
}
#endif
#ifndef NO__1gtk_1window_1get_1group
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1group_FUNC);
/*
- rc = (jint)gtk_window_get_group((GtkWindow *)arg0);
+ rc = (jintLong)gtk_window_get_group((GtkWindow *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(GtkWindow *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_window_get_group_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_get_group");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((GtkWindow *)arg0);
+ LOAD_FUNCTION(fp, gtk_window_get_group)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1group_FUNC);
@@ -15684,12 +15228,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1group)
#endif
#ifndef NO__1gtk_1window_1get_1icon_1list
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
- rc = (jint)gtk_window_get_icon_list((GtkWindow *)arg0);
+ rc = (jintLong)gtk_window_get_icon_list((GtkWindow *)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1icon_1list_FUNC);
return rc;
}
@@ -15697,7 +15241,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1icon_1list)
#ifndef NO__1gtk_1window_1get_1mnemonic_1modifier
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1mnemonic_1modifier_FUNC);
@@ -15709,7 +15253,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1get_1mnemonic_1modifier)
#ifndef NO__1gtk_1window_1get_1modal
JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1get_1modal)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1modal_FUNC);
@@ -15721,7 +15265,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1gtk_1window_1get_1modal)
#ifndef NO__1gtk_1window_1get_1opacity
JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jdouble rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1get_1opacity_FUNC);
@@ -15729,18 +15273,9 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
rc = (jdouble)gtk_window_get_opacity((GtkWindow *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jdouble (*FPTR)(GtkWindow *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_window_get_opacity_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_get_opacity");
- initialized = 1;
- }
- if (fptr) {
- rc = (jdouble)(*fptr)((GtkWindow *)arg0);
+ LOAD_FUNCTION(fp, gtk_window_get_opacity)
+ if (fp) {
+ rc = (jdouble)((jdouble (CALLING_CONVENTION*)(GtkWindow *))fp)((GtkWindow *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1window_1get_1opacity_FUNC);
@@ -15750,7 +15285,7 @@ JNIEXPORT jdouble JNICALL OS_NATIVE(_1gtk_1window_1get_1opacity)
#ifndef NO__1gtk_1window_1get_1position
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1position)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -15767,7 +15302,7 @@ fail:
#ifndef NO__1gtk_1window_1get_1size
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1get_1size)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -15784,7 +15319,7 @@ fail:
#ifndef NO__1gtk_1window_1group_1add_1window
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1add_1window)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1add_1window_FUNC);
gtk_window_group_add_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
@@ -15793,12 +15328,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1add_1window)
#endif
#ifndef NO__1gtk_1window_1group_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1new_FUNC);
- rc = (jint)gtk_window_group_new();
+ rc = (jintLong)gtk_window_group_new();
OS_NATIVE_EXIT(env, that, _1gtk_1window_1group_1new_FUNC);
return rc;
}
@@ -15806,7 +15341,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1group_1new)
#ifndef NO__1gtk_1window_1group_1remove_1window
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1remove_1window)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1group_1remove_1window_FUNC);
gtk_window_group_remove_window((GtkWindowGroup*)arg0, (GtkWindow*)arg1);
@@ -15816,7 +15351,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1group_1remove_1window)
#ifndef NO__1gtk_1window_1iconify
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1iconify)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1iconify_FUNC);
gtk_window_iconify((GtkWindow *)arg0);
@@ -15825,12 +15360,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1iconify)
#endif
#ifndef NO__1gtk_1window_1list_1toplevels
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1list_1toplevels_FUNC);
- rc = (jint)gtk_window_list_toplevels();
+ rc = (jintLong)gtk_window_list_toplevels();
OS_NATIVE_EXIT(env, that, _1gtk_1window_1list_1toplevels_FUNC);
return rc;
}
@@ -15838,7 +15373,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1list_1toplevels)
#ifndef NO__1gtk_1window_1maximize
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1maximize)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1maximize_FUNC);
gtk_window_maximize((GtkWindow *)arg0);
@@ -15848,7 +15383,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1maximize)
#ifndef NO__1gtk_1window_1move
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1move)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1move_FUNC);
gtk_window_move((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
@@ -15857,12 +15392,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1move)
#endif
#ifndef NO__1gtk_1window_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1window_1new)
(JNIEnv *env, jclass that, jint arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC);
- rc = (jint)gtk_window_new((GtkWindowType)arg0);
+ rc = (jintLong)gtk_window_new((GtkWindowType)arg0);
OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
return rc;
}
@@ -15870,7 +15405,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1window_1new)
#ifndef NO__1gtk_1window_1present
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1present)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1present_FUNC);
gtk_window_present((GtkWindow *)arg0);
@@ -15880,7 +15415,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1present)
#ifndef NO__1gtk_1window_1remove_1accel_1group
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1remove_1accel_1group)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1remove_1accel_1group_FUNC);
gtk_window_remove_accel_group((GtkWindow *)arg0, (GtkAccelGroup *)arg1);
@@ -15890,7 +15425,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1remove_1accel_1group)
#ifndef NO__1gtk_1window_1resize
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1resize)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1resize_FUNC);
gtk_window_resize((GtkWindow *)arg0, (gint)arg1, (gint)arg2);
@@ -15900,7 +15435,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1resize)
#ifndef NO__1gtk_1window_1set_1default
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1default)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1default_FUNC);
gtk_window_set_default((GtkWindow *)arg0, (GtkWidget *)arg1);
@@ -15910,7 +15445,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1default)
#ifndef NO__1gtk_1window_1set_1destroy_1with_1parent
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1destroy_1with_1parent_FUNC);
gtk_window_set_destroy_with_parent((GtkWindow *)arg0, (gboolean)arg1);
@@ -15920,7 +15455,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1destroy_1with_1parent)
#ifndef NO__1gtk_1window_1set_1geometry_1hints
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1geometry_1hints)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jint arg3)
{
GdkGeometry _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1geometry_1hints_FUNC);
@@ -15933,7 +15468,7 @@ fail:
#ifndef NO__1gtk_1window_1set_1icon_1list
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1icon_1list)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1icon_1list_FUNC);
gtk_window_set_icon_list((GtkWindow *)arg0, (GList *)arg1);
@@ -15943,24 +15478,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1icon_1list)
#ifndef NO__1gtk_1window_1set_1keep_1below
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1keep_1below_FUNC);
/*
gtk_window_set_keep_below((GtkWindow *)arg0, (gboolean)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkWindow *, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_window_set_keep_below_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_set_keep_below");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkWindow *)arg0, (gboolean)arg1);
+ LOAD_FUNCTION(fp, gtk_window_set_keep_below)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1keep_1below_FUNC);
@@ -15969,7 +15496,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1keep_1below)
#ifndef NO__1gtk_1window_1set_1modal
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1modal)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1modal_FUNC);
gtk_window_set_modal((GtkWindow *)arg0, (gboolean)arg1);
@@ -15979,24 +15506,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1modal)
#ifndef NO__1gtk_1window_1set_1opacity
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1opacity_FUNC);
/*
gtk_window_set_opacity((GtkWindow *)arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkWindow *, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_window_set_opacity_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_set_opacity");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkWindow *)arg0, arg1);
+ LOAD_FUNCTION(fp, gtk_window_set_opacity)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkWindow *, jdouble))fp)((GtkWindow *)arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1opacity_FUNC);
@@ -16005,7 +15524,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1opacity)
#ifndef NO__1gtk_1window_1set_1resizable
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1resizable)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1resizable_FUNC);
gtk_window_set_resizable((GtkWindow *)arg0, (gboolean)arg1);
@@ -16015,24 +15534,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1resizable)
#ifndef NO__1gtk_1window_1set_1skip_1taskbar_1hint
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
/*
gtk_window_set_skip_taskbar_hint((GtkWindow *)arg0, (gboolean)arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(GtkWindow *, gboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(gtk_window_set_skip_taskbar_hint_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "gtk_window_set_skip_taskbar_hint");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((GtkWindow *)arg0, (gboolean)arg1);
+ LOAD_FUNCTION(fp, gtk_window_set_skip_taskbar_hint)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(GtkWindow *, gboolean))fp)((GtkWindow *)arg0, (gboolean)arg1);
}
}
OS_NATIVE_EXIT(env, that, _1gtk_1window_1set_1skip_1taskbar_1hint_FUNC);
@@ -16041,7 +15552,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1skip_1taskbar_1hint)
#ifndef NO__1gtk_1window_1set_1title
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1title)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1title_FUNC);
@@ -16055,7 +15566,7 @@ fail:
#ifndef NO__1gtk_1window_1set_1transient_1for
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1transient_1for)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1transient_1for_FUNC);
gtk_window_set_transient_for((GtkWindow *)arg0, (GtkWindow *)arg1);
@@ -16065,7 +15576,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1transient_1for)
#ifndef NO__1gtk_1window_1set_1type_1hint
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1type_1hint)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1set_1type_1hint_FUNC);
gtk_window_set_type_hint((GtkWindow *)arg0, arg1);
@@ -16075,7 +15586,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1set_1type_1hint)
#ifndef NO__1gtk_1window_1unfullscreen
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unfullscreen)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1unfullscreen_FUNC);
gtk_window_unfullscreen((GtkWindow *)arg0);
@@ -16085,7 +15596,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unfullscreen)
#ifndef NO__1gtk_1window_1unmaximize
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unmaximize)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1gtk_1window_1unmaximize_FUNC);
gtk_window_unmaximize((GtkWindow *)arg0);
@@ -16094,36 +15605,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1window_1unmaximize)
#endif
#ifndef NO__1pango_1attr_1background_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1background_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1background_1new)
(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1background_1new_FUNC);
- rc = (jint)pango_attr_background_new(arg0, arg1, arg2);
+ rc = (jintLong)pango_attr_background_new(arg0, arg1, arg2);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1background_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1attr_1font_1desc_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1font_1desc_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1font_1desc_1new_FUNC);
- rc = (jint)pango_attr_font_desc_new((const PangoFontDescription *)arg0);
+ rc = (jintLong)pango_attr_font_desc_new((const PangoFontDescription *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1font_1desc_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1attr_1foreground_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1foreground_1new_FUNC);
- rc = (jint)pango_attr_foreground_new(arg0, arg1, arg2);
+ rc = (jintLong)pango_attr_foreground_new(arg0, arg1, arg2);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1foreground_1new_FUNC);
return rc;
}
@@ -16131,7 +15642,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1foreground_1new)
#ifndef NO__1pango_1attr_1iterator_1destroy
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1destroy_FUNC);
pango_attr_iterator_destroy((PangoAttrIterator *)arg0);
@@ -16140,24 +15651,24 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1destroy)
#endif
#ifndef NO__1pango_1attr_1iterator_1get
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_FUNC);
- rc = (jint)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1);
+ rc = (jintLong)pango_attr_iterator_get((PangoAttrIterator *)arg0, (PangoAttrType)arg1);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1attr_1iterator_1get_1attrs
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1get_1attrs_FUNC);
- rc = (jint)pango_attr_iterator_get_attrs((PangoAttrIterator *)arg0);
+ rc = (jintLong)pango_attr_iterator_get_attrs((PangoAttrIterator *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1iterator_1get_1attrs_FUNC);
return rc;
}
@@ -16165,7 +15676,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1iterator_1get_1attrs)
#ifndef NO__1pango_1attr_1iterator_1next
JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1iterator_1next_FUNC);
@@ -16177,7 +15688,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1attr_1iterator_1next)
#ifndef NO__1pango_1attr_1iterator_1range
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1iterator_1range)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -16194,7 +15705,7 @@ fail:
#ifndef NO__1pango_1attr_1list_1change
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1change)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1change_FUNC);
pango_attr_list_change((PangoAttrList *)arg0, (PangoAttribute *)arg1);
@@ -16203,12 +15714,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1change)
#endif
#ifndef NO__1pango_1attr_1list_1get_1iterator
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1get_1iterator_FUNC);
- rc = (jint)pango_attr_list_get_iterator((PangoAttrList *)arg0);
+ rc = (jintLong)pango_attr_list_get_iterator((PangoAttrList *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1get_1iterator_FUNC);
return rc;
}
@@ -16216,7 +15727,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1get_1iterator)
#ifndef NO__1pango_1attr_1list_1insert
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1insert_FUNC);
pango_attr_list_insert((PangoAttrList *)arg0, (PangoAttribute *)arg1);
@@ -16225,12 +15736,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1insert)
#endif
#ifndef NO__1pango_1attr_1list_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1new_FUNC);
- rc = (jint)pango_attr_list_new();
+ rc = (jintLong)pango_attr_list_new();
OS_NATIVE_EXIT(env, that, _1pango_1attr_1list_1new_FUNC);
return rc;
}
@@ -16238,7 +15749,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1list_1new)
#ifndef NO__1pango_1attr_1list_1unref
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1attr_1list_1unref_FUNC);
pango_attr_list_unref((PangoAttrList *)arg0);
@@ -16247,28 +15758,28 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1attr_1list_1unref)
#endif
#ifndef NO__1pango_1attr_1rise_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1rise_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1rise_1new)
(JNIEnv *env, jclass that, jint arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1rise_1new_FUNC);
- rc = (jint)pango_attr_rise_new(arg0);
+ rc = (jintLong)pango_attr_rise_new(arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1rise_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1attr_1shape_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1shape_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1shape_1new)
(JNIEnv *env, jclass that, jobject arg0, jobject arg1)
{
PangoRectangle _arg0, *lparg0=NULL;
PangoRectangle _arg1, *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1shape_1new_FUNC);
if (arg0) if ((lparg0 = getPangoRectangleFields(env, arg0, &_arg0)) == NULL) goto fail;
if (arg1) if ((lparg1 = getPangoRectangleFields(env, arg1, &_arg1)) == NULL) goto fail;
- rc = (jint)pango_attr_shape_new(lparg0, lparg1);
+ rc = (jintLong)pango_attr_shape_new(lparg0, lparg1);
fail:
OS_NATIVE_EXIT(env, that, _1pango_1attr_1shape_1new_FUNC);
return rc;
@@ -16276,27 +15787,18 @@ fail:
#endif
#ifndef NO__1pango_1attr_1strikethrough_1color_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC);
/*
- rc = (jint)pango_attr_strikethrough_color_new(arg0, arg1, arg2);
+ rc = (jintLong)pango_attr_strikethrough_color_new(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jshort, jshort, jshort);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_attr_strikethrough_color_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_attr_strikethrough_color_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, pango_attr_strikethrough_color_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1color_1new_FUNC);
@@ -16305,39 +15807,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1color_1new)
#endif
#ifndef NO__1pango_1attr_1strikethrough_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1strikethrough_1new)
(JNIEnv *env, jclass that, jboolean arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1strikethrough_1new_FUNC);
- rc = (jint)pango_attr_strikethrough_new(arg0);
+ rc = (jintLong)pango_attr_strikethrough_new(arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1strikethrough_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1attr_1underline_1color_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
(JNIEnv *env, jclass that, jshort arg0, jshort arg1, jshort arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1color_1new_FUNC);
/*
- rc = (jint)pango_attr_underline_color_new(arg0, arg1, arg2);
+ rc = (jintLong)pango_attr_underline_color_new(arg0, arg1, arg2);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jshort, jshort, jshort);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_attr_underline_color_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_attr_underline_color_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0, arg1, arg2);
+ LOAD_FUNCTION(fp, pango_attr_underline_color_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jshort, jshort, jshort))fp)(arg0, arg1, arg2);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1color_1new_FUNC);
@@ -16346,51 +15839,42 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1color_1new)
#endif
#ifndef NO__1pango_1attr_1underline_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1underline_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1underline_1new)
(JNIEnv *env, jclass that, jint arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1underline_1new_FUNC);
- rc = (jint)pango_attr_underline_new(arg0);
+ rc = (jintLong)pango_attr_underline_new(arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1underline_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1attr_1weight_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1attr_1weight_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1attr_1weight_1new)
(JNIEnv *env, jclass that, jint arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1attr_1weight_1new_FUNC);
- rc = (jint)pango_attr_weight_new(arg0);
+ rc = (jintLong)pango_attr_weight_new(arg0);
OS_NATIVE_EXIT(env, that, _1pango_1attr_1weight_1new_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1cairo_1context_1get_1font_1options
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC);
/*
- rc = (jint)pango_cairo_context_get_font_options((PangoContext *)arg0);
+ rc = (jintLong)pango_cairo_context_get_font_options((PangoContext *)arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(PangoContext *);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_context_get_font_options_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_context_get_font_options");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)((PangoContext *)arg0);
+ LOAD_FUNCTION(fp, pango_cairo_context_get_font_options)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PangoContext *))fp)((PangoContext *)arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1context_1get_1font_1options_FUNC);
@@ -16400,24 +15884,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1context_1get_1font_1options)
#ifndef NO__1pango_1cairo_1context_1set_1font_1options
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1context_1set_1font_1options_FUNC);
/*
pango_cairo_context_set_font_options((PangoContext *)arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(PangoContext *, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_context_set_font_options_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_context_set_font_options");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)((PangoContext *)arg0, arg1);
+ LOAD_FUNCTION(fp, pango_cairo_context_set_font_options)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1context_1set_1font_1options_FUNC);
@@ -16425,27 +15901,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1context_1set_1font_1options)
#endif
#ifndef NO__1pango_1cairo_1create_1layout
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1create_1layout_FUNC);
/*
- rc = (jint)pango_cairo_create_layout(arg0);
+ rc = (jintLong)pango_cairo_create_layout(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_create_layout_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_create_layout");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, pango_cairo_create_layout)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1create_1layout_FUNC);
@@ -16454,27 +15921,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1create_1layout)
#endif
#ifndef NO__1pango_1cairo_1font_1map_1create_1context
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1create_1context_FUNC);
/*
- rc = (jint)pango_cairo_font_map_create_context(arg0);
+ rc = (jintLong)pango_cairo_font_map_create_context(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_font_map_create_context_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_create_context");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, pango_cairo_font_map_create_context)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1create_1context_FUNC);
@@ -16483,27 +15941,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1create_1context)
#endif
#ifndef NO__1pango_1cairo_1font_1map_1get_1default
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC);
/*
- rc = (jint)pango_cairo_font_map_get_default();
+ rc = (jintLong)pango_cairo_font_map_get_default();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_font_map_get_default_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_get_default");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, pango_cairo_font_map_get_default)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1get_1default_FUNC);
@@ -16512,27 +15961,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1get_1default)
#endif
#ifndef NO__1pango_1cairo_1font_1map_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1new_FUNC);
/*
- rc = (jint)pango_cairo_font_map_new();
+ rc = (jintLong)pango_cairo_font_map_new();
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)();
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_font_map_new_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_new");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)();
+ LOAD_FUNCTION(fp, pango_cairo_font_map_new)
+ if (fp) {
+ rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1new_FUNC);
@@ -16542,24 +15982,16 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1new)
#ifndef NO__1pango_1cairo_1font_1map_1set_1resolution
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution)
- (JNIEnv *env, jclass that, jint arg0, jdouble arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1font_1map_1set_1resolution_FUNC);
/*
pango_cairo_font_map_set_resolution(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jdouble);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_font_map_set_resolution_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_font_map_set_resolution");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, pango_cairo_font_map_set_resolution)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1font_1map_1set_1resolution_FUNC);
@@ -16568,24 +16000,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1font_1map_1set_1resolution)
#ifndef NO__1pango_1cairo_1layout_1path
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1layout_1path_FUNC);
/*
pango_cairo_layout_path(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_layout_path_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_layout_path");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, pango_cairo_layout_path)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1layout_1path_FUNC);
@@ -16594,24 +16018,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1layout_1path)
#ifndef NO__1pango_1cairo_1show_1layout
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1cairo_1show_1layout_FUNC);
/*
pango_cairo_show_layout(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jint);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_cairo_show_layout_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_cairo_show_layout");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, pango_cairo_show_layout)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1cairo_1show_1layout_FUNC);
@@ -16620,7 +16036,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1cairo_1show_1layout)
#ifndef NO__1pango_1context_1get_1base_1dir
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1base_1dir_FUNC);
@@ -16631,24 +16047,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1base_1dir)
#endif
#ifndef NO__1pango_1context_1get_1language
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1language)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1language)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1language_FUNC);
- rc = (jint)pango_context_get_language((PangoContext *)arg0);
+ rc = (jintLong)pango_context_get_language((PangoContext *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1language_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1context_1get_1metrics
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1context_1get_1metrics_FUNC);
- rc = (jint)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2);
+ rc = (jintLong)pango_context_get_metrics((PangoContext *)arg0, (const PangoFontDescription *)arg1, (PangoLanguage *)arg2);
OS_NATIVE_EXIT(env, that, _1pango_1context_1get_1metrics_FUNC);
return rc;
}
@@ -16656,24 +16072,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
#ifndef NO__1pango_1context_1list_1families
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1list_1families)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jint *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1context_1list_1families_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
pango_context_list_families((PangoContext *)arg0, (PangoFontFamily ***)lparg1, (int *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1pango_1context_1list_1families_FUNC);
}
#endif
#ifndef NO__1pango_1context_1set_1base_1dir
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1base_1dir_FUNC);
pango_context_set_base_dir((PangoContext *)arg0, arg1);
@@ -16683,7 +16099,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1base_1dir)
#ifndef NO__1pango_1context_1set_1language
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1context_1set_1language_FUNC);
pango_context_set_language((PangoContext *)arg0, (PangoLanguage *)arg1);
@@ -16692,12 +16108,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1set_1language)
#endif
#ifndef NO__1pango_1font_1description_1copy
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1copy_FUNC);
- rc = (jint)pango_font_description_copy((PangoFontDescription *)arg0);
+ rc = (jintLong)pango_font_description_copy((PangoFontDescription *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1copy_FUNC);
return rc;
}
@@ -16705,7 +16121,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1copy)
#ifndef NO__1pango_1font_1description_1free
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1free_FUNC);
pango_font_description_free((PangoFontDescription *)arg0);
@@ -16714,11 +16130,11 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1free)
#endif
#ifndef NO__1pango_1font_1description_1from_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1from_1string_FUNC);
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -16728,7 +16144,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1from_1string)
{
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
}
- rc = (jint)pango_font_description_from_string((const char *)lparg0);
+ rc = (jintLong)pango_font_description_from_string((const char *)lparg0);
fail:
#ifdef JNI_VERSION_1_2
if (IS_JNI_1_2) {
@@ -16744,12 +16160,12 @@ fail:
#endif
#ifndef NO__1pango_1font_1description_1get_1family
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1family_FUNC);
- rc = (jint)pango_font_description_get_family((PangoFontDescription *)arg0);
+ rc = (jintLong)pango_font_description_get_family((PangoFontDescription *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1get_1family_FUNC);
return rc;
}
@@ -16757,7 +16173,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1family)
#ifndef NO__1pango_1font_1description_1get_1size
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1size_FUNC);
@@ -16769,7 +16185,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1size)
#ifndef NO__1pango_1font_1description_1get_1style
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1style_FUNC);
@@ -16781,7 +16197,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1style)
#ifndef NO__1pango_1font_1description_1get_1weight
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1get_1weight_FUNC);
@@ -16792,12 +16208,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1get_1weight)
#endif
#ifndef NO__1pango_1font_1description_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1new)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1new_FUNC);
- rc = (jint)pango_font_description_new();
+ rc = (jintLong)pango_font_description_new();
OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1new_FUNC);
return rc;
}
@@ -16805,7 +16221,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1new)
#ifndef NO__1pango_1font_1description_1set_1family
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1family)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1family_FUNC);
@@ -16833,7 +16249,7 @@ fail:
#ifndef NO__1pango_1font_1description_1set_1size
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1size_FUNC);
pango_font_description_set_size((PangoFontDescription *)arg0, (gint)arg1);
@@ -16843,7 +16259,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1size)
#ifndef NO__1pango_1font_1description_1set_1stretch
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1stretch_FUNC);
pango_font_description_set_stretch((PangoFontDescription *)arg0, (PangoStretch)arg1);
@@ -16853,7 +16269,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1stretch)
#ifndef NO__1pango_1font_1description_1set_1style
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1style_FUNC);
pango_font_description_set_style((PangoFontDescription *)arg0, (PangoStyle)arg1);
@@ -16863,7 +16279,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1style)
#ifndef NO__1pango_1font_1description_1set_1weight
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1set_1weight_FUNC);
pango_font_description_set_weight((PangoFontDescription *)arg0, (PangoWeight)arg1);
@@ -16872,36 +16288,36 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1description_1set_1weight)
#endif
#ifndef NO__1pango_1font_1description_1to_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1description_1to_1string)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1description_1to_1string_FUNC);
- rc = (jint)pango_font_description_to_string((PangoFontDescription *)arg0);
+ rc = (jintLong)pango_font_description_to_string((PangoFontDescription *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1font_1description_1to_1string_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1font_1face_1describe
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1face_1describe)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1face_1describe)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1face_1describe_FUNC);
- rc = (jint)pango_font_face_describe((PangoFontFace *)arg0);
+ rc = (jintLong)pango_font_face_describe((PangoFontFace *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1font_1face_1describe_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1font_1family_1get_1name
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1get_1name_FUNC);
- rc = (jint)pango_font_family_get_name((PangoFontFamily *)arg0);
+ rc = (jintLong)pango_font_family_get_name((PangoFontFamily *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1get_1name_FUNC);
return rc;
}
@@ -16909,28 +16325,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
#ifndef NO__1pango_1font_1family_1list_1faces
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1family_1list_1faces)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jint *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1list_1faces_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
pango_font_family_list_faces((PangoFontFamily *)arg0, (PangoFontFace ***)lparg1, (int *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1list_1faces_FUNC);
}
#endif
#ifndef NO__1pango_1font_1get_1metrics
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1get_1metrics_FUNC);
- rc = (jint)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
+ rc = (jintLong)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
OS_NATIVE_EXIT(env, that, _1pango_1font_1get_1metrics_FUNC);
return rc;
}
@@ -16938,7 +16354,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1get_1metrics)
#ifndef NO__1pango_1font_1metrics_1get_1approximate_1char_1width
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1approximate_1char_1width_FUNC);
@@ -16950,7 +16366,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1approximate_1char_
#ifndef NO__1pango_1font_1metrics_1get_1ascent
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1ascent_FUNC);
@@ -16962,7 +16378,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1ascent)
#ifndef NO__1pango_1font_1metrics_1get_1descent
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1descent_FUNC);
@@ -16974,7 +16390,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1descent)
#ifndef NO__1pango_1font_1metrics_1get_1strikethrough_1position
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1position)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1strikethrough_1position_FUNC);
@@ -16982,18 +16398,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1pos
rc = (jint)pango_font_metrics_get_strikethrough_position(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_font_metrics_get_strikethrough_position_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_strikethrough_position");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_position)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1strikethrough_1position_FUNC);
@@ -17003,7 +16410,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1pos
#ifndef NO__1pango_1font_1metrics_1get_1strikethrough_1thickness
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thickness)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1strikethrough_1thickness_FUNC);
@@ -17011,18 +16418,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thi
rc = (jint)pango_font_metrics_get_strikethrough_thickness(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_font_metrics_get_strikethrough_thickness_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_strikethrough_thickness");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, pango_font_metrics_get_strikethrough_thickness)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1strikethrough_1thickness_FUNC);
@@ -17032,7 +16430,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1strikethrough_1thi
#ifndef NO__1pango_1font_1metrics_1get_1underline_1position
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1position)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1underline_1position_FUNC);
@@ -17040,18 +16438,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1positio
rc = (jint)pango_font_metrics_get_underline_position(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_font_metrics_get_underline_position_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_underline_position");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, pango_font_metrics_get_underline_position)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1underline_1position_FUNC);
@@ -17061,7 +16450,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1positio
#ifndef NO__1pango_1font_1metrics_1get_1underline_1thickness
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickness)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1get_1underline_1thickness_FUNC);
@@ -17069,18 +16458,9 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickne
rc = (jint)pango_font_metrics_get_underline_thickness(arg0);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef jint (*FPTR)(jint);
- static FPTR fptr;
- rc = 0;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_font_metrics_get_underline_thickness_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_font_metrics_get_underline_thickness");
- initialized = 1;
- }
- if (fptr) {
- rc = (jint)(*fptr)(arg0);
+ LOAD_FUNCTION(fp, pango_font_metrics_get_underline_thickness)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1font_1metrics_1get_1underline_1thickness_FUNC);
@@ -17090,7 +16470,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1font_1metrics_1get_1underline_1thickne
#ifndef NO__1pango_1font_1metrics_1unref
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1font_1metrics_1unref_FUNC);
pango_font_metrics_unref((PangoFontMetrics *)arg0);
@@ -17099,14 +16479,14 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1metrics_1unref)
#endif
#ifndef NO__1pango_1language_1from_1string
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1language_1from_1string)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1language_1from_1string)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1language_1from_1string_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
- rc = (jint)pango_language_from_string((const char *)lparg0);
+ rc = (jintLong)pango_language_from_string((const char *)lparg0);
fail:
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
OS_NATIVE_EXIT(env, that, _1pango_1language_1from_1string_FUNC);
@@ -17116,7 +16496,7 @@ fail:
#ifndef NO__1pango_1layout_1context_1changed
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1context_1changed_FUNC);
pango_layout_context_changed((PangoLayout *)arg0);
@@ -17126,7 +16506,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1context_1changed)
#ifndef NO__1pango_1layout_1get_1alignment
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1alignment_FUNC);
@@ -17137,24 +16517,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1alignment)
#endif
#ifndef NO__1pango_1layout_1get_1attributes
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1attributes_FUNC);
- rc = (jint)pango_layout_get_attributes((PangoLayout *)arg0);
+ rc = (jintLong)pango_layout_get_attributes((PangoLayout *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1attributes_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1layout_1get_1context
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1context_FUNC);
- rc = (jint)pango_layout_get_context((PangoLayout *)arg0);
+ rc = (jintLong)pango_layout_get_context((PangoLayout *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1context_FUNC);
return rc;
}
@@ -17162,7 +16542,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
#ifndef NO__1pango_1layout_1get_1indent
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1indent_FUNC);
@@ -17173,12 +16553,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent)
#endif
#ifndef NO__1pango_1layout_1get_1iter
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1iter_FUNC);
- rc = (jint)pango_layout_get_iter((PangoLayout*)arg0);
+ rc = (jintLong)pango_layout_get_iter((PangoLayout*)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1iter_FUNC);
return rc;
}
@@ -17186,7 +16566,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1iter)
#ifndef NO__1pango_1layout_1get_1justify
JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1justify_FUNC);
@@ -17197,12 +16577,12 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1get_1justify)
#endif
#ifndef NO__1pango_1layout_1get_1line
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_FUNC);
- rc = (jint)pango_layout_get_line((PangoLayout *)arg0, arg1);
+ rc = (jintLong)pango_layout_get_line((PangoLayout *)arg0, arg1);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1line_FUNC);
return rc;
}
@@ -17210,7 +16590,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line)
#ifndef NO__1pango_1layout_1get_1line_1count
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1line_1count_FUNC);
@@ -17222,24 +16602,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count)
#ifndef NO__1pango_1layout_1get_1log_1attrs
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1log_1attrs)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintArray arg2)
{
- jint *lparg1=NULL;
+ jintLong *lparg1=NULL;
jint *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
- if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
pango_layout_get_log_attrs((PangoLayout*)arg0, (PangoLogAttr **)lparg1, (int *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
}
#endif
#ifndef NO__1pango_1layout_1get_1size
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1size)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
{
jint *lparg1=NULL;
jint *lparg2=NULL;
@@ -17256,7 +16636,7 @@ fail:
#ifndef NO__1pango_1layout_1get_1spacing
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1spacing_FUNC);
@@ -17267,24 +16647,24 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1spacing)
#endif
#ifndef NO__1pango_1layout_1get_1tabs
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1tabs)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1tabs)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1tabs_FUNC);
- rc = (jint)pango_layout_get_tabs((PangoLayout*)arg0);
+ rc = (jintLong)pango_layout_get_tabs((PangoLayout*)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1tabs_FUNC);
return rc;
}
#endif
#ifndef NO__1pango_1layout_1get_1text
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1text_FUNC);
- rc = (jint)pango_layout_get_text((PangoLayout *)arg0);
+ rc = (jintLong)pango_layout_get_text((PangoLayout *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1text_FUNC);
return rc;
}
@@ -17292,7 +16672,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1text)
#ifndef NO__1pango_1layout_1get_1width
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1width_FUNC);
@@ -17304,7 +16684,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1width)
#ifndef NO__1pango_1layout_1index_1to_1pos
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1index_1to_1pos)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
{
PangoRectangle _arg2, *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1index_1to_1pos_FUNC);
@@ -17318,7 +16698,7 @@ fail:
#ifndef NO__1pango_1layout_1iter_1free
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1free_FUNC);
pango_layout_iter_free((PangoLayoutIter*)arg0);
@@ -17328,7 +16708,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1free)
#ifndef NO__1pango_1layout_1iter_1get_1index
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1index_FUNC);
@@ -17340,7 +16720,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1index)
#ifndef NO__1pango_1layout_1iter_1get_1line_1extents
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1line_1extents)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2)
{
PangoRectangle _arg1, *lparg1=NULL;
PangoRectangle _arg2, *lparg2=NULL;
@@ -17356,12 +16736,12 @@ fail:
#endif
#ifndef NO__1pango_1layout_1iter_1get_1run
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1get_1run_FUNC);
- rc = (jint)pango_layout_iter_get_run((PangoLayoutIter*)arg0);
+ rc = (jintLong)pango_layout_iter_get_run((PangoLayoutIter*)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1iter_1get_1run_FUNC);
return rc;
}
@@ -17369,7 +16749,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1iter_1get_1run)
#ifndef NO__1pango_1layout_1iter_1next_1line
JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1line_FUNC);
@@ -17381,7 +16761,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1line)
#ifndef NO__1pango_1layout_1iter_1next_1run
JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jboolean rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1iter_1next_1run_FUNC);
@@ -17393,7 +16773,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1iter_1next_1run)
#ifndef NO__1pango_1layout_1line_1get_1extents
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1line_1get_1extents)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jobject arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jobject arg2)
{
PangoRectangle _arg1, *lparg1=NULL;
PangoRectangle _arg2, *lparg2=NULL;
@@ -17410,7 +16790,7 @@ fail:
#ifndef NO__1pango_1layout_1line_1x_1to_1index
JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1line_1x_1to_1index)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2, jintArray arg3)
{
jint *lparg2=NULL;
jint *lparg3=NULL;
@@ -17428,12 +16808,12 @@ fail:
#endif
#ifndef NO__1pango_1layout_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1new)
- (JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1layout_1new)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1new_FUNC);
- rc = (jint)pango_layout_new((PangoContext *)arg0);
+ rc = (jintLong)pango_layout_new((PangoContext *)arg0);
OS_NATIVE_EXIT(env, that, _1pango_1layout_1new_FUNC);
return rc;
}
@@ -17441,7 +16821,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1new)
#ifndef NO__1pango_1layout_1set_1alignment
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1alignment_FUNC);
pango_layout_set_alignment((PangoLayout *)arg0, arg1);
@@ -17451,7 +16831,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1alignment)
#ifndef NO__1pango_1layout_1set_1attributes
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1attributes_FUNC);
pango_layout_set_attributes((PangoLayout *)arg0, (PangoAttrList *)arg1);
@@ -17461,24 +16841,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes)
#ifndef NO__1pango_1layout_1set_1auto_1dir
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
/*
pango_layout_set_auto_dir(arg0, arg1);
*/
{
- static int initialized = 0;
- static void *handle = NULL;
- typedef void (*FPTR)(jint, jboolean);
- static FPTR fptr;
- if (!initialized) {
- if (!handle) handle = dlopen(pango_layout_set_auto_dir_LIB, RTLD_LAZY);
- if (handle) fptr = (FPTR)dlsym(handle, "pango_layout_set_auto_dir");
- initialized = 1;
- }
- if (fptr) {
- (*fptr)(arg0, arg1);
+ LOAD_FUNCTION(fp, pango_layout_set_auto_dir)
+ if (fp) {
+ ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1);
}
}
OS_NATIVE_EXIT(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
@@ -17487,7 +16859,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir)
#ifndef NO__1pango_1layout_1set_1font_1description
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1font_1description_FUNC);
pango_layout_set_font_description((PangoLayout *)arg0, (PangoFontDescription *)arg1);
@@ -17497,7 +16869,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description)
#ifndef NO__1pango_1layout_1set_1indent
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1indent_FUNC);
pango_layout_set_indent((PangoLayout*)arg0, arg1);
@@ -17507,7 +16879,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1indent)
#ifndef NO__1pango_1layout_1set_1justify
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1justify_FUNC);
pango_layout_set_justify((PangoLayout*)arg0, arg1);
@@ -17517,7 +16889,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1justify)
#ifndef NO__1pango_1layout_1set_1single_1paragraph_1mode
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1single_1paragraph_1mode_FUNC);
pango_layout_set_single_paragraph_mode((PangoLayout *)arg0, (gboolean)arg1);
@@ -17527,7 +16899,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1single_1paragraph_1mode)
#ifndef NO__1pango_1layout_1set_1spacing
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1spacing_FUNC);
pango_layout_set_spacing((PangoLayout *)arg0, arg1);
@@ -17537,7 +16909,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1spacing)
#ifndef NO__1pango_1layout_1set_1tabs
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1tabs_FUNC);
pango_layout_set_tabs((PangoLayout *)arg0, (PangoTabArray *)arg1);
@@ -17547,7 +16919,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1tabs)
#ifndef NO__1pango_1layout_1set_1text
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1text)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jint arg2)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1text_FUNC);
@@ -17575,7 +16947,7 @@ fail:
#ifndef NO__1pango_1layout_1set_1width
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1width_FUNC);
pango_layout_set_width((PangoLayout *)arg0, arg1);
@@ -17585,7 +16957,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1width)
#ifndef NO__1pango_1layout_1set_1wrap
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
{
OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1wrap_FUNC);
pango_layout_set_wrap((PangoLayout *)arg0, arg1);
@@ -17595,7 +16967,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1wrap)
#ifndef NO__1pango_1layout_1xy_1to_1index
JNIEXPORT jboolean JNICALL OS_NATIVE(_1pango_1layout_1xy_1to_1index)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4)
{
jint *lparg3=NULL;
jint *lparg4=NULL;
@@ -17614,7 +16986,7 @@ fail:
#ifndef NO__1pango_1tab_1array_1free
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1free_FUNC);
pango_tab_array_free((PangoTabArray *)arg0);
@@ -17624,7 +16996,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1free)
#ifndef NO__1pango_1tab_1array_1get_1size
JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1size)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1get_1size_FUNC);
@@ -17636,28 +17008,28 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1size)
#ifndef NO__1pango_1tab_1array_1get_1tabs
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1get_1tabs)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
{
- jint *lparg1=NULL;
- jint *lparg2=NULL;
+ jintLong *lparg1=NULL;
+ jintLong *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1get_1tabs_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;
+ if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+ if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
pango_tab_array_get_tabs((PangoTabArray *)arg0, (PangoTabAlign **)lparg1, (int **)lparg2);
fail:
- if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
- if (arg1 && lparg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, 0);
+ if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+ if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1get_1tabs_FUNC);
}
#endif
#ifndef NO__1pango_1tab_1array_1new
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
(JNIEnv *env, jclass that, jint arg0, jboolean arg1)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1new_FUNC);
- rc = (jint)pango_tab_array_new((gint)arg0, (gboolean)arg1);
+ rc = (jintLong)pango_tab_array_new((gint)arg0, (gboolean)arg1);
OS_NATIVE_EXIT(env, that, _1pango_1tab_1array_1new_FUNC);
return rc;
}
@@ -17665,7 +17037,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1tab_1array_1new)
#ifndef NO__1pango_1tab_1array_1set_1tab
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1set_1tab)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jint arg3)
{
OS_NATIVE_ENTER(env, that, _1pango_1tab_1array_1set_1tab_FUNC);
pango_tab_array_set_tab((PangoTabArray *)arg0, (gint)arg1, (PangoTabAlign)arg2, (gint)arg3);
@@ -17675,7 +17047,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1tab_1array_1set_1tab)
#ifndef NO_g_1main_1context_1wakeup
JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup)
- (JNIEnv *env, jclass that, jint arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
OS_NATIVE_ENTER(env, that, g_1main_1context_1wakeup_FUNC);
g_main_context_wakeup((GMainContext *)arg0);
@@ -17684,754 +17056,1381 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1main_1context_1wakeup)
#endif
#ifndef NO_localeconv_1decimal_1point
-JNIEXPORT jint JNICALL OS_NATIVE(localeconv_1decimal_1point)
+JNIEXPORT jintLong JNICALL OS_NATIVE(localeconv_1decimal_1point)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, localeconv_1decimal_1point_FUNC);
- rc = (jint)localeconv_decimal_point();
+ rc = (jintLong)localeconv_decimal_point();
OS_NATIVE_EXIT(env, that, localeconv_1decimal_1point_FUNC);
return rc;
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
{
GInterfaceInfo _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#endif
if (arg1) if ((lparg1 = getGInterfaceInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#endif
if (arg1) getGObjectClassFields(env, arg1, (GObjectClass *)arg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
{
GTypeInfo _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#endif
if (arg1) if ((lparg1 = getGTypeInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
GdkEventButton _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getGdkEventButtonFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
GdkEventExpose _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getGdkEventExposeFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
GdkEventMotion _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getGdkEventMotionFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#endif
if (arg1) getGtkAdjustmentFields(env, arg1, (GtkAdjustment *)arg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#endif
if (arg1) getGtkCellRendererClassFields(env, arg1, (GtkCellRendererClass *)arg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#endif
if (arg1) getGtkFixedFields(env, arg1, (GtkFixed *)arg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
GtkTargetEntry _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getGtkTargetEntryFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#endif
if (arg1) getGtkWidgetClassFields(env, arg1, (GtkWidgetClass *)arg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
PangoAttribute _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getPangoAttributeFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
XButtonEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getXButtonEventFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
XClientMessageEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getXClientMessageEventFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
XCrossingEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getXCrossingEventFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
XExposeEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getXExposeEventFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
{
XFocusChangeEvent _arg1, *lparg1=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC);
+#endif
if (arg1) if ((lparg1 = getXFocusChangeEventFields(env, arg1, &_arg1)) == NULL) goto fail;
memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
fail:
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
+#endif
if (arg0) setGObjectClassFields(env, arg0, (GObjectClass *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GTypeQuery _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGTypeQueryFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkColor _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkColorFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkDragContext _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkDragContextFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventAny _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventAnyFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventButton _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventButtonFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventCrossing _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventCrossingFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventExpose _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventExposeFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventFocus _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventFocusFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventKey _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventKeyFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventMotion _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventMotionFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventScroll _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventScrollFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventVisibility _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventVisibilityFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEventWindowState _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventWindowStateFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkEventFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC);
+#endif
if (arg0) setGdkImageFields(env, arg0, (GdkImage *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GdkRectangle _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGdkRectangleFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC);
+#endif
if (arg0) setGdkVisualFields(env, arg0, (GdkVisual *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC);
+#endif
if (arg0) setGtkAdjustmentFields(env, arg0, (GtkAdjustment *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GtkBorder _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGtkBorderFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC);
+#endif
if (arg0) setGtkCellRendererClassFields(env, arg0, (GtkCellRendererClass *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC);
+#endif
if (arg0) setGtkColorSelectionDialogFields(env, arg0, (GtkColorSelectionDialog *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC);
+#endif
if (arg0) setGtkComboFields(env, arg0, (GtkCombo *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC);
+#endif
if (arg0) setGtkFileSelectionFields(env, arg0, (GtkFileSelection *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC);
+#endif
if (arg0) setGtkFixedFields(env, arg0, (GtkFixed *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GtkSelectionData _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGtkSelectionDataFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
GtkTargetPair _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setGtkTargetPairFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+#endif
{
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC);
+#endif
if (arg0) setGtkWidgetClassFields(env, arg0, (GtkWidgetClass *)arg1);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoAttrColor _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoAttrColorFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoAttrInt _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoAttrIntFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoAttribute _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoAttributeFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoItem _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoItemFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoLayoutLine _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoLayoutLineFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoLayoutRun _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoLayoutRunFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
PangoLogAttr _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setPangoLogAttrFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
XButtonEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setXButtonEventFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
XCrossingEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setXCrossingEventFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
XExposeEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setXExposeEventFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
XFocusChangeEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setXFocusChangeEventFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC);
+#endif
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ) && defined(JNI64))
+#ifndef JNI64
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#else
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
+#endif
{
XVisibilityEvent _arg0, *lparg0=NULL;
+#ifndef JNI64
OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC);
+#else
+ OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC);
+#endif
if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
fail:
if (arg0 && lparg0) setXVisibilityEventFields(env, arg0, lparg0);
+#ifndef JNI64
OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC);
+#else
+ OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC);
+#endif
}
#endif
#ifndef NO_realpath
-JNIEXPORT jint JNICALL OS_NATIVE(realpath)
+JNIEXPORT jintLong JNICALL OS_NATIVE(realpath)
(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
{
jbyte *lparg0=NULL;
jbyte *lparg1=NULL;
- jint rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, realpath_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
- rc = (jint)realpath((const char *)lparg0, (char *)lparg1);
+ rc = (jintLong)realpath((const char *)lparg0, (char *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
diff --git a/os_custom.c b/os_custom.c
index 948b855..216645e 100644
--- a/os_custom.c
+++ b/os_custom.c
@@ -36,15 +36,15 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1WINDOWING_1X11)
#endif
#ifndef NO__1gtk_1file_1chooser_1dialog_1new
-JNIEXPORT SWT_PTR JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
- (JNIEnv *env, jclass that, jbyteArray arg0, SWT_PTR arg1, jint arg2, SWT_PTR arg3, jint arg4, SWT_PTR arg5, jint arg6, SWT_PTR arg7)
+JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jint arg2, jintLong arg3, jint arg4, jintLong arg5, jint arg6, jintLong arg7)
{
jbyte *lparg0=NULL;
- SWT_PTR rc = 0;
+ jintLong rc = 0;
OS_NATIVE_ENTER(env, that, _1gtk_1file_1chooser_1dialog_1new_FUNC);
if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
/*
- rc = (SWT_PTR)gtk_file_chooser_dialog_new(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ rc = (jintLong)gtk_file_chooser_dialog_new(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
*/
{
static int initialized = 0;
@@ -57,8 +57,8 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
* For some reason, we must also explicitly declare all of the arguments we
* are passing in, otherwise it crashes.
*/
-/* typedef SWT_PTR (*FPTR)(jbyte *, SWT_PTR, jint, SWT_PTR, ...); */
- typedef SWT_PTR (*FPTR)(jbyte *, SWT_PTR, jint, SWT_PTR, jint, SWT_PTR, jint, SWT_PTR, ...);
+/* typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, ...); */
+ typedef jintLong (*FPTR)(jbyte *, jintLong, jint, jintLong, jint, jintLong, jint, jintLong, ...);
static FPTR fptr;
rc = 0;
if (!initialized) {
@@ -67,7 +67,7 @@ JNIEXPORT SWT_PTR JNICALL OS_NATIVE(_1gtk_1file_1chooser_1dialog_1new)
initialized = 1;
}
if (fptr) {
- rc = (SWT_PTR)(*fptr)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ rc = (jintLong)(*fptr)(lparg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
}
fail:
@@ -79,7 +79,7 @@ fail:
#ifndef NO__1gtk_1cell_1layout_1set_1attributes
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
- (JNIEnv *env, jclass that, SWT_PTR arg0, SWT_PTR arg1, jbyteArray arg2, jint arg3, SWT_PTR arg4)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintLong arg4)
{
jbyte *lparg2=NULL;
OS_NATIVE_ENTER(env, that, _1gtk_1cell_1layout_1set_1attributes_FUNC);
@@ -98,8 +98,8 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1cell_1layout_1set_1attributes)
* For some reason, we must also explicitly declare all of the arguments we
* are passing in, otherwise it crashes.
*/
-/* typedef void (*FPTR)(SWT_PTR, SWT_PTR, ...); */
- typedef void (*FPTR)(SWT_PTR, SWT_PTR, jbyte *, jint, SWT_PTR, ...);
+/* typedef void (*FPTR)(jintLong, jintLong, ...); */
+ typedef void (*FPTR)(jintLong, jintLong, jbyte *, jint, jintLong, ...);
static FPTR fptr;
if (!initialized) {
if (!handle) handle = dlopen(gtk_cell_layout_set_attributes_LIB, RTLD_LAZY);
@@ -116,27 +116,3 @@ fail:
}
#endif
-struct _PangoLayoutLineSWT
-{
- PangoLayout *layout;
- gint start_index;
- gint length;
- GSList *runs;
- guint is_paragraph_start : 1;
- guint resolved_dir : 3;
-};
-typedef struct _PangoLayoutLineSWT PangoLayoutLineSWT;
-
-#ifndef NO__1pango_1layout_1line_1get_1resolved_1dir
-JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1line_1get_1resolved_1dir)
- (JNIEnv *env, jclass that, SWT_PTR arg0)
-{
- jint rc = 0;
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1line_1get_1resolved_1dir_FUNC);
- if (gtk_check_version(2,4,0) == NULL) {
- rc = ((PangoLayoutLineSWT*)(arg0))->resolved_dir;
- }
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1line_1get_1resolved_1dir_FUNC);
- return rc;
-}
-#endif
diff --git a/os_custom.h b/os_custom.h
index bfec191..0bb68c3 100644
--- a/os_custom.h
+++ b/os_custom.h
@@ -1,5 +1,5 @@
/*******************************************************************************
-* Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
+* Copyright (c) 2000, 2009 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
@@ -55,18 +55,24 @@
#define gtk_combo_box_popup_LIB "libgtk-x11-2.0.so.0"
#define gtk_combo_box_popdown_LIB "libgtk-x11-2.0.so.0"
#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so.0"
+#define gtk_entry_get_inner_border_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_get_filter_LIB "libgtk-x11-2.0.so.0"
+#define gtk_file_chooser_get_uri_LIB "libgtk-x11-2.0.so.0"
+#define gtk_file_chooser_get_uris_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0"
+#define gtk_file_chooser_set_current_folder_uri_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_do_overwrite_confirmation_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_filter_LIB "libgtk-x11-2.0.so.0"
+#define gtk_file_chooser_set_local_only_LIB "libgtk-x11-2.0.so.0"
+#define gtk_file_chooser_set_uri_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0"
#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0"
@@ -85,18 +91,25 @@
#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so.0"
#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0"
#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0"
+#define gtk_tree_view_set_grid_lines_LIB "libgtk-x11-2.0.so.0"
#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0"
#define gdk_cursor_new_from_pixbuf_LIB "libgdk-x11-2.0.so.0"
#define gdk_display_get_default_LIB "libgdk-x11-2.0.so.0"
#define gdk_display_supports_cursor_color_LIB "libgdk-x11-2.0.so.0"
#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0"
-#define gdk_pixbuf_save_to_buffer_LIB "libgdk-x11-2.0.so.0"
+#define gdk_pixbuf_save_to_bufferv_LIB "libgdk-x11-2.0.so.0"
#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0"
#define gdk_screen_get_monitor_at_point_LIB "libgdk-x11-2.0.so.0"
#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0"
#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0"
#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0"
#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0"
+#define gtk_status_icon_get_geometry_LIB "libgtk-x11-2.0.so.0"
+#define gtk_status_icon_get_visible_LIB "libgtk-x11-2.0.so.0"
+#define gtk_status_icon_new_LIB "libgtk-x11-2.0.so.0"
+#define gtk_status_icon_set_from_pixbuf_LIB "libgtk-x11-2.0.so.0"
+#define gtk_status_icon_set_visible_LIB "libgtk-x11-2.0.so.0"
+#define gtk_status_icon_set_tooltip_LIB "libgtk-x11-2.0.so.0"
#define gtk_window_get_group_LIB "libgtk-x11-2.0.so.0"
#define gtk_window_get_opacity_LIB "libgtk-x11-2.0.so.0"
#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0"
@@ -127,6 +140,7 @@
#define pango_cairo_font_map_set_resolution_LIB "libpangocairo-1.0.so.0"
#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so.0"
#define gdk_cairo_region_LIB "libgdk-x11-2.0.so.0"
+#define gdk_cairo_create_LIB "libgdk-x11-2.0.so.0"
#define gtk_enumerate_printers_LIB "libgtk-x11-2.0.so.0"
#define gtk_page_setup_get_bottom_margin_LIB "libgtk-x11-2.0.so.0"
#define gtk_page_setup_get_left_margin_LIB "libgtk-x11-2.0.so.0"
@@ -197,6 +211,8 @@
#define FcConfigAppFontAddFile_LIB "libfontconfig.so.1"
/* Field accessors */
+#define G_OBJECT_CLASS_CONSTRUCTOR(arg0) (arg0)->constructor
+#define G_OBJECT_CLASS_SET_CONSTRUCTOR(arg0, arg1) (arg0)->constructor = (GObject* (*) (GType, guint, GObjectConstructParam *))arg1
#define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1
#define GTK_ACCEL_LABEL_GET_ACCEL_STRING(arg0) (arg0)->accel_string
#define GTK_SCROLLED_WINDOW_HSCROLLBAR(arg0) (arg0)->hscrollbar
diff --git a/os_stats.c b/os_stats.c
index d878c6c..5f5fbe5 100644
--- a/os_stats.c
+++ b/os_stats.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2009 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
@@ -18,10 +18,19 @@
#ifdef NATIVE_STATS
-int OS_nativeFunctionCount = 1266;
-int OS_nativeFunctionCallCount[1266];
+int OS_nativeFunctionCount = 1291;
+int OS_nativeFunctionCallCount[1291];
char * OS_nativeFunctionNames[] = {
- "Call",
+#ifndef JNI64
+ "Call__IIII",
+#else
+ "Call__JJII",
+#endif
+#ifndef JNI64
+ "Call__IIIJ",
+#else
+ "Call__JJIJ",
+#endif
"GDK_1EVENT_1TYPE",
"GDK_1EVENT_1WINDOW",
"GDK_1WINDOWING_1X11",
@@ -49,6 +58,8 @@ char * OS_nativeFunctionNames[] = {
"GTK_1WIDGET_1Y",
"GTypeInfo_1sizeof",
"GTypeQuery_1sizeof",
+ "G_1OBJECT_1CLASS_1CONSTRUCTOR",
+ "G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR",
"GdkColor_1sizeof",
"GdkDragContext_1sizeof",
"GdkEventAny_1sizeof",
@@ -123,6 +134,7 @@ char * OS_nativeFunctionNames[] = {
"_1GTK_1IS_1IMAGE_1MENU_1ITEM",
"_1GTK_1IS_1MENU_1ITEM",
"_1GTK_1IS_1PLUG",
+ "_1GTK_1IS_1SOCKET",
"_1GTK_1IS_1WINDOW",
"_1GTK_1STOCK_1CANCEL",
"_1GTK_1STOCK_1OK",
@@ -151,6 +163,7 @@ char * OS_nativeFunctionNames[] = {
"_1G_1TYPE_1STRING",
"_1PANGO_1PIXELS",
"_1PANGO_1TYPE_1FONT_1DESCRIPTION",
+ "_1PANGO_1TYPE_1LAYOUT",
"_1XCheckIfEvent",
"_1XCheckMaskEvent",
"_1XCheckWindowEvent",
@@ -230,12 +243,33 @@ char * OS_nativeFunctionNames[] = {
"_1g_1object_1get",
"_1g_1object_1get_1qdata",
"_1g_1object_1new",
+ "_1g_1object_1notify",
"_1g_1object_1ref",
+#ifndef JNI64
"_1g_1object_1set__I_3BFI",
+#else
+ "_1g_1object_1set__J_3BFJ",
+#endif
+#ifndef JNI64
"_1g_1object_1set__I_3BII",
+#else
+ "_1g_1object_1set__J_3BIJ",
+#endif
+#ifndef JNI64
"_1g_1object_1set__I_3BJI",
+#else
+ "_1g_1object_1set__J_3BJJ",
+#endif
+#ifndef JNI64
"_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+ "_1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
"_1g_1object_1set__I_3BZI",
+#else
+ "_1g_1object_1set__J_3BZJ",
+#endif
"_1g_1object_1set_1qdata",
"_1g_1object_1unref",
"_1g_1quark_1from_1string",
@@ -245,10 +279,26 @@ char * OS_nativeFunctionNames[] = {
"_1g_1signal_1connect_1after",
"_1g_1signal_1connect_1closure",
"_1g_1signal_1connect_1closure_1by_1id",
+#ifndef JNI64
"_1g_1signal_1emit_1by_1name__I_3B",
+#else
+ "_1g_1signal_1emit_1by_1name__J_3B",
+#endif
+#ifndef JNI64
"_1g_1signal_1emit_1by_1name__I_3BI",
+#else
+ "_1g_1signal_1emit_1by_1name__J_3BJ",
+#endif
+#ifndef JNI64
"_1g_1signal_1emit_1by_1name__I_3BII",
+#else
+ "_1g_1signal_1emit_1by_1name__J_3BJJ",
+#endif
+#ifndef JNI64
"_1g_1signal_1emit_1by_1name__I_3B_3B",
+#else
+ "_1g_1signal_1emit_1by_1name__J_3B_3B",
+#endif
"_1g_1signal_1handler_1disconnect",
"_1g_1signal_1handlers_1block_1matched",
"_1g_1signal_1handlers_1disconnect_1matched",
@@ -268,6 +318,8 @@ char * OS_nativeFunctionNames[] = {
"_1g_1type_1add_1interface_1static",
"_1g_1type_1class_1peek",
"_1g_1type_1class_1peek_1parent",
+ "_1g_1type_1class_1ref",
+ "_1g_1type_1class_1unref",
"_1g_1type_1from_1name",
"_1g_1type_1interface_1peek_1parent",
"_1g_1type_1is_1a",
@@ -279,13 +331,22 @@ char * OS_nativeFunctionNames[] = {
"_1g_1utf8_1offset_1to_1pointer",
"_1g_1utf8_1pointer_1to_1offset",
"_1g_1utf8_1strlen",
+#ifndef JNI64
"_1g_1utf8_1to_1utf16__II_3I_3I_3I",
+#else
+ "_1g_1utf8_1to_1utf16__JJ_3J_3J_3J",
+#endif
+#ifndef JNI64
"_1g_1utf8_1to_1utf16___3BI_3I_3I_3I",
+#else
+ "_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J",
+#endif
"_1g_1value_1peek_1pointer",
"_1gdk_1atom_1intern",
"_1gdk_1atom_1name",
"_1gdk_1beep",
"_1gdk_1bitmap_1create_1from_1data",
+ "_1gdk_1cairo_1create",
"_1gdk_1cairo_1region",
"_1gdk_1cairo_1set_1source_1color",
"_1gdk_1color_1white",
@@ -373,7 +434,7 @@ char * OS_nativeFunctionNames[] = {
"_1gdk_1pixbuf_1render_1pixmap_1and_1mask",
"_1gdk_1pixbuf_1render_1to_1drawable",
"_1gdk_1pixbuf_1render_1to_1drawable_1alpha",
- "_1gdk_1pixbuf_1save_1to_1buffer",
+ "_1gdk_1pixbuf_1save_1to_1bufferv",
"_1gdk_1pixbuf_1scale",
"_1gdk_1pixbuf_1scale_1simple",
"_1gdk_1pixmap_1foreign_1new",
@@ -475,6 +536,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1arrow_1new",
"_1gtk_1arrow_1set",
"_1gtk_1bin_1get_1child",
+ "_1gtk_1border_1free",
"_1gtk_1box_1set_1child_1packing",
"_1gtk_1box_1set_1spacing",
"_1gtk_1button_1clicked",
@@ -552,6 +614,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1editable_1select_1region",
"_1gtk_1editable_1set_1editable",
"_1gtk_1editable_1set_1position",
+ "_1gtk_1entry_1get_1inner_1border",
"_1gtk_1entry_1get_1invisible_1char",
"_1gtk_1entry_1get_1layout",
"_1gtk_1entry_1get_1layout_1offsets",
@@ -581,13 +644,18 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1file_1chooser_1get_1filename",
"_1gtk_1file_1chooser_1get_1filenames",
"_1gtk_1file_1chooser_1get_1filter",
+ "_1gtk_1file_1chooser_1get_1uri",
+ "_1gtk_1file_1chooser_1get_1uris",
"_1gtk_1file_1chooser_1set_1current_1folder",
+ "_1gtk_1file_1chooser_1set_1current_1folder_1uri",
"_1gtk_1file_1chooser_1set_1current_1name",
"_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation",
"_1gtk_1file_1chooser_1set_1extra_1widget",
"_1gtk_1file_1chooser_1set_1filename",
"_1gtk_1file_1chooser_1set_1filter",
+ "_1gtk_1file_1chooser_1set_1local_1only",
"_1gtk_1file_1chooser_1set_1select_1multiple",
+ "_1gtk_1file_1chooser_1set_1uri",
"_1gtk_1file_1filter_1add_1pattern",
"_1gtk_1file_1filter_1get_1name",
"_1gtk_1file_1filter_1new",
@@ -652,8 +720,16 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1label_1set_1justify",
"_1gtk_1label_1set_1line_1wrap",
"_1gtk_1label_1set_1line_1wrap_1mode",
+#ifndef JNI64
"_1gtk_1label_1set_1text__II",
+#else
+ "_1gtk_1label_1set_1text__JJ",
+#endif
+#ifndef JNI64
"_1gtk_1label_1set_1text__I_3B",
+#else
+ "_1gtk_1label_1set_1text__J_3B",
+#endif
"_1gtk_1label_1set_1text_1with_1mnemonic",
"_1gtk_1list_1append_1items",
"_1gtk_1list_1clear_1items",
@@ -666,11 +742,31 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1list_1store_1insert",
"_1gtk_1list_1store_1newv",
"_1gtk_1list_1store_1remove",
+#ifndef JNI64
"_1gtk_1list_1store_1set__IIIII",
+#else
+ "_1gtk_1list_1store_1set__JJIIJ",
+#endif
+#ifndef JNI64
"_1gtk_1list_1store_1set__IIIJI",
+#else
+ "_1gtk_1list_1store_1set__JJIJJ",
+#endif
+#ifndef JNI64
"_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+ "_1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
"_1gtk_1list_1store_1set__IIIZI",
+#else
+ "_1gtk_1list_1store_1set__JJIZJ",
+#endif
+#ifndef JNI64
"_1gtk_1list_1store_1set__III_3BI",
+#else
+ "_1gtk_1list_1store_1set__JJI_3BJ",
+#endif
"_1gtk_1list_1unselect_1all",
"_1gtk_1list_1unselect_1item",
"_1gtk_1main",
@@ -678,6 +774,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1main_1iteration",
"_1gtk_1major_1version",
"_1gtk_1menu_1bar_1new",
+ "_1gtk_1menu_1get_1attach_1widget",
"_1gtk_1menu_1item_1get_1submenu",
"_1gtk_1menu_1item_1remove_1submenu",
"_1gtk_1menu_1item_1set_1submenu",
@@ -838,6 +935,12 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1spin_1button_1set_1value",
"_1gtk_1spin_1button_1set_1wrap",
"_1gtk_1spin_1button_1update",
+ "_1gtk_1status_1icon_1get_1geometry",
+ "_1gtk_1status_1icon_1get_1visible",
+ "_1gtk_1status_1icon_1new",
+ "_1gtk_1status_1icon_1set_1from_1pixbuf",
+ "_1gtk_1status_1icon_1set_1tooltip",
+ "_1gtk_1status_1icon_1set_1visible",
"_1gtk_1style_1get_1base",
"_1gtk_1style_1get_1bg",
"_1gtk_1style_1get_1bg_1gc",
@@ -874,8 +977,16 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1text_1buffer_1get_1selection_1bound",
"_1gtk_1text_1buffer_1get_1selection_1bounds",
"_1gtk_1text_1buffer_1get_1text",
+#ifndef JNI64
"_1gtk_1text_1buffer_1insert__II_3BI",
+#else
+ "_1gtk_1text_1buffer_1insert__JJ_3BI",
+#endif
+#ifndef JNI64
"_1gtk_1text_1buffer_1insert__I_3B_3BI",
+#else
+ "_1gtk_1text_1buffer_1insert__J_3B_3BI",
+#endif
"_1gtk_1text_1buffer_1move_1mark",
"_1gtk_1text_1buffer_1paste_1clipboard",
"_1gtk_1text_1buffer_1place_1cursor",
@@ -916,8 +1027,16 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tooltips_1force_1window",
"_1gtk_1tooltips_1new",
"_1gtk_1tooltips_1set_1tip",
+#ifndef JNI64
"_1gtk_1tree_1model_1get__III_3II",
+#else
+ "_1gtk_1tree_1model_1get__JJI_3IJ",
+#endif
+#ifndef JNI64
"_1gtk_1tree_1model_1get__III_3JI",
+#else
+ "_1gtk_1tree_1model_1get__JJI_3JJ",
+#endif
"_1gtk_1tree_1model_1get_1iter",
"_1gtk_1tree_1model_1get_1iter_1first",
"_1gtk_1tree_1model_1get_1n_1columns",
@@ -935,7 +1054,11 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tree_1path_1get_1indices",
"_1gtk_1tree_1path_1new",
"_1gtk_1tree_1path_1new_1first",
+#ifndef JNI64
"_1gtk_1tree_1path_1new_1from_1string__I",
+#else
+ "_1gtk_1tree_1path_1new_1from_1string__J",
+#endif
"_1gtk_1tree_1path_1new_1from_1string___3B",
"_1gtk_1tree_1path_1next",
"_1gtk_1tree_1path_1prev",
@@ -955,11 +1078,31 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tree_1store_1insert",
"_1gtk_1tree_1store_1newv",
"_1gtk_1tree_1store_1remove",
+#ifndef JNI64
"_1gtk_1tree_1store_1set__IIIII",
+#else
+ "_1gtk_1tree_1store_1set__JJIIJ",
+#endif
+#ifndef JNI64
"_1gtk_1tree_1store_1set__IIIJI",
+#else
+ "_1gtk_1tree_1store_1set__JJIJJ",
+#endif
+#ifndef JNI64
"_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I",
+#else
+ "_1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J",
+#endif
+#ifndef JNI64
"_1gtk_1tree_1store_1set__IIIZI",
+#else
+ "_1gtk_1tree_1store_1set__JJIZJ",
+#endif
+#ifndef JNI64
"_1gtk_1tree_1store_1set__III_3BI",
+#else
+ "_1gtk_1tree_1store_1set__JJI_3BJ",
+#endif
"_1gtk_1tree_1view_1collapse_1row",
"_1gtk_1tree_1view_1column_1add_1attribute",
"_1gtk_1tree_1view_1column_1cell_1get_1position",
@@ -1016,6 +1159,7 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tree_1view_1set_1cursor",
"_1gtk_1tree_1view_1set_1drag_1dest_1row",
"_1gtk_1tree_1view_1set_1enable_1search",
+ "_1gtk_1tree_1view_1set_1grid_1lines",
"_1gtk_1tree_1view_1set_1headers_1visible",
"_1gtk_1tree_1view_1set_1model",
"_1gtk_1tree_1view_1set_1rules_1hint",
@@ -1024,14 +1168,24 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1tree_1view_1unset_1rows_1drag_1dest",
"_1gtk_1tree_1view_1widget_1to_1tree_1coords",
"_1gtk_1vbox_1new",
+ "_1gtk_1viewport_1get_1shadow_1type",
+ "_1gtk_1viewport_1set_1shadow_1type",
"_1gtk_1vscale_1new",
"_1gtk_1vscrollbar_1new",
"_1gtk_1vseparator_1new",
"_1gtk_1widget_1add_1accelerator",
"_1gtk_1widget_1add_1events",
"_1gtk_1widget_1child_1focus",
+#ifndef JNI64
"_1gtk_1widget_1create_1pango_1layout__II",
+#else
+ "_1gtk_1widget_1create_1pango_1layout__JJ",
+#endif
+#ifndef JNI64
"_1gtk_1widget_1create_1pango_1layout__I_3B",
+#else
+ "_1gtk_1widget_1create_1pango_1layout__J_3B",
+#endif
"_1gtk_1widget_1destroy",
"_1gtk_1widget_1event",
"_1gtk_1widget_1get_1accessible",
@@ -1080,8 +1234,16 @@ char * OS_nativeFunctionNames[] = {
"_1gtk_1widget_1show_1now",
"_1gtk_1widget_1size_1allocate",
"_1gtk_1widget_1size_1request",
+#ifndef JNI64
"_1gtk_1widget_1style_1get__I_3B_3II",
+#else
+ "_1gtk_1widget_1style_1get__J_3B_3IJ",
+#endif
+#ifndef JNI64
"_1gtk_1widget_1style_1get__I_3B_3JI",
+#else
+ "_1gtk_1widget_1style_1get__J_3B_3JJ",
+#endif
"_1gtk_1widget_1translate_1coordinates",
"_1gtk_1widget_1unrealize",
"_1gtk_1window_1activate_1default",
@@ -1206,7 +1368,6 @@ char * OS_nativeFunctionNames[] = {
"_1pango_1layout_1iter_1next_1line",
"_1pango_1layout_1iter_1next_1run",
"_1pango_1layout_1line_1get_1extents",
- "_1pango_1layout_1line_1get_1resolved_1dir",
"_1pango_1layout_1line_1x_1to_1index",
"_1pango_1layout_1new",
"_1pango_1layout_1set_1alignment",
@@ -1229,63 +1390,291 @@ char * OS_nativeFunctionNames[] = {
"_1pango_1tab_1array_1set_1tab",
"g_1main_1context_1wakeup",
"localeconv_1decimal_1point",
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II",
+#else
+ "memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ",
+#endif
"realpath",
};
diff --git a/os_stats.h b/os_stats.h
index df70972..86a696b 100644
--- a/os_stats.h
+++ b/os_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2009 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
@@ -29,7 +29,16 @@ extern char* OS_nativeFunctionNames[];
#endif
typedef enum {
- Call_FUNC,
+#ifndef JNI64
+ Call__IIII_FUNC,
+#else
+ Call__JJII_FUNC,
+#endif
+#ifndef JNI64
+ Call__IIIJ_FUNC,
+#else
+ Call__JJIJ_FUNC,
+#endif
GDK_1EVENT_1TYPE_FUNC,
GDK_1EVENT_1WINDOW_FUNC,
GDK_1WINDOWING_1X11_FUNC,
@@ -57,6 +66,8 @@ typedef enum {
GTK_1WIDGET_1Y_FUNC,
GTypeInfo_1sizeof_FUNC,
GTypeQuery_1sizeof_FUNC,
+ G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC,
+ G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC,
GdkColor_1sizeof_FUNC,
GdkDragContext_1sizeof_FUNC,
GdkEventAny_1sizeof_FUNC,
@@ -131,6 +142,7 @@ typedef enum {
_1GTK_1IS_1IMAGE_1MENU_1ITEM_FUNC,
_1GTK_1IS_1MENU_1ITEM_FUNC,
_1GTK_1IS_1PLUG_FUNC,
+ _1GTK_1IS_1SOCKET_FUNC,
_1GTK_1IS_1WINDOW_FUNC,
_1GTK_1STOCK_1CANCEL_FUNC,
_1GTK_1STOCK_1OK_FUNC,
@@ -159,6 +171,7 @@ typedef enum {
_1G_1TYPE_1STRING_FUNC,
_1PANGO_1PIXELS_FUNC,
_1PANGO_1TYPE_1FONT_1DESCRIPTION_FUNC,
+ _1PANGO_1TYPE_1LAYOUT_FUNC,
_1XCheckIfEvent_FUNC,
_1XCheckMaskEvent_FUNC,
_1XCheckWindowEvent_FUNC,
@@ -238,12 +251,33 @@ typedef enum {
_1g_1object_1get_FUNC,
_1g_1object_1get_1qdata_FUNC,
_1g_1object_1new_FUNC,
+ _1g_1object_1notify_FUNC,
_1g_1object_1ref_FUNC,
+#ifndef JNI64
_1g_1object_1set__I_3BFI_FUNC,
+#else
+ _1g_1object_1set__J_3BFJ_FUNC,
+#endif
+#ifndef JNI64
_1g_1object_1set__I_3BII_FUNC,
+#else
+ _1g_1object_1set__J_3BIJ_FUNC,
+#endif
+#ifndef JNI64
_1g_1object_1set__I_3BJI_FUNC,
+#else
+ _1g_1object_1set__J_3BJJ_FUNC,
+#endif
+#ifndef JNI64
_1g_1object_1set__I_3BLorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+ _1g_1object_1set__J_3BLorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
_1g_1object_1set__I_3BZI_FUNC,
+#else
+ _1g_1object_1set__J_3BZJ_FUNC,
+#endif
_1g_1object_1set_1qdata_FUNC,
_1g_1object_1unref_FUNC,
_1g_1quark_1from_1string_FUNC,
@@ -253,10 +287,26 @@ typedef enum {
_1g_1signal_1connect_1after_FUNC,
_1g_1signal_1connect_1closure_FUNC,
_1g_1signal_1connect_1closure_1by_1id_FUNC,
+#ifndef JNI64
_1g_1signal_1emit_1by_1name__I_3B_FUNC,
+#else
+ _1g_1signal_1emit_1by_1name__J_3B_FUNC,
+#endif
+#ifndef JNI64
_1g_1signal_1emit_1by_1name__I_3BI_FUNC,
+#else
+ _1g_1signal_1emit_1by_1name__J_3BJ_FUNC,
+#endif
+#ifndef JNI64
_1g_1signal_1emit_1by_1name__I_3BII_FUNC,
+#else
+ _1g_1signal_1emit_1by_1name__J_3BJJ_FUNC,
+#endif
+#ifndef JNI64
_1g_1signal_1emit_1by_1name__I_3B_3B_FUNC,
+#else
+ _1g_1signal_1emit_1by_1name__J_3B_3B_FUNC,
+#endif
_1g_1signal_1handler_1disconnect_FUNC,
_1g_1signal_1handlers_1block_1matched_FUNC,
_1g_1signal_1handlers_1disconnect_1matched_FUNC,
@@ -276,6 +326,8 @@ typedef enum {
_1g_1type_1add_1interface_1static_FUNC,
_1g_1type_1class_1peek_FUNC,
_1g_1type_1class_1peek_1parent_FUNC,
+ _1g_1type_1class_1ref_FUNC,
+ _1g_1type_1class_1unref_FUNC,
_1g_1type_1from_1name_FUNC,
_1g_1type_1interface_1peek_1parent_FUNC,
_1g_1type_1is_1a_FUNC,
@@ -287,13 +339,22 @@ typedef enum {
_1g_1utf8_1offset_1to_1pointer_FUNC,
_1g_1utf8_1pointer_1to_1offset_FUNC,
_1g_1utf8_1strlen_FUNC,
+#ifndef JNI64
_1g_1utf8_1to_1utf16__II_3I_3I_3I_FUNC,
+#else
+ _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC,
+#endif
+#ifndef JNI64
_1g_1utf8_1to_1utf16___3BI_3I_3I_3I_FUNC,
+#else
+ _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC,
+#endif
_1g_1value_1peek_1pointer_FUNC,
_1gdk_1atom_1intern_FUNC,
_1gdk_1atom_1name_FUNC,
_1gdk_1beep_FUNC,
_1gdk_1bitmap_1create_1from_1data_FUNC,
+ _1gdk_1cairo_1create_FUNC,
_1gdk_1cairo_1region_FUNC,
_1gdk_1cairo_1set_1source_1color_FUNC,
_1gdk_1color_1white_FUNC,
@@ -381,7 +442,7 @@ typedef enum {
_1gdk_1pixbuf_1render_1pixmap_1and_1mask_FUNC,
_1gdk_1pixbuf_1render_1to_1drawable_FUNC,
_1gdk_1pixbuf_1render_1to_1drawable_1alpha_FUNC,
- _1gdk_1pixbuf_1save_1to_1buffer_FUNC,
+ _1gdk_1pixbuf_1save_1to_1bufferv_FUNC,
_1gdk_1pixbuf_1scale_FUNC,
_1gdk_1pixbuf_1scale_1simple_FUNC,
_1gdk_1pixmap_1foreign_1new_FUNC,
@@ -483,6 +544,7 @@ typedef enum {
_1gtk_1arrow_1new_FUNC,
_1gtk_1arrow_1set_FUNC,
_1gtk_1bin_1get_1child_FUNC,
+ _1gtk_1border_1free_FUNC,
_1gtk_1box_1set_1child_1packing_FUNC,
_1gtk_1box_1set_1spacing_FUNC,
_1gtk_1button_1clicked_FUNC,
@@ -560,6 +622,7 @@ typedef enum {
_1gtk_1editable_1select_1region_FUNC,
_1gtk_1editable_1set_1editable_FUNC,
_1gtk_1editable_1set_1position_FUNC,
+ _1gtk_1entry_1get_1inner_1border_FUNC,
_1gtk_1entry_1get_1invisible_1char_FUNC,
_1gtk_1entry_1get_1layout_FUNC,
_1gtk_1entry_1get_1layout_1offsets_FUNC,
@@ -589,13 +652,18 @@ typedef enum {
_1gtk_1file_1chooser_1get_1filename_FUNC,
_1gtk_1file_1chooser_1get_1filenames_FUNC,
_1gtk_1file_1chooser_1get_1filter_FUNC,
+ _1gtk_1file_1chooser_1get_1uri_FUNC,
+ _1gtk_1file_1chooser_1get_1uris_FUNC,
_1gtk_1file_1chooser_1set_1current_1folder_FUNC,
+ _1gtk_1file_1chooser_1set_1current_1folder_1uri_FUNC,
_1gtk_1file_1chooser_1set_1current_1name_FUNC,
_1gtk_1file_1chooser_1set_1do_1overwrite_1confirmation_FUNC,
_1gtk_1file_1chooser_1set_1extra_1widget_FUNC,
_1gtk_1file_1chooser_1set_1filename_FUNC,
_1gtk_1file_1chooser_1set_1filter_FUNC,
+ _1gtk_1file_1chooser_1set_1local_1only_FUNC,
_1gtk_1file_1chooser_1set_1select_1multiple_FUNC,
+ _1gtk_1file_1chooser_1set_1uri_FUNC,
_1gtk_1file_1filter_1add_1pattern_FUNC,
_1gtk_1file_1filter_1get_1name_FUNC,
_1gtk_1file_1filter_1new_FUNC,
@@ -660,8 +728,16 @@ typedef enum {
_1gtk_1label_1set_1justify_FUNC,
_1gtk_1label_1set_1line_1wrap_FUNC,
_1gtk_1label_1set_1line_1wrap_1mode_FUNC,
+#ifndef JNI64
_1gtk_1label_1set_1text__II_FUNC,
+#else
+ _1gtk_1label_1set_1text__JJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1label_1set_1text__I_3B_FUNC,
+#else
+ _1gtk_1label_1set_1text__J_3B_FUNC,
+#endif
_1gtk_1label_1set_1text_1with_1mnemonic_FUNC,
_1gtk_1list_1append_1items_FUNC,
_1gtk_1list_1clear_1items_FUNC,
@@ -674,11 +750,31 @@ typedef enum {
_1gtk_1list_1store_1insert_FUNC,
_1gtk_1list_1store_1newv_FUNC,
_1gtk_1list_1store_1remove_FUNC,
+#ifndef JNI64
_1gtk_1list_1store_1set__IIIII_FUNC,
+#else
+ _1gtk_1list_1store_1set__JJIIJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1list_1store_1set__IIIJI_FUNC,
+#else
+ _1gtk_1list_1store_1set__JJIJJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1list_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+ _1gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1list_1store_1set__IIIZI_FUNC,
+#else
+ _1gtk_1list_1store_1set__JJIZJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1list_1store_1set__III_3BI_FUNC,
+#else
+ _1gtk_1list_1store_1set__JJI_3BJ_FUNC,
+#endif
_1gtk_1list_1unselect_1all_FUNC,
_1gtk_1list_1unselect_1item_FUNC,
_1gtk_1main_FUNC,
@@ -686,6 +782,7 @@ typedef enum {
_1gtk_1main_1iteration_FUNC,
_1gtk_1major_1version_FUNC,
_1gtk_1menu_1bar_1new_FUNC,
+ _1gtk_1menu_1get_1attach_1widget_FUNC,
_1gtk_1menu_1item_1get_1submenu_FUNC,
_1gtk_1menu_1item_1remove_1submenu_FUNC,
_1gtk_1menu_1item_1set_1submenu_FUNC,
@@ -846,6 +943,12 @@ typedef enum {
_1gtk_1spin_1button_1set_1value_FUNC,
_1gtk_1spin_1button_1set_1wrap_FUNC,
_1gtk_1spin_1button_1update_FUNC,
+ _1gtk_1status_1icon_1get_1geometry_FUNC,
+ _1gtk_1status_1icon_1get_1visible_FUNC,
+ _1gtk_1status_1icon_1new_FUNC,
+ _1gtk_1status_1icon_1set_1from_1pixbuf_FUNC,
+ _1gtk_1status_1icon_1set_1tooltip_FUNC,
+ _1gtk_1status_1icon_1set_1visible_FUNC,
_1gtk_1style_1get_1base_FUNC,
_1gtk_1style_1get_1bg_FUNC,
_1gtk_1style_1get_1bg_1gc_FUNC,
@@ -882,8 +985,16 @@ typedef enum {
_1gtk_1text_1buffer_1get_1selection_1bound_FUNC,
_1gtk_1text_1buffer_1get_1selection_1bounds_FUNC,
_1gtk_1text_1buffer_1get_1text_FUNC,
+#ifndef JNI64
_1gtk_1text_1buffer_1insert__II_3BI_FUNC,
+#else
+ _1gtk_1text_1buffer_1insert__JJ_3BI_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1text_1buffer_1insert__I_3B_3BI_FUNC,
+#else
+ _1gtk_1text_1buffer_1insert__J_3B_3BI_FUNC,
+#endif
_1gtk_1text_1buffer_1move_1mark_FUNC,
_1gtk_1text_1buffer_1paste_1clipboard_FUNC,
_1gtk_1text_1buffer_1place_1cursor_FUNC,
@@ -924,8 +1035,16 @@ typedef enum {
_1gtk_1tooltips_1force_1window_FUNC,
_1gtk_1tooltips_1new_FUNC,
_1gtk_1tooltips_1set_1tip_FUNC,
+#ifndef JNI64
_1gtk_1tree_1model_1get__III_3II_FUNC,
+#else
+ _1gtk_1tree_1model_1get__JJI_3IJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1tree_1model_1get__III_3JI_FUNC,
+#else
+ _1gtk_1tree_1model_1get__JJI_3JJ_FUNC,
+#endif
_1gtk_1tree_1model_1get_1iter_FUNC,
_1gtk_1tree_1model_1get_1iter_1first_FUNC,
_1gtk_1tree_1model_1get_1n_1columns_FUNC,
@@ -943,7 +1062,11 @@ typedef enum {
_1gtk_1tree_1path_1get_1indices_FUNC,
_1gtk_1tree_1path_1new_FUNC,
_1gtk_1tree_1path_1new_1first_FUNC,
+#ifndef JNI64
_1gtk_1tree_1path_1new_1from_1string__I_FUNC,
+#else
+ _1gtk_1tree_1path_1new_1from_1string__J_FUNC,
+#endif
_1gtk_1tree_1path_1new_1from_1string___3B_FUNC,
_1gtk_1tree_1path_1next_FUNC,
_1gtk_1tree_1path_1prev_FUNC,
@@ -963,11 +1086,31 @@ typedef enum {
_1gtk_1tree_1store_1insert_FUNC,
_1gtk_1tree_1store_1newv_FUNC,
_1gtk_1tree_1store_1remove_FUNC,
+#ifndef JNI64
_1gtk_1tree_1store_1set__IIIII_FUNC,
+#else
+ _1gtk_1tree_1store_1set__JJIIJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1tree_1store_1set__IIIJI_FUNC,
+#else
+ _1gtk_1tree_1store_1set__JJIJJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1tree_1store_1set__IIILorg_eclipse_swt_internal_gtk_GdkColor_2I_FUNC,
+#else
+ _1gtk_1tree_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkColor_2J_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1tree_1store_1set__IIIZI_FUNC,
+#else
+ _1gtk_1tree_1store_1set__JJIZJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1tree_1store_1set__III_3BI_FUNC,
+#else
+ _1gtk_1tree_1store_1set__JJI_3BJ_FUNC,
+#endif
_1gtk_1tree_1view_1collapse_1row_FUNC,
_1gtk_1tree_1view_1column_1add_1attribute_FUNC,
_1gtk_1tree_1view_1column_1cell_1get_1position_FUNC,
@@ -1024,6 +1167,7 @@ typedef enum {
_1gtk_1tree_1view_1set_1cursor_FUNC,
_1gtk_1tree_1view_1set_1drag_1dest_1row_FUNC,
_1gtk_1tree_1view_1set_1enable_1search_FUNC,
+ _1gtk_1tree_1view_1set_1grid_1lines_FUNC,
_1gtk_1tree_1view_1set_1headers_1visible_FUNC,
_1gtk_1tree_1view_1set_1model_FUNC,
_1gtk_1tree_1view_1set_1rules_1hint_FUNC,
@@ -1032,14 +1176,24 @@ typedef enum {
_1gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC,
_1gtk_1tree_1view_1widget_1to_1tree_1coords_FUNC,
_1gtk_1vbox_1new_FUNC,
+ _1gtk_1viewport_1get_1shadow_1type_FUNC,
+ _1gtk_1viewport_1set_1shadow_1type_FUNC,
_1gtk_1vscale_1new_FUNC,
_1gtk_1vscrollbar_1new_FUNC,
_1gtk_1vseparator_1new_FUNC,
_1gtk_1widget_1add_1accelerator_FUNC,
_1gtk_1widget_1add_1events_FUNC,
_1gtk_1widget_1child_1focus_FUNC,
+#ifndef JNI64
_1gtk_1widget_1create_1pango_1layout__II_FUNC,
+#else
+ _1gtk_1widget_1create_1pango_1layout__JJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1widget_1create_1pango_1layout__I_3B_FUNC,
+#else
+ _1gtk_1widget_1create_1pango_1layout__J_3B_FUNC,
+#endif
_1gtk_1widget_1destroy_FUNC,
_1gtk_1widget_1event_FUNC,
_1gtk_1widget_1get_1accessible_FUNC,
@@ -1088,8 +1242,16 @@ typedef enum {
_1gtk_1widget_1show_1now_FUNC,
_1gtk_1widget_1size_1allocate_FUNC,
_1gtk_1widget_1size_1request_FUNC,
+#ifndef JNI64
_1gtk_1widget_1style_1get__I_3B_3II_FUNC,
+#else
+ _1gtk_1widget_1style_1get__J_3B_3IJ_FUNC,
+#endif
+#ifndef JNI64
_1gtk_1widget_1style_1get__I_3B_3JI_FUNC,
+#else
+ _1gtk_1widget_1style_1get__J_3B_3JJ_FUNC,
+#endif
_1gtk_1widget_1translate_1coordinates_FUNC,
_1gtk_1widget_1unrealize_FUNC,
_1gtk_1window_1activate_1default_FUNC,
@@ -1214,7 +1376,6 @@ typedef enum {
_1pango_1layout_1iter_1next_1line_FUNC,
_1pango_1layout_1iter_1next_1run_FUNC,
_1pango_1layout_1line_1get_1extents_FUNC,
- _1pango_1layout_1line_1get_1resolved_1dir_FUNC,
_1pango_1layout_1line_1x_1to_1index_FUNC,
_1pango_1layout_1new_FUNC,
_1pango_1layout_1set_1alignment_FUNC,
@@ -1237,62 +1398,290 @@ typedef enum {
_1pango_1tab_1array_1set_1tab_FUNC,
g_1main_1context_1wakeup_FUNC,
localeconv_1decimal_1point_FUNC,
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GdkEventButton_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GdkEventExpose_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GdkEventExpose_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GdkEventMotion_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GdkEventMotion_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GtkAdjustment_2_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GtkFixed_2_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GtkTargetEntry_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GtkTargetEntry_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_PangoAttribute_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_XButtonEvent_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_XButtonEvent_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_XClientMessageEvent_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_XClientMessageEvent_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_XCrossingEvent_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_XCrossingEvent_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_XExposeEvent_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkColor_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkDragContext_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventAny_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventExpose_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventKey_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventMotion_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventScroll_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventVisibility_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEventWindowState_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkImage_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkRectangle_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GdkVisual_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkBorder_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkCellRendererClass_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkColorSelectionDialog_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkCombo_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkFileSelection_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkFixed_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkSelectionData_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkTargetPair_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2I_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_GtkWidgetClass_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrColor_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoAttrInt_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoAttribute_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoItem_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutLine_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoLayoutRun_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_PangoLogAttr_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_XButtonEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_XCrossingEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_XExposeEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_XFocusChangeEvent_2JJ_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2II_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_gtk_XVisibilityEvent_2JJ_FUNC,
+#endif
realpath_FUNC,
} OS_FUNCS;
diff --git a/os_structs.c b/os_structs.c
index b811d12..5ef3c53 100644
--- a/os_structs.c
+++ b/os_structs.c
@@ -29,27 +29,27 @@ void cacheGInterfaceInfoFields(JNIEnv *env, jobject lpObject)
{
if (GInterfaceInfoFc.cached) return;
GInterfaceInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", "I");
- GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", "I");
- GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", "I");
+ GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", I_J);
+ GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", I_J);
+ GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", I_J);
GInterfaceInfoFc.cached = 1;
}
GInterfaceInfo *getGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
{
if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
- lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_init);
- lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_finalize);
- lpStruct->interface_data = (gpointer)(*env)->GetIntField(env, lpObject, GInterfaceInfoFc.interface_data);
+ lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_init);
+ lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_finalize);
+ lpStruct->interface_data = (gpointer)(*env)->GetIntLongField(env, lpObject, GInterfaceInfoFc.interface_data);
return lpStruct;
}
void setGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
{
if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_init, (jint)lpStruct->interface_init);
- (*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jint)lpStruct->interface_finalize);
- (*env)->SetIntField(env, lpObject, GInterfaceInfoFc.interface_data, (jint)lpStruct->interface_data);
+ (*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_init, (jintLong)lpStruct->interface_init);
+ (*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jintLong)lpStruct->interface_finalize);
+ (*env)->SetIntLongField(env, lpObject, GInterfaceInfoFc.interface_data, (jintLong)lpStruct->interface_data);
}
#endif
@@ -66,39 +66,39 @@ void cacheGObjectClassFields(JNIEnv *env, jobject lpObject)
{
if (GObjectClassFc.cached) return;
GObjectClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", "I");
- GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", "I");
- GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", "I");
- GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", "I");
- GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", "I");
- GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", "I");
- GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", "I");
+ GObjectClassFc.constructor = (*env)->GetFieldID(env, GObjectClassFc.clazz, "constructor", I_J);
+ GObjectClassFc.set_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "set_property", I_J);
+ GObjectClassFc.get_property = (*env)->GetFieldID(env, GObjectClassFc.clazz, "get_property", I_J);
+ GObjectClassFc.dispose = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispose", I_J);
+ GObjectClassFc.finalize = (*env)->GetFieldID(env, GObjectClassFc.clazz, "finalize", I_J);
+ GObjectClassFc.dispatch_properties_changed = (*env)->GetFieldID(env, GObjectClassFc.clazz, "dispatch_properties_changed", I_J);
+ GObjectClassFc.notify = (*env)->GetFieldID(env, GObjectClassFc.clazz, "notify", I_J);
GObjectClassFc.cached = 1;
}
GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
{
if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
- lpStruct->constructor = (GObject *(*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.constructor);
- lpStruct->set_property = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.set_property);
- lpStruct->get_property = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.get_property);
- lpStruct->dispose = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.dispose);
- lpStruct->finalize = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.finalize);
- lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
- lpStruct->notify = (void (*)())(*env)->GetIntField(env, lpObject, GObjectClassFc.notify);
+ lpStruct->constructor = (GObject *(*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.constructor);
+ lpStruct->set_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.set_property);
+ lpStruct->get_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.get_property);
+ lpStruct->dispose = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispose);
+ lpStruct->finalize = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.finalize);
+ lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
+ lpStruct->notify = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.notify);
return lpStruct;
}
void setGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
{
if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.constructor, (jint)lpStruct->constructor);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.set_property, (jint)lpStruct->set_property);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.get_property, (jint)lpStruct->get_property);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.dispose, (jint)lpStruct->dispose);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.finalize, (jint)lpStruct->finalize);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jint)lpStruct->dispatch_properties_changed);
- (*env)->SetIntField(env, lpObject, GObjectClassFc.notify, (jint)lpStruct->notify);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.constructor, (jintLong)lpStruct->constructor);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.set_property, (jintLong)lpStruct->set_property);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.get_property, (jintLong)lpStruct->get_property);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.dispose, (jintLong)lpStruct->dispose);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.finalize, (jintLong)lpStruct->finalize);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed, (jintLong)lpStruct->dispatch_properties_changed);
+ (*env)->SetIntLongField(env, lpObject, GObjectClassFc.notify, (jintLong)lpStruct->notify);
}
#endif
@@ -116,15 +116,15 @@ void cacheGTypeInfoFields(JNIEnv *env, jobject lpObject)
if (GTypeInfoFc.cached) return;
GTypeInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
GTypeInfoFc.class_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_size", "S");
- GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", "I");
- GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", "I");
- GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", "I");
- GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", "I");
- GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", "I");
+ GTypeInfoFc.base_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_init", I_J);
+ GTypeInfoFc.base_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "base_finalize", I_J);
+ GTypeInfoFc.class_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_init", I_J);
+ GTypeInfoFc.class_finalize = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_finalize", I_J);
+ GTypeInfoFc.class_data = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "class_data", I_J);
GTypeInfoFc.instance_size = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_size", "S");
GTypeInfoFc.n_preallocs = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "n_preallocs", "S");
- GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", "I");
- GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", "I");
+ GTypeInfoFc.instance_init = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "instance_init", I_J);
+ GTypeInfoFc.value_table = (*env)->GetFieldID(env, GTypeInfoFc.clazz, "value_table", I_J);
GTypeInfoFc.cached = 1;
}
@@ -132,15 +132,15 @@ GTypeInfo *getGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct
{
if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject);
lpStruct->class_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.class_size);
- lpStruct->base_init = (GBaseInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.base_init);
- lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.base_finalize);
- lpStruct->class_init = (GClassInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_init);
- lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_finalize);
- lpStruct->class_data = (gconstpointer)(*env)->GetIntField(env, lpObject, GTypeInfoFc.class_data);
+ lpStruct->base_init = (GBaseInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.base_init);
+ lpStruct->base_finalize = (GBaseFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.base_finalize);
+ lpStruct->class_init = (GClassInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_init);
+ lpStruct->class_finalize = (GClassFinalizeFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_finalize);
+ lpStruct->class_data = (gconstpointer)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.class_data);
lpStruct->instance_size = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.instance_size);
lpStruct->n_preallocs = (guint16)(*env)->GetShortField(env, lpObject, GTypeInfoFc.n_preallocs);
- lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetIntField(env, lpObject, GTypeInfoFc.instance_init);
- lpStruct->value_table = (GTypeValueTable *)(*env)->GetIntField(env, lpObject, GTypeInfoFc.value_table);
+ lpStruct->instance_init = (GInstanceInitFunc)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.instance_init);
+ lpStruct->value_table = (GTypeValueTable *)(*env)->GetIntLongField(env, lpObject, GTypeInfoFc.value_table);
return lpStruct;
}
@@ -148,15 +148,15 @@ void setGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct)
{
if (!GTypeInfoFc.cached) cacheGTypeInfoFields(env, lpObject);
(*env)->SetShortField(env, lpObject, GTypeInfoFc.class_size, (jshort)lpStruct->class_size);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.base_init, (jint)lpStruct->base_init);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.base_finalize, (jint)lpStruct->base_finalize);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.class_init, (jint)lpStruct->class_init);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.class_finalize, (jint)lpStruct->class_finalize);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.class_data, (jint)lpStruct->class_data);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.base_init, (jintLong)lpStruct->base_init);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.base_finalize, (jintLong)lpStruct->base_finalize);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_init, (jintLong)lpStruct->class_init);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_finalize, (jintLong)lpStruct->class_finalize);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.class_data, (jintLong)lpStruct->class_data);
(*env)->SetShortField(env, lpObject, GTypeInfoFc.instance_size, (jshort)lpStruct->instance_size);
(*env)->SetShortField(env, lpObject, GTypeInfoFc.n_preallocs, (jshort)lpStruct->n_preallocs);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.instance_init, (jint)lpStruct->instance_init);
- (*env)->SetIntField(env, lpObject, GTypeInfoFc.value_table, (jint)lpStruct->value_table);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.instance_init, (jintLong)lpStruct->instance_init);
+ (*env)->SetIntLongField(env, lpObject, GTypeInfoFc.value_table, (jintLong)lpStruct->value_table);
}
#endif
@@ -174,7 +174,7 @@ void cacheGTypeQueryFields(JNIEnv *env, jobject lpObject)
if (GTypeQueryFc.cached) return;
GTypeQueryFc.clazz = (*env)->GetObjectClass(env, lpObject);
GTypeQueryFc.type = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type", "I");
- GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", "I");
+ GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", I_J);
GTypeQueryFc.class_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "class_size", "I");
GTypeQueryFc.instance_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "instance_size", "I");
GTypeQueryFc.cached = 1;
@@ -184,7 +184,7 @@ GTypeQuery *getGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStr
{
if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
lpStruct->type = (GType)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type);
- lpStruct->type_name = (const gchar *)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type_name);
+ lpStruct->type_name = (const gchar *)(*env)->GetIntLongField(env, lpObject, GTypeQueryFc.type_name);
lpStruct->class_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.class_size);
lpStruct->instance_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.instance_size);
return lpStruct;
@@ -194,7 +194,7 @@ void setGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct)
{
if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
(*env)->SetIntField(env, lpObject, GTypeQueryFc.type, (jint)lpStruct->type);
- (*env)->SetIntField(env, lpObject, GTypeQueryFc.type_name, (jint)lpStruct->type_name);
+ (*env)->SetIntLongField(env, lpObject, GTypeQueryFc.type_name, (jintLong)lpStruct->type_name);
(*env)->SetIntField(env, lpObject, GTypeQueryFc.class_size, (jint)lpStruct->class_size);
(*env)->SetIntField(env, lpObject, GTypeQueryFc.instance_size, (jint)lpStruct->instance_size);
}
@@ -255,9 +255,9 @@ void cacheGdkDragContextFields(JNIEnv *env, jobject lpObject)
GdkDragContextFc.clazz = (*env)->GetObjectClass(env, lpObject);
GdkDragContextFc.protocol = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "protocol", "I");
GdkDragContextFc.is_source = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "is_source", "Z");
- GdkDragContextFc.source_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "source_window", "I");
- GdkDragContextFc.dest_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "dest_window", "I");
- GdkDragContextFc.targets = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "targets", "I");
+ GdkDragContextFc.source_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "source_window", I_J);
+ GdkDragContextFc.dest_window = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "dest_window", I_J);
+ GdkDragContextFc.targets = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "targets", I_J);
GdkDragContextFc.actions = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "actions", "I");
GdkDragContextFc.suggested_action = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "suggested_action", "I");
GdkDragContextFc.action = (*env)->GetFieldID(env, GdkDragContextFc.clazz, "action", "I");
@@ -270,9 +270,9 @@ GdkDragContext *getGdkDragContextFields(JNIEnv *env, jobject lpObject, GdkDragCo
if (!GdkDragContextFc.cached) cacheGdkDragContextFields(env, lpObject);
lpStruct->protocol = (GdkDragProtocol)(*env)->GetIntField(env, lpObject, GdkDragContextFc.protocol);
lpStruct->is_source = (gboolean)(*env)->GetBooleanField(env, lpObject, GdkDragContextFc.is_source);
- lpStruct->source_window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.source_window);
- lpStruct->dest_window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.dest_window);
- lpStruct->targets = (GList *)(*env)->GetIntField(env, lpObject, GdkDragContextFc.targets);
+ lpStruct->source_window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkDragContextFc.source_window);
+ lpStruct->dest_window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkDragContextFc.dest_window);
+ lpStruct->targets = (GList *)(*env)->GetIntLongField(env, lpObject, GdkDragContextFc.targets);
lpStruct->actions = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.actions);
lpStruct->suggested_action = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.suggested_action);
lpStruct->action = (GdkDragAction)(*env)->GetIntField(env, lpObject, GdkDragContextFc.action);
@@ -285,9 +285,9 @@ void setGdkDragContextFields(JNIEnv *env, jobject lpObject, GdkDragContext *lpSt
if (!GdkDragContextFc.cached) cacheGdkDragContextFields(env, lpObject);
(*env)->SetIntField(env, lpObject, GdkDragContextFc.protocol, (jint)lpStruct->protocol);
(*env)->SetBooleanField(env, lpObject, GdkDragContextFc.is_source, (jboolean)lpStruct->is_source);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.source_window, (jint)lpStruct->source_window);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.dest_window, (jint)lpStruct->dest_window);
- (*env)->SetIntField(env, lpObject, GdkDragContextFc.targets, (jint)lpStruct->targets);
+ (*env)->SetIntLongField(env, lpObject, GdkDragContextFc.source_window, (jintLong)lpStruct->source_window);
+ (*env)->SetIntLongField(env, lpObject, GdkDragContextFc.dest_window, (jintLong)lpStruct->dest_window);
+ (*env)->SetIntLongField(env, lpObject, GdkDragContextFc.targets, (jintLong)lpStruct->targets);
(*env)->SetIntField(env, lpObject, GdkDragContextFc.actions, (jint)lpStruct->actions);
(*env)->SetIntField(env, lpObject, GdkDragContextFc.suggested_action, (jint)lpStruct->suggested_action);
(*env)->SetIntField(env, lpObject, GdkDragContextFc.action, (jint)lpStruct->action);
@@ -340,7 +340,7 @@ void cacheGdkEventAnyFields(JNIEnv *env, jobject lpObject)
if (GdkEventAnyFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventAnyFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", "I");
+ GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", I_J);
GdkEventAnyFc.send_event = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "send_event", "B");
GdkEventAnyFc.cached = 1;
}
@@ -349,7 +349,7 @@ GdkEventAny *getGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lp
{
if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventAnyFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventAnyFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventAnyFc.send_event);
return lpStruct;
}
@@ -358,7 +358,7 @@ void setGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct)
{
if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventAnyFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventAnyFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventAnyFc.send_event, (jbyte)lpStruct->send_event);
}
#endif
@@ -377,15 +377,15 @@ void cacheGdkEventButtonFields(JNIEnv *env, jobject lpObject)
if (GdkEventButtonFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventButtonFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", "I");
+ GdkEventButtonFc.window = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "window", I_J);
GdkEventButtonFc.send_event = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "send_event", "B");
GdkEventButtonFc.time = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "time", "I");
GdkEventButtonFc.x = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x", "D");
GdkEventButtonFc.y = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y", "D");
- GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", "I");
+ GdkEventButtonFc.axes = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "axes", I_J);
GdkEventButtonFc.state = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "state", "I");
GdkEventButtonFc.button = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "button", "I");
- GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", "I");
+ GdkEventButtonFc.device = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "device", I_J);
GdkEventButtonFc.x_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "x_root", "D");
GdkEventButtonFc.y_root = (*env)->GetFieldID(env, GdkEventButtonFc.clazz, "y_root", "D");
GdkEventButtonFc.cached = 1;
@@ -395,15 +395,15 @@ GdkEventButton *getGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventB
{
if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventButtonFc.send_event);
lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.time);
lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x);
lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y);
- lpStruct->axes = (gdouble *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.axes);
+ lpStruct->axes = (gdouble *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.axes);
lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.state);
lpStruct->button = (guint)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.button);
- lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventButtonFc.device);
+ lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventButtonFc.device);
lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.x_root);
lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventButtonFc.y_root);
return lpStruct;
@@ -413,15 +413,15 @@ void setGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventButton *lpSt
{
if (!GdkEventButtonFc.cached) cacheGdkEventButtonFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventButtonFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventButtonFc.time, (jint)lpStruct->time);
(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x, (jdouble)lpStruct->x);
(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y, (jdouble)lpStruct->y);
- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.axes, (jint)lpStruct->axes);
+ (*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.axes, (jintLong)lpStruct->axes);
(*env)->SetIntField(env, lpObject, GdkEventButtonFc.state, (jint)lpStruct->state);
(*env)->SetIntField(env, lpObject, GdkEventButtonFc.button, (jint)lpStruct->button);
- (*env)->SetIntField(env, lpObject, GdkEventButtonFc.device, (jint)lpStruct->device);
+ (*env)->SetIntLongField(env, lpObject, GdkEventButtonFc.device, (jintLong)lpStruct->device);
(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.x_root, (jdouble)lpStruct->x_root);
(*env)->SetDoubleField(env, lpObject, GdkEventButtonFc.y_root, (jdouble)lpStruct->y_root);
}
@@ -441,9 +441,9 @@ void cacheGdkEventCrossingFields(JNIEnv *env, jobject lpObject)
if (GdkEventCrossingFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventCrossingFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", "I");
+ GdkEventCrossingFc.window = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "window", I_J);
GdkEventCrossingFc.send_event = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "send_event", "B");
- GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", "I");
+ GdkEventCrossingFc.subwindow = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "subwindow", I_J);
GdkEventCrossingFc.time = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "time", "I");
GdkEventCrossingFc.x = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "x", "D");
GdkEventCrossingFc.y = (*env)->GetFieldID(env, GdkEventCrossingFc.clazz, "y", "D");
@@ -460,9 +460,9 @@ GdkEventCrossing *getGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEv
{
if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventCrossingFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventCrossingFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventCrossingFc.send_event);
- lpStruct->subwindow = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventCrossingFc.subwindow);
+ lpStruct->subwindow = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventCrossingFc.subwindow);
lpStruct->time = (*env)->GetIntField(env, lpObject, GdkEventCrossingFc.time);
lpStruct->x = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.x);
lpStruct->y = (*env)->GetDoubleField(env, lpObject, GdkEventCrossingFc.y);
@@ -479,9 +479,9 @@ void setGdkEventCrossingFields(JNIEnv *env, jobject lpObject, GdkEventCrossing *
{
if (!GdkEventCrossingFc.cached) cacheGdkEventCrossingFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventCrossingFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventCrossingFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventCrossingFc.send_event, (jbyte)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, GdkEventCrossingFc.subwindow, (jint)lpStruct->subwindow);
+ (*env)->SetIntLongField(env, lpObject, GdkEventCrossingFc.subwindow, (jintLong)lpStruct->subwindow);
(*env)->SetIntField(env, lpObject, GdkEventCrossingFc.time, (jint)lpStruct->time);
(*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.x, (jdouble)lpStruct->x);
(*env)->SetDoubleField(env, lpObject, GdkEventCrossingFc.y, (jdouble)lpStruct->y);
@@ -508,13 +508,13 @@ void cacheGdkEventExposeFields(JNIEnv *env, jobject lpObject)
if (GdkEventExposeFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventExposeFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", "I");
+ GdkEventExposeFc.window = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "window", I_J);
GdkEventExposeFc.send_event = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "send_event", "B");
GdkEventExposeFc.area_x = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_x", "I");
GdkEventExposeFc.area_y = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_y", "I");
GdkEventExposeFc.area_width = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_width", "I");
GdkEventExposeFc.area_height = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "area_height", "I");
- GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", "I");
+ GdkEventExposeFc.region = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "region", I_J);
GdkEventExposeFc.count = (*env)->GetFieldID(env, GdkEventExposeFc.clazz, "count", "I");
GdkEventExposeFc.cached = 1;
}
@@ -523,13 +523,13 @@ GdkEventExpose *getGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventE
{
if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventExposeFc.send_event);
lpStruct->area.x = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_x);
lpStruct->area.y = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_y);
lpStruct->area.width = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_width);
lpStruct->area.height = (*env)->GetIntField(env, lpObject, GdkEventExposeFc.area_height);
- lpStruct->region = (GdkRegion *)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.region);
+ lpStruct->region = (GdkRegion *)(*env)->GetIntLongField(env, lpObject, GdkEventExposeFc.region);
lpStruct->count = (gint)(*env)->GetIntField(env, lpObject, GdkEventExposeFc.count);
return lpStruct;
}
@@ -538,13 +538,13 @@ void setGdkEventExposeFields(JNIEnv *env, jobject lpObject, GdkEventExpose *lpSt
{
if (!GdkEventExposeFc.cached) cacheGdkEventExposeFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventExposeFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventExposeFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_x, (jint)lpStruct->area.x);
(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_y, (jint)lpStruct->area.y);
(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_width, (jint)lpStruct->area.width);
(*env)->SetIntField(env, lpObject, GdkEventExposeFc.area_height, (jint)lpStruct->area.height);
- (*env)->SetIntField(env, lpObject, GdkEventExposeFc.region, (jint)lpStruct->region);
+ (*env)->SetIntLongField(env, lpObject, GdkEventExposeFc.region, (jintLong)lpStruct->region);
(*env)->SetIntField(env, lpObject, GdkEventExposeFc.count, (jint)lpStruct->count);
}
#endif
@@ -563,7 +563,7 @@ void cacheGdkEventFocusFields(JNIEnv *env, jobject lpObject)
if (GdkEventFocusFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventFocusFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", "I");
+ GdkEventFocusFc.window = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "window", I_J);
GdkEventFocusFc.send_event = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "send_event", "B");
GdkEventFocusFc.in = (*env)->GetFieldID(env, GdkEventFocusFc.clazz, "in", "S");
GdkEventFocusFc.cached = 1;
@@ -573,7 +573,7 @@ GdkEventFocus *getGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFoc
{
if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventFocusFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventFocusFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventFocusFc.send_event);
lpStruct->in = (gint16)(*env)->GetShortField(env, lpObject, GdkEventFocusFc.in);
return lpStruct;
@@ -583,7 +583,7 @@ void setGdkEventFocusFields(JNIEnv *env, jobject lpObject, GdkEventFocus *lpStru
{
if (!GdkEventFocusFc.cached) cacheGdkEventFocusFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventFocusFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventFocusFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventFocusFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetShortField(env, lpObject, GdkEventFocusFc.in, (jshort)lpStruct->in);
}
@@ -603,13 +603,13 @@ void cacheGdkEventKeyFields(JNIEnv *env, jobject lpObject)
if (GdkEventKeyFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventKeyFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", "I");
+ GdkEventKeyFc.window = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "window", I_J);
GdkEventKeyFc.send_event = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "send_event", "B");
GdkEventKeyFc.time = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "time", "I");
GdkEventKeyFc.state = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "state", "I");
GdkEventKeyFc.keyval = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "keyval", "I");
GdkEventKeyFc.length = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "length", "I");
- GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", "I");
+ GdkEventKeyFc.string = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "string", I_J);
GdkEventKeyFc.hardware_keycode = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "hardware_keycode", "S");
GdkEventKeyFc.group = (*env)->GetFieldID(env, GdkEventKeyFc.clazz, "group", "B");
GdkEventKeyFc.cached = 1;
@@ -619,13 +619,13 @@ GdkEventKey *getGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lp
{
if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventKeyFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.send_event);
lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.time);
lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.state);
lpStruct->keyval = (guint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.keyval);
lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.length);
- lpStruct->string = (gchar *)(*env)->GetIntField(env, lpObject, GdkEventKeyFc.string);
+ lpStruct->string = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkEventKeyFc.string);
lpStruct->hardware_keycode = (guint16)(*env)->GetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode);
lpStruct->group = (guint8)(*env)->GetByteField(env, lpObject, GdkEventKeyFc.group);
return lpStruct;
@@ -635,13 +635,13 @@ void setGdkEventKeyFields(JNIEnv *env, jobject lpObject, GdkEventKey *lpStruct)
{
if (!GdkEventKeyFc.cached) cacheGdkEventKeyFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventKeyFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventKeyFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventKeyFc.time, (jint)lpStruct->time);
(*env)->SetIntField(env, lpObject, GdkEventKeyFc.state, (jint)lpStruct->state);
(*env)->SetIntField(env, lpObject, GdkEventKeyFc.keyval, (jint)lpStruct->keyval);
(*env)->SetIntField(env, lpObject, GdkEventKeyFc.length, (jint)lpStruct->length);
- (*env)->SetIntField(env, lpObject, GdkEventKeyFc.string, (jint)lpStruct->string);
+ (*env)->SetIntLongField(env, lpObject, GdkEventKeyFc.string, (jintLong)lpStruct->string);
(*env)->SetShortField(env, lpObject, GdkEventKeyFc.hardware_keycode, (jshort)lpStruct->hardware_keycode);
(*env)->SetByteField(env, lpObject, GdkEventKeyFc.group, (jbyte)lpStruct->group);
}
@@ -661,15 +661,15 @@ void cacheGdkEventMotionFields(JNIEnv *env, jobject lpObject)
if (GdkEventMotionFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventMotionFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", "I");
+ GdkEventMotionFc.window = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "window", I_J);
GdkEventMotionFc.send_event = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "send_event", "B");
GdkEventMotionFc.time = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "time", "I");
GdkEventMotionFc.x = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x", "D");
GdkEventMotionFc.y = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y", "D");
- GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", "I");
+ GdkEventMotionFc.axes = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "axes", I_J);
GdkEventMotionFc.state = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "state", "I");
GdkEventMotionFc.is_hint = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "is_hint", "S");
- GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", "I");
+ GdkEventMotionFc.device = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "device", I_J);
GdkEventMotionFc.x_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "x_root", "D");
GdkEventMotionFc.y_root = (*env)->GetFieldID(env, GdkEventMotionFc.clazz, "y_root", "D");
GdkEventMotionFc.cached = 1;
@@ -679,15 +679,15 @@ GdkEventMotion *getGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventM
{
if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventMotionFc.send_event);
lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.time);
lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x);
lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y);
- lpStruct->axes = (gdouble *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.axes);
+ lpStruct->axes = (gdouble *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.axes);
lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.state);
lpStruct->is_hint = (gint16)(*env)->GetShortField(env, lpObject, GdkEventMotionFc.is_hint);
- lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventMotionFc.device);
+ lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventMotionFc.device);
lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.x_root);
lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventMotionFc.y_root);
return lpStruct;
@@ -697,15 +697,15 @@ void setGdkEventMotionFields(JNIEnv *env, jobject lpObject, GdkEventMotion *lpSt
{
if (!GdkEventMotionFc.cached) cacheGdkEventMotionFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventMotionFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventMotionFc.time, (jint)lpStruct->time);
(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x, (jdouble)lpStruct->x);
(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y, (jdouble)lpStruct->y);
- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.axes, (jint)lpStruct->axes);
+ (*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.axes, (jintLong)lpStruct->axes);
(*env)->SetIntField(env, lpObject, GdkEventMotionFc.state, (jint)lpStruct->state);
(*env)->SetShortField(env, lpObject, GdkEventMotionFc.is_hint, (jshort)lpStruct->is_hint);
- (*env)->SetIntField(env, lpObject, GdkEventMotionFc.device, (jint)lpStruct->device);
+ (*env)->SetIntLongField(env, lpObject, GdkEventMotionFc.device, (jintLong)lpStruct->device);
(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.x_root, (jdouble)lpStruct->x_root);
(*env)->SetDoubleField(env, lpObject, GdkEventMotionFc.y_root, (jdouble)lpStruct->y_root);
}
@@ -725,14 +725,14 @@ void cacheGdkEventScrollFields(JNIEnv *env, jobject lpObject)
if (GdkEventScrollFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventScrollFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventScrollFc.window = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "window", "I");
+ GdkEventScrollFc.window = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "window", I_J);
GdkEventScrollFc.send_event = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "send_event", "B");
GdkEventScrollFc.time = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "time", "I");
GdkEventScrollFc.x = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "x", "D");
GdkEventScrollFc.y = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "y", "D");
GdkEventScrollFc.state = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "state", "I");
GdkEventScrollFc.direction = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "direction", "I");
- GdkEventScrollFc.device = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "device", "I");
+ GdkEventScrollFc.device = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "device", I_J);
GdkEventScrollFc.x_root = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "x_root", "D");
GdkEventScrollFc.y_root = (*env)->GetFieldID(env, GdkEventScrollFc.clazz, "y_root", "D");
GdkEventScrollFc.cached = 1;
@@ -742,14 +742,14 @@ GdkEventScroll *getGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventS
{
if (!GdkEventScrollFc.cached) cacheGdkEventScrollFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventScrollFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventScrollFc.send_event);
lpStruct->time = (guint32)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.time);
lpStruct->x = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.x);
lpStruct->y = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.y);
lpStruct->state = (guint)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.state);
lpStruct->direction = (GdkScrollDirection)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.direction);
- lpStruct->device = (GdkDevice *)(*env)->GetIntField(env, lpObject, GdkEventScrollFc.device);
+ lpStruct->device = (GdkDevice *)(*env)->GetIntLongField(env, lpObject, GdkEventScrollFc.device);
lpStruct->x_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.x_root);
lpStruct->y_root = (gdouble)(*env)->GetDoubleField(env, lpObject, GdkEventScrollFc.y_root);
return lpStruct;
@@ -759,14 +759,14 @@ void setGdkEventScrollFields(JNIEnv *env, jobject lpObject, GdkEventScroll *lpSt
{
if (!GdkEventScrollFc.cached) cacheGdkEventScrollFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventScrollFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventScrollFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventScrollFc.time, (jint)lpStruct->time);
(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.x, (jdouble)lpStruct->x);
(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.y, (jdouble)lpStruct->y);
(*env)->SetIntField(env, lpObject, GdkEventScrollFc.state, (jint)lpStruct->state);
(*env)->SetIntField(env, lpObject, GdkEventScrollFc.direction, (jint)lpStruct->direction);
- (*env)->SetIntField(env, lpObject, GdkEventScrollFc.device, (jint)lpStruct->device);
+ (*env)->SetIntLongField(env, lpObject, GdkEventScrollFc.device, (jintLong)lpStruct->device);
(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.x_root, (jdouble)lpStruct->x_root);
(*env)->SetDoubleField(env, lpObject, GdkEventScrollFc.y_root, (jdouble)lpStruct->y_root);
}
@@ -786,7 +786,7 @@ void cacheGdkEventVisibilityFields(JNIEnv *env, jobject lpObject)
if (GdkEventVisibilityFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventVisibilityFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventVisibilityFc.window = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "window", "I");
+ GdkEventVisibilityFc.window = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "window", I_J);
GdkEventVisibilityFc.send_event = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "send_event", "B");
GdkEventVisibilityFc.state = (*env)->GetFieldID(env, GdkEventVisibilityFc.clazz, "state", "I");
GdkEventVisibilityFc.cached = 1;
@@ -796,7 +796,7 @@ GdkEventVisibility *getGdkEventVisibilityFields(JNIEnv *env, jobject lpObject, G
{
if (!GdkEventVisibilityFc.cached) cacheGdkEventVisibilityFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventVisibilityFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventVisibilityFc.window);
lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventVisibilityFc.send_event);
lpStruct->state = (GdkVisibilityState)(*env)->GetIntField(env, lpObject, GdkEventVisibilityFc.state);
return lpStruct;
@@ -806,7 +806,7 @@ void setGdkEventVisibilityFields(JNIEnv *env, jobject lpObject, GdkEventVisibili
{
if (!GdkEventVisibilityFc.cached) cacheGdkEventVisibilityFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventVisibilityFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventVisibilityFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventVisibilityFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventVisibilityFc.state, (jint)lpStruct->state);
}
@@ -826,7 +826,7 @@ void cacheGdkEventWindowStateFields(JNIEnv *env, jobject lpObject)
if (GdkEventWindowStateFc.cached) return;
cacheGdkEventFields(env, lpObject);
GdkEventWindowStateFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", "I");
+ GdkEventWindowStateFc.window = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "window", I_J);
GdkEventWindowStateFc.send_event = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "send_event", "B");
GdkEventWindowStateFc.changed_mask = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "changed_mask", "I");
GdkEventWindowStateFc.new_window_state = (*env)->GetFieldID(env, GdkEventWindowStateFc.clazz, "new_window_state", "I");
@@ -837,7 +837,7 @@ GdkEventWindowState *getGdkEventWindowStateFields(JNIEnv *env, jobject lpObject,
{
if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject);
getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- lpStruct->window = (GdkWindow *)(*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.window);
+ lpStruct->window = (GdkWindow *)(*env)->GetIntLongField(env, lpObject, GdkEventWindowStateFc.window);
lpStruct->send_event = (*env)->GetByteField(env, lpObject, GdkEventWindowStateFc.send_event);
lpStruct->changed_mask = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask);
lpStruct->new_window_state = (*env)->GetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state);
@@ -848,7 +848,7 @@ void setGdkEventWindowStateFields(JNIEnv *env, jobject lpObject, GdkEventWindowS
{
if (!GdkEventWindowStateFc.cached) cacheGdkEventWindowStateFields(env, lpObject);
setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, GdkEventWindowStateFc.window, (jintLong)lpStruct->window);
(*env)->SetByteField(env, lpObject, GdkEventWindowStateFc.send_event, (jbyte)lpStruct->send_event);
(*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.changed_mask, (jint)lpStruct->changed_mask);
(*env)->SetIntField(env, lpObject, GdkEventWindowStateFc.new_window_state, (jint)lpStruct->new_window_state);
@@ -876,12 +876,12 @@ void cacheGdkGCValuesFields(JNIEnv *env, jobject lpObject)
GdkGCValuesFc.background_red = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_red", "S");
GdkGCValuesFc.background_green = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_green", "S");
GdkGCValuesFc.background_blue = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "background_blue", "S");
- GdkGCValuesFc.font = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "font", "I");
- GdkGCValuesFc.function = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "function", "I");
+ GdkGCValuesFc.font = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "font", I_J);
+ GdkGCValuesFc.function = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "function", I_J);
GdkGCValuesFc.fill = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "fill", "I");
- GdkGCValuesFc.tile = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "tile", "I");
- GdkGCValuesFc.stipple = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "stipple", "I");
- GdkGCValuesFc.clip_mask = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "clip_mask", "I");
+ GdkGCValuesFc.tile = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "tile", I_J);
+ GdkGCValuesFc.stipple = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "stipple", I_J);
+ GdkGCValuesFc.clip_mask = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "clip_mask", I_J);
GdkGCValuesFc.subwindow_mode = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "subwindow_mode", "I");
GdkGCValuesFc.ts_x_origin = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "ts_x_origin", "I");
GdkGCValuesFc.ts_y_origin = (*env)->GetFieldID(env, GdkGCValuesFc.clazz, "ts_y_origin", "I");
@@ -906,12 +906,12 @@ GdkGCValues *getGdkGCValuesFields(JNIEnv *env, jobject lpObject, GdkGCValues *lp
lpStruct->background.red = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_red);
lpStruct->background.green = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_green);
lpStruct->background.blue = (guint16)(*env)->GetShortField(env, lpObject, GdkGCValuesFc.background_blue);
- lpStruct->font = (GdkFont *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.font);
- lpStruct->function = (GdkFunction)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.function);
+ lpStruct->font = (GdkFont *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.font);
+ lpStruct->function = (GdkFunction)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.function);
lpStruct->fill = (GdkFill)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.fill);
- lpStruct->tile = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.tile);
- lpStruct->stipple = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.stipple);
- lpStruct->clip_mask = (GdkPixmap *)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.clip_mask);
+ lpStruct->tile = (GdkPixmap *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.tile);
+ lpStruct->stipple = (GdkPixmap *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.stipple);
+ lpStruct->clip_mask = (GdkPixmap *)(*env)->GetIntLongField(env, lpObject, GdkGCValuesFc.clip_mask);
lpStruct->subwindow_mode = (GdkSubwindowMode)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.subwindow_mode);
lpStruct->ts_x_origin = (gint)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.ts_x_origin);
lpStruct->ts_y_origin = (gint)(*env)->GetIntField(env, lpObject, GdkGCValuesFc.ts_y_origin);
@@ -936,12 +936,12 @@ void setGdkGCValuesFields(JNIEnv *env, jobject lpObject, GdkGCValues *lpStruct)
(*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_red, (jshort)lpStruct->background.red);
(*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_green, (jshort)lpStruct->background.green);
(*env)->SetShortField(env, lpObject, GdkGCValuesFc.background_blue, (jshort)lpStruct->background.blue);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.font, (jint)lpStruct->font);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.function, (jint)lpStruct->function);
+ (*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.font, (jintLong)lpStruct->font);
+ (*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.function, (jintLong)lpStruct->function);
(*env)->SetIntField(env, lpObject, GdkGCValuesFc.fill, (jint)lpStruct->fill);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.tile, (jint)lpStruct->tile);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.stipple, (jint)lpStruct->stipple);
- (*env)->SetIntField(env, lpObject, GdkGCValuesFc.clip_mask, (jint)lpStruct->clip_mask);
+ (*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.tile, (jintLong)lpStruct->tile);
+ (*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.stipple, (jintLong)lpStruct->stipple);
+ (*env)->SetIntLongField(env, lpObject, GdkGCValuesFc.clip_mask, (jintLong)lpStruct->clip_mask);
(*env)->SetIntField(env, lpObject, GdkGCValuesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
(*env)->SetIntField(env, lpObject, GdkGCValuesFc.ts_x_origin, (jint)lpStruct->ts_x_origin);
(*env)->SetIntField(env, lpObject, GdkGCValuesFc.ts_y_origin, (jint)lpStruct->ts_y_origin);
@@ -1030,7 +1030,7 @@ void cacheGdkImageFields(JNIEnv *env, jobject lpObject)
if (GdkImageFc.cached) return;
GdkImageFc.clazz = (*env)->GetObjectClass(env, lpObject);
GdkImageFc.type = (*env)->GetFieldID(env, GdkImageFc.clazz, "type", "I");
- GdkImageFc.visual = (*env)->GetFieldID(env, GdkImageFc.clazz, "visual", "I");
+ GdkImageFc.visual = (*env)->GetFieldID(env, GdkImageFc.clazz, "visual", I_J);
GdkImageFc.byte_order = (*env)->GetFieldID(env, GdkImageFc.clazz, "byte_order", "I");
GdkImageFc.width = (*env)->GetFieldID(env, GdkImageFc.clazz, "width", "I");
GdkImageFc.height = (*env)->GetFieldID(env, GdkImageFc.clazz, "height", "I");
@@ -1038,9 +1038,9 @@ void cacheGdkImageFields(JNIEnv *env, jobject lpObject)
GdkImageFc.bpp = (*env)->GetFieldID(env, GdkImageFc.clazz, "bpp", "S");
GdkImageFc.bpl = (*env)->GetFieldID(env, GdkImageFc.clazz, "bpl", "S");
GdkImageFc.bits_per_pixel = (*env)->GetFieldID(env, GdkImageFc.clazz, "bits_per_pixel", "S");
- GdkImageFc.mem = (*env)->GetFieldID(env, GdkImageFc.clazz, "mem", "I");
- GdkImageFc.colormap = (*env)->GetFieldID(env, GdkImageFc.clazz, "colormap", "I");
- GdkImageFc.windowing_data = (*env)->GetFieldID(env, GdkImageFc.clazz, "windowing_data", "I");
+ GdkImageFc.mem = (*env)->GetFieldID(env, GdkImageFc.clazz, "mem", I_J);
+ GdkImageFc.colormap = (*env)->GetFieldID(env, GdkImageFc.clazz, "colormap", I_J);
+ GdkImageFc.windowing_data = (*env)->GetFieldID(env, GdkImageFc.clazz, "windowing_data", I_J);
GdkImageFc.cached = 1;
}
@@ -1048,7 +1048,7 @@ GdkImage *getGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
{
if (!GdkImageFc.cached) cacheGdkImageFields(env, lpObject);
lpStruct->type = (GdkImageType)(*env)->GetIntField(env, lpObject, GdkImageFc.type);
- lpStruct->visual = (GdkVisual *)(*env)->GetIntField(env, lpObject, GdkImageFc.visual);
+ lpStruct->visual = (GdkVisual *)(*env)->GetIntLongField(env, lpObject, GdkImageFc.visual);
lpStruct->byte_order = (GdkByteOrder)(*env)->GetIntField(env, lpObject, GdkImageFc.byte_order);
lpStruct->width = (gint)(*env)->GetIntField(env, lpObject, GdkImageFc.width);
lpStruct->height = (gint)(*env)->GetIntField(env, lpObject, GdkImageFc.height);
@@ -1056,9 +1056,9 @@ GdkImage *getGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
lpStruct->bpp = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bpp);
lpStruct->bpl = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bpl);
lpStruct->bits_per_pixel = (guint16)(*env)->GetShortField(env, lpObject, GdkImageFc.bits_per_pixel);
- lpStruct->mem = (gpointer)(*env)->GetIntField(env, lpObject, GdkImageFc.mem);
- lpStruct->colormap = (GdkColormap *)(*env)->GetIntField(env, lpObject, GdkImageFc.colormap);
- lpStruct->windowing_data = (gpointer)(*env)->GetIntField(env, lpObject, GdkImageFc.windowing_data);
+ lpStruct->mem = (gpointer)(*env)->GetIntLongField(env, lpObject, GdkImageFc.mem);
+ lpStruct->colormap = (GdkColormap *)(*env)->GetIntLongField(env, lpObject, GdkImageFc.colormap);
+ lpStruct->windowing_data = (gpointer)(*env)->GetIntLongField(env, lpObject, GdkImageFc.windowing_data);
return lpStruct;
}
@@ -1066,7 +1066,7 @@ void setGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
{
if (!GdkImageFc.cached) cacheGdkImageFields(env, lpObject);
(*env)->SetIntField(env, lpObject, GdkImageFc.type, (jint)lpStruct->type);
- (*env)->SetIntField(env, lpObject, GdkImageFc.visual, (jint)lpStruct->visual);
+ (*env)->SetIntLongField(env, lpObject, GdkImageFc.visual, (jintLong)lpStruct->visual);
(*env)->SetIntField(env, lpObject, GdkImageFc.byte_order, (jint)lpStruct->byte_order);
(*env)->SetIntField(env, lpObject, GdkImageFc.width, (jint)lpStruct->width);
(*env)->SetIntField(env, lpObject, GdkImageFc.height, (jint)lpStruct->height);
@@ -1074,9 +1074,9 @@ void setGdkImageFields(JNIEnv *env, jobject lpObject, GdkImage *lpStruct)
(*env)->SetShortField(env, lpObject, GdkImageFc.bpp, (jshort)lpStruct->bpp);
(*env)->SetShortField(env, lpObject, GdkImageFc.bpl, (jshort)lpStruct->bpl);
(*env)->SetShortField(env, lpObject, GdkImageFc.bits_per_pixel, (jshort)lpStruct->bits_per_pixel);
- (*env)->SetIntField(env, lpObject, GdkImageFc.mem, (jint)lpStruct->mem);
- (*env)->SetIntField(env, lpObject, GdkImageFc.colormap, (jint)lpStruct->colormap);
- (*env)->SetIntField(env, lpObject, GdkImageFc.windowing_data, (jint)lpStruct->windowing_data);
+ (*env)->SetIntLongField(env, lpObject, GdkImageFc.mem, (jintLong)lpStruct->mem);
+ (*env)->SetIntLongField(env, lpObject, GdkImageFc.colormap, (jintLong)lpStruct->colormap);
+ (*env)->SetIntLongField(env, lpObject, GdkImageFc.windowing_data, (jintLong)lpStruct->windowing_data);
}
#endif
@@ -1203,19 +1203,19 @@ void cacheGdkWindowAttrFields(JNIEnv *env, jobject lpObject)
{
if (GdkWindowAttrFc.cached) return;
GdkWindowAttrFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", "I");
+ GdkWindowAttrFc.title = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "title", I_J);
GdkWindowAttrFc.event_mask = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "event_mask", "I");
GdkWindowAttrFc.x = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "x", "I");
GdkWindowAttrFc.y = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "y", "I");
GdkWindowAttrFc.width = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "width", "I");
GdkWindowAttrFc.height = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "height", "I");
GdkWindowAttrFc.wclass = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wclass", "I");
- GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", "I");
- GdkWindowAttrFc.colormap = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "colormap", "I");
+ GdkWindowAttrFc.visual = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "visual", I_J);
+ GdkWindowAttrFc.colormap = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "colormap", I_J);
GdkWindowAttrFc.window_type = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "window_type", "I");
- GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", "I");
- GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", "I");
- GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", "I");
+ GdkWindowAttrFc.cursor = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "cursor", I_J);
+ GdkWindowAttrFc.wmclass_name = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_name", I_J);
+ GdkWindowAttrFc.wmclass_class = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "wmclass_class", I_J);
GdkWindowAttrFc.override_redirect = (*env)->GetFieldID(env, GdkWindowAttrFc.clazz, "override_redirect", "Z");
GdkWindowAttrFc.cached = 1;
}
@@ -1223,19 +1223,19 @@ void cacheGdkWindowAttrFields(JNIEnv *env, jobject lpObject)
GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct)
{
if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject);
- lpStruct->title = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.title);
+ lpStruct->title = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.title);
lpStruct->event_mask = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.event_mask);
lpStruct->x = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.x);
lpStruct->y = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.y);
lpStruct->width = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.width);
lpStruct->height = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.height);
lpStruct->wclass = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wclass);
- lpStruct->visual = (GdkVisual *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.visual);
- lpStruct->colormap = (GdkColormap *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.colormap);
+ lpStruct->visual = (GdkVisual *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.visual);
+ lpStruct->colormap = (GdkColormap *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.colormap);
lpStruct->window_type = (*env)->GetIntField(env, lpObject, GdkWindowAttrFc.window_type);
- lpStruct->cursor = (GdkCursor *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.cursor);
- lpStruct->wmclass_name = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wmclass_name);
- lpStruct->wmclass_class = (gchar *)(*env)->GetIntField(env, lpObject, GdkWindowAttrFc.wmclass_class);
+ lpStruct->cursor = (GdkCursor *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.cursor);
+ lpStruct->wmclass_name = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_name);
+ lpStruct->wmclass_class = (gchar *)(*env)->GetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_class);
lpStruct->override_redirect = (*env)->GetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect);
return lpStruct;
}
@@ -1243,19 +1243,19 @@ GdkWindowAttr *getGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAt
void setGdkWindowAttrFields(JNIEnv *env, jobject lpObject, GdkWindowAttr *lpStruct)
{
if (!GdkWindowAttrFc.cached) cacheGdkWindowAttrFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.title, (jint)lpStruct->title);
+ (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.title, (jintLong)lpStruct->title);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.event_mask, (jint)lpStruct->event_mask);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.x, (jint)lpStruct->x);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.y, (jint)lpStruct->y);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.width, (jint)lpStruct->width);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.height, (jint)lpStruct->height);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wclass, (jint)lpStruct->wclass);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.visual, (jint)lpStruct->visual);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.colormap, (jint)lpStruct->colormap);
+ (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.visual, (jintLong)lpStruct->visual);
+ (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.colormap, (jintLong)lpStruct->colormap);
(*env)->SetIntField(env, lpObject, GdkWindowAttrFc.window_type, (jint)lpStruct->window_type);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.cursor, (jint)lpStruct->cursor);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jint)lpStruct->wmclass_name);
- (*env)->SetIntField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jint)lpStruct->wmclass_class);
+ (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.cursor, (jintLong)lpStruct->cursor);
+ (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_name, (jintLong)lpStruct->wmclass_name);
+ (*env)->SetIntLongField(env, lpObject, GdkWindowAttrFc.wmclass_class, (jintLong)lpStruct->wmclass_class);
(*env)->SetBooleanField(env, lpObject, GdkWindowAttrFc.override_redirect, (jboolean)lpStruct->override_redirect);
}
#endif
@@ -1399,24 +1399,24 @@ void cacheGtkCellRendererClassFields(JNIEnv *env, jobject lpObject)
{
if (GtkCellRendererClassFc.cached) return;
GtkCellRendererClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", "I");
- GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", "I");
+ GtkCellRendererClassFc.render = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "render", I_J);
+ GtkCellRendererClassFc.get_size = (*env)->GetFieldID(env, GtkCellRendererClassFc.clazz, "get_size", I_J);
GtkCellRendererClassFc.cached = 1;
}
GtkCellRendererClass *getGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
{
if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
- lpStruct->render = (void(*)())(*env)->GetIntField(env, lpObject, GtkCellRendererClassFc.render);
- lpStruct->get_size = (void(*)())(*env)->GetIntField(env, lpObject, GtkCellRendererClassFc.get_size);
+ lpStruct->render = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render);
+ lpStruct->get_size = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size);
return lpStruct;
}
void setGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
{
if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkCellRendererClassFc.render, (jint)lpStruct->render);
- (*env)->SetIntField(env, lpObject, GtkCellRendererClassFc.get_size, (jint)lpStruct->get_size);
+ (*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.render, (jintLong)lpStruct->render);
+ (*env)->SetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size, (jintLong)lpStruct->get_size);
}
#endif
@@ -1433,30 +1433,30 @@ void cacheGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject)
{
if (GtkColorSelectionDialogFc.cached) return;
GtkColorSelectionDialogFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkColorSelectionDialogFc.colorsel = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "colorsel", "I");
- GtkColorSelectionDialogFc.ok_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "ok_button", "I");
- GtkColorSelectionDialogFc.cancel_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "cancel_button", "I");
- GtkColorSelectionDialogFc.help_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "help_button", "I");
+ GtkColorSelectionDialogFc.colorsel = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "colorsel", I_J);
+ GtkColorSelectionDialogFc.ok_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "ok_button", I_J);
+ GtkColorSelectionDialogFc.cancel_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "cancel_button", I_J);
+ GtkColorSelectionDialogFc.help_button = (*env)->GetFieldID(env, GtkColorSelectionDialogFc.clazz, "help_button", I_J);
GtkColorSelectionDialogFc.cached = 1;
}
GtkColorSelectionDialog *getGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct)
{
if (!GtkColorSelectionDialogFc.cached) cacheGtkColorSelectionDialogFields(env, lpObject);
- lpStruct->colorsel = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.colorsel);
- lpStruct->ok_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.ok_button);
- lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.cancel_button);
- lpStruct->help_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkColorSelectionDialogFc.help_button);
+ lpStruct->colorsel = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.colorsel);
+ lpStruct->ok_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.ok_button);
+ lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.cancel_button);
+ lpStruct->help_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkColorSelectionDialogFc.help_button);
return lpStruct;
}
void setGtkColorSelectionDialogFields(JNIEnv *env, jobject lpObject, GtkColorSelectionDialog *lpStruct)
{
if (!GtkColorSelectionDialogFc.cached) cacheGtkColorSelectionDialogFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.colorsel, (jint)lpStruct->colorsel);
- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.ok_button, (jint)lpStruct->ok_button);
- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.cancel_button, (jint)lpStruct->cancel_button);
- (*env)->SetIntField(env, lpObject, GtkColorSelectionDialogFc.help_button, (jint)lpStruct->help_button);
+ (*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.colorsel, (jintLong)lpStruct->colorsel);
+ (*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.ok_button, (jintLong)lpStruct->ok_button);
+ (*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.cancel_button, (jintLong)lpStruct->cancel_button);
+ (*env)->SetIntLongField(env, lpObject, GtkColorSelectionDialogFc.help_button, (jintLong)lpStruct->help_button);
}
#endif
@@ -1473,24 +1473,24 @@ void cacheGtkComboFields(JNIEnv *env, jobject lpObject)
{
if (GtkComboFc.cached) return;
GtkComboFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkComboFc.entry = (*env)->GetFieldID(env, GtkComboFc.clazz, "entry", "I");
- GtkComboFc.list = (*env)->GetFieldID(env, GtkComboFc.clazz, "list", "I");
+ GtkComboFc.entry = (*env)->GetFieldID(env, GtkComboFc.clazz, "entry", I_J);
+ GtkComboFc.list = (*env)->GetFieldID(env, GtkComboFc.clazz, "list", I_J);
GtkComboFc.cached = 1;
}
GtkCombo *getGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct)
{
if (!GtkComboFc.cached) cacheGtkComboFields(env, lpObject);
- lpStruct->entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkComboFc.entry);
- lpStruct->list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkComboFc.list);
+ lpStruct->entry = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkComboFc.entry);
+ lpStruct->list = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkComboFc.list);
return lpStruct;
}
void setGtkComboFields(JNIEnv *env, jobject lpObject, GtkCombo *lpStruct)
{
if (!GtkComboFc.cached) cacheGtkComboFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkComboFc.entry, (jint)lpStruct->entry);
- (*env)->SetIntField(env, lpObject, GtkComboFc.list, (jint)lpStruct->list);
+ (*env)->SetIntLongField(env, lpObject, GtkComboFc.entry, (jintLong)lpStruct->entry);
+ (*env)->SetIntLongField(env, lpObject, GtkComboFc.list, (jintLong)lpStruct->list);
}
#endif
@@ -1507,78 +1507,78 @@ void cacheGtkFileSelectionFields(JNIEnv *env, jobject lpObject)
{
if (GtkFileSelectionFc.cached) return;
GtkFileSelectionFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkFileSelectionFc.dir_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "dir_list", "I");
- GtkFileSelectionFc.file_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "file_list", "I");
- GtkFileSelectionFc.selection_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_entry", "I");
- GtkFileSelectionFc.selection_text = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_text", "I");
- GtkFileSelectionFc.main_vbox = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "main_vbox", "I");
- GtkFileSelectionFc.ok_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "ok_button", "I");
- GtkFileSelectionFc.cancel_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cancel_button", "I");
- GtkFileSelectionFc.help_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "help_button", "I");
- GtkFileSelectionFc.history_pulldown = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_pulldown", "I");
- GtkFileSelectionFc.history_menu = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_menu", "I");
- GtkFileSelectionFc.history_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_list", "I");
- GtkFileSelectionFc.fileop_dialog = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_dialog", "I");
- GtkFileSelectionFc.fileop_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_entry", "I");
- GtkFileSelectionFc.fileop_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_file", "I");
- GtkFileSelectionFc.cmpl_state = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cmpl_state", "I");
- GtkFileSelectionFc.fileop_c_dir = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_c_dir", "I");
- GtkFileSelectionFc.fileop_del_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_del_file", "I");
- GtkFileSelectionFc.fileop_ren_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_ren_file", "I");
- GtkFileSelectionFc.button_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "button_area", "I");
- GtkFileSelectionFc.action_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "action_area", "I");
+ GtkFileSelectionFc.dir_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "dir_list", I_J);
+ GtkFileSelectionFc.file_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "file_list", I_J);
+ GtkFileSelectionFc.selection_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_entry", I_J);
+ GtkFileSelectionFc.selection_text = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "selection_text", I_J);
+ GtkFileSelectionFc.main_vbox = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "main_vbox", I_J);
+ GtkFileSelectionFc.ok_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "ok_button", I_J);
+ GtkFileSelectionFc.cancel_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cancel_button", I_J);
+ GtkFileSelectionFc.help_button = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "help_button", I_J);
+ GtkFileSelectionFc.history_pulldown = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_pulldown", I_J);
+ GtkFileSelectionFc.history_menu = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_menu", I_J);
+ GtkFileSelectionFc.history_list = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "history_list", I_J);
+ GtkFileSelectionFc.fileop_dialog = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_dialog", I_J);
+ GtkFileSelectionFc.fileop_entry = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_entry", I_J);
+ GtkFileSelectionFc.fileop_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_file", I_J);
+ GtkFileSelectionFc.cmpl_state = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "cmpl_state", I_J);
+ GtkFileSelectionFc.fileop_c_dir = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_c_dir", I_J);
+ GtkFileSelectionFc.fileop_del_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_del_file", I_J);
+ GtkFileSelectionFc.fileop_ren_file = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "fileop_ren_file", I_J);
+ GtkFileSelectionFc.button_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "button_area", I_J);
+ GtkFileSelectionFc.action_area = (*env)->GetFieldID(env, GtkFileSelectionFc.clazz, "action_area", I_J);
GtkFileSelectionFc.cached = 1;
}
GtkFileSelection *getGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct)
{
if (!GtkFileSelectionFc.cached) cacheGtkFileSelectionFields(env, lpObject);
- lpStruct->dir_list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.dir_list);
- lpStruct->file_list = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.file_list);
- lpStruct->selection_entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.selection_entry);
- lpStruct->selection_text = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.selection_text);
- lpStruct->main_vbox = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.main_vbox);
- lpStruct->ok_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.ok_button);
- lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.cancel_button);
- lpStruct->help_button = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.help_button);
- lpStruct->history_pulldown = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_pulldown);
- lpStruct->history_menu = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_menu);
- lpStruct->history_list = (GList *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.history_list);
- lpStruct->fileop_dialog = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_dialog);
- lpStruct->fileop_entry = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_entry);
- lpStruct->fileop_file = (gchar *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_file);
- lpStruct->cmpl_state = (gpointer)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.cmpl_state);
- lpStruct->fileop_c_dir = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_c_dir);
- lpStruct->fileop_del_file = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_del_file);
- lpStruct->fileop_ren_file = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.fileop_ren_file);
- lpStruct->button_area = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.button_area);
- lpStruct->action_area = (GtkWidget *)(*env)->GetIntField(env, lpObject, GtkFileSelectionFc.action_area);
+ lpStruct->dir_list = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.dir_list);
+ lpStruct->file_list = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.file_list);
+ lpStruct->selection_entry = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.selection_entry);
+ lpStruct->selection_text = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.selection_text);
+ lpStruct->main_vbox = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.main_vbox);
+ lpStruct->ok_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.ok_button);
+ lpStruct->cancel_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.cancel_button);
+ lpStruct->help_button = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.help_button);
+ lpStruct->history_pulldown = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.history_pulldown);
+ lpStruct->history_menu = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.history_menu);
+ lpStruct->history_list = (GList *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.history_list);
+ lpStruct->fileop_dialog = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_dialog);
+ lpStruct->fileop_entry = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_entry);
+ lpStruct->fileop_file = (gchar *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_file);
+ lpStruct->cmpl_state = (gpointer)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.cmpl_state);
+ lpStruct->fileop_c_dir = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_c_dir);
+ lpStruct->fileop_del_file = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_del_file);
+ lpStruct->fileop_ren_file = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_ren_file);
+ lpStruct->button_area = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.button_area);
+ lpStruct->action_area = (GtkWidget *)(*env)->GetIntLongField(env, lpObject, GtkFileSelectionFc.action_area);
return lpStruct;
}
void setGtkFileSelectionFields(JNIEnv *env, jobject lpObject, GtkFileSelection *lpStruct)
{
if (!GtkFileSelectionFc.cached) cacheGtkFileSelectionFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.dir_list, (jint)lpStruct->dir_list);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.file_list, (jint)lpStruct->file_list);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.selection_entry, (jint)lpStruct->selection_entry);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.selection_text, (jint)lpStruct->selection_text);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.main_vbox, (jint)lpStruct->main_vbox);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.ok_button, (jint)lpStruct->ok_button);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.cancel_button, (jint)lpStruct->cancel_button);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.help_button, (jint)lpStruct->help_button);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_pulldown, (jint)lpStruct->history_pulldown);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_menu, (jint)lpStruct->history_menu);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.history_list, (jint)lpStruct->history_list);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_dialog, (jint)lpStruct->fileop_dialog);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_entry, (jint)lpStruct->fileop_entry);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_file, (jint)lpStruct->fileop_file);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.cmpl_state, (jint)lpStruct->cmpl_state);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_c_dir, (jint)lpStruct->fileop_c_dir);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_del_file, (jint)lpStruct->fileop_del_file);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.fileop_ren_file, (jint)lpStruct->fileop_ren_file);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.button_area, (jint)lpStruct->button_area);
- (*env)->SetIntField(env, lpObject, GtkFileSelectionFc.action_area, (jint)lpStruct->action_area);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.dir_list, (jintLong)lpStruct->dir_list);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.file_list, (jintLong)lpStruct->file_list);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.selection_entry, (jintLong)lpStruct->selection_entry);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.selection_text, (jintLong)lpStruct->selection_text);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.main_vbox, (jintLong)lpStruct->main_vbox);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.ok_button, (jintLong)lpStruct->ok_button);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.cancel_button, (jintLong)lpStruct->cancel_button);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.help_button, (jintLong)lpStruct->help_button);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.history_pulldown, (jintLong)lpStruct->history_pulldown);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.history_menu, (jintLong)lpStruct->history_menu);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.history_list, (jintLong)lpStruct->history_list);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_dialog, (jintLong)lpStruct->fileop_dialog);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_entry, (jintLong)lpStruct->fileop_entry);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_file, (jintLong)lpStruct->fileop_file);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.cmpl_state, (jintLong)lpStruct->cmpl_state);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_c_dir, (jintLong)lpStruct->fileop_c_dir);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_del_file, (jintLong)lpStruct->fileop_del_file);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.fileop_ren_file, (jintLong)lpStruct->fileop_ren_file);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.button_area, (jintLong)lpStruct->button_area);
+ (*env)->SetIntLongField(env, lpObject, GtkFileSelectionFc.action_area, (jintLong)lpStruct->action_area);
}
#endif
@@ -1595,21 +1595,21 @@ void cacheGtkFixedFields(JNIEnv *env, jobject lpObject)
{
if (GtkFixedFc.cached) return;
GtkFixedFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkFixedFc.children = (*env)->GetFieldID(env, GtkFixedFc.clazz, "children", "I");
+ GtkFixedFc.children = (*env)->GetFieldID(env, GtkFixedFc.clazz, "children", I_J);
GtkFixedFc.cached = 1;
}
GtkFixed *getGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct)
{
if (!GtkFixedFc.cached) cacheGtkFixedFields(env, lpObject);
- lpStruct->children = (GList *)(*env)->GetIntField(env, lpObject, GtkFixedFc.children);
+ lpStruct->children = (GList *)(*env)->GetIntLongField(env, lpObject, GtkFixedFc.children);
return lpStruct;
}
void setGtkFixedFields(JNIEnv *env, jobject lpObject, GtkFixed *lpStruct)
{
if (!GtkFixedFc.cached) cacheGtkFixedFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkFixedFc.children, (jint)lpStruct->children);
+ (*env)->SetIntLongField(env, lpObject, GtkFixedFc.children, (jintLong)lpStruct->children);
}
#endif
@@ -1660,11 +1660,11 @@ void cacheGtkSelectionDataFields(JNIEnv *env, jobject lpObject)
{
if (GtkSelectionDataFc.cached) return;
GtkSelectionDataFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkSelectionDataFc.selection = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "selection", "I");
- GtkSelectionDataFc.target = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "target", "I");
- GtkSelectionDataFc.type = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "type", "I");
+ GtkSelectionDataFc.selection = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "selection", I_J);
+ GtkSelectionDataFc.target = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "target", I_J);
+ GtkSelectionDataFc.type = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "type", I_J);
GtkSelectionDataFc.format = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "format", "I");
- GtkSelectionDataFc.data = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "data", "I");
+ GtkSelectionDataFc.data = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "data", I_J);
GtkSelectionDataFc.length = (*env)->GetFieldID(env, GtkSelectionDataFc.clazz, "length", "I");
GtkSelectionDataFc.cached = 1;
}
@@ -1672,11 +1672,11 @@ void cacheGtkSelectionDataFields(JNIEnv *env, jobject lpObject)
GtkSelectionData *getGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct)
{
if (!GtkSelectionDataFc.cached) cacheGtkSelectionDataFields(env, lpObject);
- lpStruct->selection = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.selection);
- lpStruct->target = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.target);
- lpStruct->type = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.type);
+ lpStruct->selection = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.selection);
+ lpStruct->target = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.target);
+ lpStruct->type = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.type);
lpStruct->format = (gint)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.format);
- lpStruct->data = (guchar *)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.data);
+ lpStruct->data = (guchar *)(*env)->GetIntLongField(env, lpObject, GtkSelectionDataFc.data);
lpStruct->length = (gint)(*env)->GetIntField(env, lpObject, GtkSelectionDataFc.length);
return lpStruct;
}
@@ -1684,11 +1684,11 @@ GtkSelectionData *getGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSe
void setGtkSelectionDataFields(JNIEnv *env, jobject lpObject, GtkSelectionData *lpStruct)
{
if (!GtkSelectionDataFc.cached) cacheGtkSelectionDataFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.selection, (jint)lpStruct->selection);
- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.target, (jint)lpStruct->target);
- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.type, (jint)lpStruct->type);
+ (*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.selection, (jintLong)lpStruct->selection);
+ (*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.target, (jintLong)lpStruct->target);
+ (*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.type, (jintLong)lpStruct->type);
(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.format, (jint)lpStruct->format);
- (*env)->SetIntField(env, lpObject, GtkSelectionDataFc.data, (jint)lpStruct->data);
+ (*env)->SetIntLongField(env, lpObject, GtkSelectionDataFc.data, (jintLong)lpStruct->data);
(*env)->SetIntField(env, lpObject, GtkSelectionDataFc.length, (jint)lpStruct->length);
}
#endif
@@ -1706,7 +1706,7 @@ void cacheGtkTargetEntryFields(JNIEnv *env, jobject lpObject)
{
if (GtkTargetEntryFc.cached) return;
GtkTargetEntryFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", "I");
+ GtkTargetEntryFc.target = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "target", I_J);
GtkTargetEntryFc.flags = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "flags", "I");
GtkTargetEntryFc.info = (*env)->GetFieldID(env, GtkTargetEntryFc.clazz, "info", "I");
GtkTargetEntryFc.cached = 1;
@@ -1715,7 +1715,7 @@ void cacheGtkTargetEntryFields(JNIEnv *env, jobject lpObject)
GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct)
{
if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject);
- lpStruct->target = (gchar *)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.target);
+ lpStruct->target = (gchar *)(*env)->GetIntLongField(env, lpObject, GtkTargetEntryFc.target);
lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.flags);
lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetEntryFc.info);
return lpStruct;
@@ -1724,7 +1724,7 @@ GtkTargetEntry *getGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTarget
void setGtkTargetEntryFields(JNIEnv *env, jobject lpObject, GtkTargetEntry *lpStruct)
{
if (!GtkTargetEntryFc.cached) cacheGtkTargetEntryFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkTargetEntryFc.target, (jint)lpStruct->target);
+ (*env)->SetIntLongField(env, lpObject, GtkTargetEntryFc.target, (jintLong)lpStruct->target);
(*env)->SetIntField(env, lpObject, GtkTargetEntryFc.flags, (jint)lpStruct->flags);
(*env)->SetIntField(env, lpObject, GtkTargetEntryFc.info, (jint)lpStruct->info);
}
@@ -1743,7 +1743,7 @@ void cacheGtkTargetPairFields(JNIEnv *env, jobject lpObject)
{
if (GtkTargetPairFc.cached) return;
GtkTargetPairFc.clazz = (*env)->GetObjectClass(env, lpObject);
- GtkTargetPairFc.target = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "target", "I");
+ GtkTargetPairFc.target = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "target", I_J);
GtkTargetPairFc.flags = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "flags", "I");
GtkTargetPairFc.info = (*env)->GetFieldID(env, GtkTargetPairFc.clazz, "info", "I");
GtkTargetPairFc.cached = 1;
@@ -1752,7 +1752,7 @@ void cacheGtkTargetPairFields(JNIEnv *env, jobject lpObject)
GtkTargetPair *getGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct)
{
if (!GtkTargetPairFc.cached) cacheGtkTargetPairFields(env, lpObject);
- lpStruct->target = (GdkAtom)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.target);
+ lpStruct->target = (GdkAtom)(*env)->GetIntLongField(env, lpObject, GtkTargetPairFc.target);
lpStruct->flags = (guint)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.flags);
lpStruct->info = (guint)(*env)->GetIntField(env, lpObject, GtkTargetPairFc.info);
return lpStruct;
@@ -1761,7 +1761,7 @@ GtkTargetPair *getGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPa
void setGtkTargetPairFields(JNIEnv *env, jobject lpObject, GtkTargetPair *lpStruct)
{
if (!GtkTargetPairFc.cached) cacheGtkTargetPairFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, GtkTargetPairFc.target, (jint)lpStruct->target);
+ (*env)->SetIntLongField(env, lpObject, GtkTargetPairFc.target, (jintLong)lpStruct->target);
(*env)->SetIntField(env, lpObject, GtkTargetPairFc.flags, (jint)lpStruct->flags);
(*env)->SetIntField(env, lpObject, GtkTargetPairFc.info, (jint)lpStruct->info);
}
@@ -1783,68 +1783,68 @@ void cacheGtkWidgetClassFields(JNIEnv *env, jobject lpObject)
GtkWidgetClassFc.clazz = (*env)->GetObjectClass(env, lpObject);
GtkWidgetClassFc.activate_signal = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "activate_signal", "I");
GtkWidgetClassFc.set_scroll_adjustments_signal = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "set_scroll_adjustments_signal", "I");
- GtkWidgetClassFc.dispatch_child_properties_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "dispatch_child_properties_changed", "I");
- GtkWidgetClassFc.show = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show", "I");
- GtkWidgetClassFc.show_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_all", "I");
- GtkWidgetClassFc.hide = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide", "I");
- GtkWidgetClassFc.hide_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide_all", "I");
- GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", "I");
- GtkWidgetClassFc.unmap = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap", "I");
- GtkWidgetClassFc.realize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "realize", "I");
- GtkWidgetClassFc.unrealize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unrealize", "I");
- GtkWidgetClassFc.size_request = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_request", "I");
- GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", "I");
- GtkWidgetClassFc.state_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "state_changed", "I");
- GtkWidgetClassFc.parent_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "parent_set", "I");
- GtkWidgetClassFc.hierarchy_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hierarchy_changed", "I");
- GtkWidgetClassFc.style_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "style_set", "I");
- GtkWidgetClassFc.direction_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "direction_changed", "I");
- GtkWidgetClassFc.grab_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_notify", "I");
- GtkWidgetClassFc.child_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "child_notify", "I");
- GtkWidgetClassFc.mnemonic_activate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "mnemonic_activate", "I");
- GtkWidgetClassFc.grab_focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_focus", "I");
- GtkWidgetClassFc.focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus", "I");
- GtkWidgetClassFc.event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "event", "I");
- GtkWidgetClassFc.button_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_press_event", "I");
- GtkWidgetClassFc.button_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_release_event", "I");
- GtkWidgetClassFc.scroll_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "scroll_event", "I");
- GtkWidgetClassFc.motion_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "motion_notify_event", "I");
- GtkWidgetClassFc.delete_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "delete_event", "I");
- GtkWidgetClassFc.destroy_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "destroy_event", "I");
- GtkWidgetClassFc.expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "expose_event", "I");
- GtkWidgetClassFc.key_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_press_event", "I");
- GtkWidgetClassFc.key_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_release_event", "I");
- GtkWidgetClassFc.enter_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "enter_notify_event", "I");
- GtkWidgetClassFc.leave_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "leave_notify_event", "I");
- GtkWidgetClassFc.configure_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "configure_event", "I");
- GtkWidgetClassFc.focus_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_in_event", "I");
- GtkWidgetClassFc.focus_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_out_event", "I");
- GtkWidgetClassFc.map_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map_event", "I");
- GtkWidgetClassFc.unmap_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap_event", "I");
- GtkWidgetClassFc.property_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "property_notify_event", "I");
- GtkWidgetClassFc.selection_clear_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_clear_event", "I");
- GtkWidgetClassFc.selection_request_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_request_event", "I");
- GtkWidgetClassFc.selection_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_notify_event", "I");
- GtkWidgetClassFc.proximity_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_in_event", "I");
- GtkWidgetClassFc.proximity_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_out_event", "I");
- GtkWidgetClassFc.visibility_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "visibility_notify_event", "I");
- GtkWidgetClassFc.client_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "client_event", "I");
- GtkWidgetClassFc.no_expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "no_expose_event", "I");
- GtkWidgetClassFc.window_state_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "window_state_event", "I");
- GtkWidgetClassFc.selection_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_get", "I");
- GtkWidgetClassFc.selection_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_received", "I");
- GtkWidgetClassFc.drag_begin = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_begin", "I");
- GtkWidgetClassFc.drag_end = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_end", "I");
- GtkWidgetClassFc.drag_data_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_get", "I");
- GtkWidgetClassFc.drag_data_delete = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_delete", "I");
- GtkWidgetClassFc.drag_leave = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_leave", "I");
- GtkWidgetClassFc.drag_motion = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_motion", "I");
- GtkWidgetClassFc.drag_drop = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_drop", "I");
- GtkWidgetClassFc.drag_data_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_received", "I");
- GtkWidgetClassFc.popup_menu = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "popup_menu", "I");
- GtkWidgetClassFc.show_help = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_help", "I");
- GtkWidgetClassFc.get_accessible = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "get_accessible", "I");
- GtkWidgetClassFc.screen_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "screen_changed", "I");
+ GtkWidgetClassFc.dispatch_child_properties_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "dispatch_child_properties_changed", I_J);
+ GtkWidgetClassFc.show = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show", I_J);
+ GtkWidgetClassFc.show_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_all", I_J);
+ GtkWidgetClassFc.hide = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide", I_J);
+ GtkWidgetClassFc.hide_all = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hide_all", I_J);
+ GtkWidgetClassFc.map = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map", I_J);
+ GtkWidgetClassFc.unmap = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap", I_J);
+ GtkWidgetClassFc.realize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "realize", I_J);
+ GtkWidgetClassFc.unrealize = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unrealize", I_J);
+ GtkWidgetClassFc.size_request = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_request", I_J);
+ GtkWidgetClassFc.size_allocate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "size_allocate", I_J);
+ GtkWidgetClassFc.state_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "state_changed", I_J);
+ GtkWidgetClassFc.parent_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "parent_set", I_J);
+ GtkWidgetClassFc.hierarchy_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "hierarchy_changed", I_J);
+ GtkWidgetClassFc.style_set = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "style_set", I_J);
+ GtkWidgetClassFc.direction_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "direction_changed", I_J);
+ GtkWidgetClassFc.grab_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_notify", I_J);
+ GtkWidgetClassFc.child_notify = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "child_notify", I_J);
+ GtkWidgetClassFc.mnemonic_activate = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "mnemonic_activate", I_J);
+ GtkWidgetClassFc.grab_focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "grab_focus", I_J);
+ GtkWidgetClassFc.focus = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus", I_J);
+ GtkWidgetClassFc.event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "event", I_J);
+ GtkWidgetClassFc.button_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_press_event", I_J);
+ GtkWidgetClassFc.button_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "button_release_event", I_J);
+ GtkWidgetClassFc.scroll_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "scroll_event", I_J);
+ GtkWidgetClassFc.motion_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "motion_notify_event", I_J);
+ GtkWidgetClassFc.delete_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "delete_event", I_J);
+ GtkWidgetClassFc.destroy_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "destroy_event", I_J);
+ GtkWidgetClassFc.expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "expose_event", I_J);
+ GtkWidgetClassFc.key_press_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_press_event", I_J);
+ GtkWidgetClassFc.key_release_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "key_release_event", I_J);
+ GtkWidgetClassFc.enter_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "enter_notify_event", I_J);
+ GtkWidgetClassFc.leave_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "leave_notify_event", I_J);
+ GtkWidgetClassFc.configure_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "configure_event", I_J);
+ GtkWidgetClassFc.focus_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_in_event", I_J);
+ GtkWidgetClassFc.focus_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "focus_out_event", I_J);
+ GtkWidgetClassFc.map_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "map_event", I_J);
+ GtkWidgetClassFc.unmap_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "unmap_event", I_J);
+ GtkWidgetClassFc.property_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "property_notify_event", I_J);
+ GtkWidgetClassFc.selection_clear_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_clear_event", I_J);
+ GtkWidgetClassFc.selection_request_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_request_event", I_J);
+ GtkWidgetClassFc.selection_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_notify_event", I_J);
+ GtkWidgetClassFc.proximity_in_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_in_event", I_J);
+ GtkWidgetClassFc.proximity_out_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "proximity_out_event", I_J);
+ GtkWidgetClassFc.visibility_notify_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "visibility_notify_event", I_J);
+ GtkWidgetClassFc.client_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "client_event", I_J);
+ GtkWidgetClassFc.no_expose_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "no_expose_event", I_J);
+ GtkWidgetClassFc.window_state_event = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "window_state_event", I_J);
+ GtkWidgetClassFc.selection_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_get", I_J);
+ GtkWidgetClassFc.selection_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "selection_received", I_J);
+ GtkWidgetClassFc.drag_begin = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_begin", I_J);
+ GtkWidgetClassFc.drag_end = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_end", I_J);
+ GtkWidgetClassFc.drag_data_get = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_get", I_J);
+ GtkWidgetClassFc.drag_data_delete = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_delete", I_J);
+ GtkWidgetClassFc.drag_leave = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_leave", I_J);
+ GtkWidgetClassFc.drag_motion = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_motion", I_J);
+ GtkWidgetClassFc.drag_drop = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_drop", I_J);
+ GtkWidgetClassFc.drag_data_received = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "drag_data_received", I_J);
+ GtkWidgetClassFc.popup_menu = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "popup_menu", I_J);
+ GtkWidgetClassFc.show_help = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "show_help", I_J);
+ GtkWidgetClassFc.get_accessible = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "get_accessible", I_J);
+ GtkWidgetClassFc.screen_changed = (*env)->GetFieldID(env, GtkWidgetClassFc.clazz, "screen_changed", I_J);
GtkWidgetClassFc.cached = 1;
}
@@ -1854,68 +1854,68 @@ GtkWidgetClass *getGtkWidgetClassFields(JNIEnv *env, jobject lpObject, GtkWidget
getGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
lpStruct->activate_signal = (*env)->GetIntField(env, lpObject, GtkWidgetClassFc.activate_signal);
lpStruct->set_scroll_adjustments_signal = (*env)->GetIntField(env, lpObject, GtkWidgetClassFc.set_scroll_adjustments_signal);
- lpStruct->dispatch_child_properties_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed);
- lpStruct->show = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show);
- lpStruct->show_all = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show_all);
- lpStruct->hide = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hide);
- lpStruct->hide_all = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hide_all);
- lpStruct->map = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.map);
- lpStruct->unmap = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unmap);
- lpStruct->realize = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.realize);
- lpStruct->unrealize = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unrealize);
- lpStruct->size_request = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.size_request);
- lpStruct->size_allocate = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.size_allocate);
- lpStruct->state_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.state_changed);
- lpStruct->parent_set = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.parent_set);
- lpStruct->hierarchy_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.hierarchy_changed);
- lpStruct->style_set = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.style_set);
- lpStruct->direction_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.direction_changed);
- lpStruct->grab_notify = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.grab_notify);
- lpStruct->child_notify = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.child_notify);
- lpStruct->mnemonic_activate = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.mnemonic_activate);
- lpStruct->grab_focus = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.grab_focus);
- lpStruct->focus = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus);
- lpStruct->event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.event);
- lpStruct->button_press_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.button_press_event);
- lpStruct->button_release_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.button_release_event);
- lpStruct->scroll_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.scroll_event);
- lpStruct->motion_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.motion_notify_event);
- lpStruct->delete_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.delete_event);
- lpStruct->destroy_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.destroy_event);
- lpStruct->expose_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.expose_event);
- lpStruct->key_press_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.key_press_event);
- lpStruct->key_release_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.key_release_event);
- lpStruct->enter_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.enter_notify_event);
- lpStruct->leave_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.leave_notify_event);
- lpStruct->configure_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.configure_event);
- lpStruct->focus_in_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus_in_event);
- lpStruct->focus_out_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.focus_out_event);
- lpStruct->map_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.map_event);
- lpStruct->unmap_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.unmap_event);
- lpStruct->property_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.property_notify_event);
- lpStruct->selection_clear_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_clear_event);
- lpStruct->selection_request_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_request_event);
- lpStruct->selection_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_notify_event);
- lpStruct->proximity_in_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.proximity_in_event);
- lpStruct->proximity_out_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.proximity_out_event);
- lpStruct->visibility_notify_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.visibility_notify_event);
- lpStruct->client_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.client_event);
- lpStruct->no_expose_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.no_expose_event);
- lpStruct->window_state_event = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.window_state_event);
- lpStruct->selection_get = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_get);
- lpStruct->selection_received = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.selection_received);
- lpStruct->drag_begin = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_begin);
- lpStruct->drag_end = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_end);
- lpStruct->drag_data_get = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_get);
- lpStruct->drag_data_delete = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_delete);
- lpStruct->drag_leave = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_leave);
- lpStruct->drag_motion = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_motion);
- lpStruct->drag_drop = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_drop);
- lpStruct->drag_data_received = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.drag_data_received);
- lpStruct->popup_menu = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.popup_menu);
- lpStruct->show_help = (gboolean(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.show_help);
- lpStruct->get_accessible = (AtkObject*(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.get_accessible);
- lpStruct->screen_changed = (void(*)())(*env)->GetIntField(env, lpObject, GtkWidgetClassFc.screen_changed);
+ lpStruct->dispatch_child_properties_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed);
+ lpStruct->show = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.show);
+ lpStruct->show_all = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.show_all);
+ lpStruct->hide = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.hide);
+ lpStruct->hide_all = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.hide_all);
+ lpStruct->map = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map);
+ lpStruct->unmap = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.unmap);
+ lpStruct->realize = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.realize);
+ lpStruct->unrealize = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.unrealize);
+ lpStruct->size_request = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_request);
+ lpStruct->size_allocate = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
+ lpStruct->state_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.state_changed);
+ lpStruct->parent_set = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.parent_set);
+ lpStruct->hierarchy_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.hierarchy_changed);
+ lpStruct->style_set = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.style_set);
+ lpStruct->direction_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.direction_changed);
+ lpStruct->grab_notify = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.grab_notify);
+ lpStruct->child_notify = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.child_notify);
+ lpStruct->mnemonic_activate = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.mnemonic_activate);
+ lpStruct->grab_focus = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.grab_focus);
+ lpStruct->focus = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.focus);
+ lpStruct->event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.event);
+ lpStruct->button_press_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.button_press_event);
+ lpStruct->button_release_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.button_release_event);
+ lpStruct->scroll_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.scroll_event);
+ lpStruct->motion_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.motion_notify_event);
+ lpStruct->delete_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.delete_event);
+ lpStruct->destroy_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.destroy_event);
+ lpStruct->expose_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.expose_event);
+ lpStruct->key_press_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.key_press_event);
+ lpStruct->key_release_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.key_release_event);
+ lpStruct->enter_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.enter_notify_event);
+ lpStruct->leave_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.leave_notify_event);
+ lpStruct->configure_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.configure_event);
+ lpStruct->focus_in_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.focus_in_event);
+ lpStruct->focus_out_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.focus_out_event);
+ lpStruct->map_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map_event);
+ lpStruct->unmap_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.unmap_event);
+ lpStruct->property_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.property_notify_event);
+ lpStruct->selection_clear_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_clear_event);
+ lpStruct->selection_request_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_request_event);
+ lpStruct->selection_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_notify_event);
+ lpStruct->proximity_in_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_in_event);
+ lpStruct->proximity_out_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_out_event);
+ lpStruct->visibility_notify_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.visibility_notify_event);
+ lpStruct->client_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.client_event);
+ lpStruct->no_expose_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.no_expose_event);
+ lpStruct->window_state_event = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.window_state_event);
+ lpStruct->selection_get = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_get);
+ lpStruct->selection_received = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.selection_received);
+ lpStruct->drag_begin = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_begin);
+ lpStruct->drag_end = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_end);
+ lpStruct->drag_data_get = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_get);
+ lpStruct->drag_data_delete = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_delete);
+ lpStruct->drag_leave = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_leave);
+ lpStruct->drag_motion = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_motion);
+ lpStruct->drag_drop = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_drop);
+ lpStruct->drag_data_received = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_received);
+ lpStruct->popup_menu = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.popup_menu);
+ lpStruct->show_help = (gboolean(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.show_help);
+ lpStruct->get_accessible = (AtkObject*(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.get_accessible);
+ lpStruct->screen_changed = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.screen_changed);
return lpStruct;
}
@@ -1925,68 +1925,68 @@ void setGtkWidgetClassFields(JNIEnv *env, jobject lpObject, GtkWidgetClass *lpSt
setGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.activate_signal, (jint)lpStruct->activate_signal);
(*env)->SetIntField(env, lpObject, GtkWidgetClassFc.set_scroll_adjustments_signal, (jint)lpStruct->set_scroll_adjustments_signal);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed, (jint)lpStruct->dispatch_child_properties_changed);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show, (jint)lpStruct->show);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show_all, (jint)lpStruct->show_all);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hide, (jint)lpStruct->hide);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hide_all, (jint)lpStruct->hide_all);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.map, (jint)lpStruct->map);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unmap, (jint)lpStruct->unmap);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.realize, (jint)lpStruct->realize);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unrealize, (jint)lpStruct->unrealize);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.size_request, (jint)lpStruct->size_request);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.size_allocate, (jint)lpStruct->size_allocate);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.state_changed, (jint)lpStruct->state_changed);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.parent_set, (jint)lpStruct->parent_set);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.hierarchy_changed, (jint)lpStruct->hierarchy_changed);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.style_set, (jint)lpStruct->style_set);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.direction_changed, (jint)lpStruct->direction_changed);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.grab_notify, (jint)lpStruct->grab_notify);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.child_notify, (jint)lpStruct->child_notify);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.mnemonic_activate, (jint)lpStruct->mnemonic_activate);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.grab_focus, (jint)lpStruct->grab_focus);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus, (jint)lpStruct->focus);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.event, (jint)lpStruct->event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.button_press_event, (jint)lpStruct->button_press_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.button_release_event, (jint)lpStruct->button_release_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.scroll_event, (jint)lpStruct->scroll_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.motion_notify_event, (jint)lpStruct->motion_notify_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.delete_event, (jint)lpStruct->delete_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.destroy_event, (jint)lpStruct->destroy_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.expose_event, (jint)lpStruct->expose_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.key_press_event, (jint)lpStruct->key_press_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.key_release_event, (jint)lpStruct->key_release_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.enter_notify_event, (jint)lpStruct->enter_notify_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.leave_notify_event, (jint)lpStruct->leave_notify_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.configure_event, (jint)lpStruct->configure_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus_in_event, (jint)lpStruct->focus_in_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.focus_out_event, (jint)lpStruct->focus_out_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.map_event, (jint)lpStruct->map_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.unmap_event, (jint)lpStruct->unmap_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.property_notify_event, (jint)lpStruct->property_notify_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_clear_event, (jint)lpStruct->selection_clear_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_request_event, (jint)lpStruct->selection_request_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_notify_event, (jint)lpStruct->selection_notify_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.proximity_in_event, (jint)lpStruct->proximity_in_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.proximity_out_event, (jint)lpStruct->proximity_out_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.visibility_notify_event, (jint)lpStruct->visibility_notify_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.client_event, (jint)lpStruct->client_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.no_expose_event, (jint)lpStruct->no_expose_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.window_state_event, (jint)lpStruct->window_state_event);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_get, (jint)lpStruct->selection_get);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.selection_received, (jint)lpStruct->selection_received);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_begin, (jint)lpStruct->drag_begin);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_end, (jint)lpStruct->drag_end);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_get, (jint)lpStruct->drag_data_get);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_delete, (jint)lpStruct->drag_data_delete);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_leave, (jint)lpStruct->drag_leave);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_motion, (jint)lpStruct->drag_motion);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_drop, (jint)lpStruct->drag_drop);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.drag_data_received, (jint)lpStruct->drag_data_received);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.popup_menu, (jint)lpStruct->popup_menu);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.show_help, (jint)lpStruct->show_help);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.get_accessible, (jint)lpStruct->get_accessible);
- (*env)->SetIntField(env, lpObject, GtkWidgetClassFc.screen_changed, (jint)lpStruct->screen_changed);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.dispatch_child_properties_changed, (jintLong)lpStruct->dispatch_child_properties_changed);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.show, (jintLong)lpStruct->show);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.show_all, (jintLong)lpStruct->show_all);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.hide, (jintLong)lpStruct->hide);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.hide_all, (jintLong)lpStruct->hide_all);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.map, (jintLong)lpStruct->map);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.unmap, (jintLong)lpStruct->unmap);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.realize, (jintLong)lpStruct->realize);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.unrealize, (jintLong)lpStruct->unrealize);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.size_request, (jintLong)lpStruct->size_request);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate, (jintLong)lpStruct->size_allocate);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.state_changed, (jintLong)lpStruct->state_changed);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.parent_set, (jintLong)lpStruct->parent_set);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.hierarchy_changed, (jintLong)lpStruct->hierarchy_changed);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.style_set, (jintLong)lpStruct->style_set);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.direction_changed, (jintLong)lpStruct->direction_changed);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.grab_notify, (jintLong)lpStruct->grab_notify);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.child_notify, (jintLong)lpStruct->child_notify);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.mnemonic_activate, (jintLong)lpStruct->mnemonic_activate);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.grab_focus, (jintLong)lpStruct->grab_focus);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.focus, (jintLong)lpStruct->focus);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.event, (jintLong)lpStruct->event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.button_press_event, (jintLong)lpStruct->button_press_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.button_release_event, (jintLong)lpStruct->button_release_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.scroll_event, (jintLong)lpStruct->scroll_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.motion_notify_event, (jintLong)lpStruct->motion_notify_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.delete_event, (jintLong)lpStruct->delete_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.destroy_event, (jintLong)lpStruct->destroy_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.expose_event, (jintLong)lpStruct->expose_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.key_press_event, (jintLong)lpStruct->key_press_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.key_release_event, (jintLong)lpStruct->key_release_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.enter_notify_event, (jintLong)lpStruct->enter_notify_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.leave_notify_event, (jintLong)lpStruct->leave_notify_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.configure_event, (jintLong)lpStruct->configure_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.focus_in_event, (jintLong)lpStruct->focus_in_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.focus_out_event, (jintLong)lpStruct->focus_out_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.map_event, (jintLong)lpStruct->map_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.unmap_event, (jintLong)lpStruct->unmap_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.property_notify_event, (jintLong)lpStruct->property_notify_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_clear_event, (jintLong)lpStruct->selection_clear_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_request_event, (jintLong)lpStruct->selection_request_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_notify_event, (jintLong)lpStruct->selection_notify_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_in_event, (jintLong)lpStruct->proximity_in_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.proximity_out_event, (jintLong)lpStruct->proximity_out_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.visibility_notify_event, (jintLong)lpStruct->visibility_notify_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.client_event, (jintLong)lpStruct->client_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.no_expose_event, (jintLong)lpStruct->no_expose_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.window_state_event, (jintLong)lpStruct->window_state_event);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_get, (jintLong)lpStruct->selection_get);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.selection_received, (jintLong)lpStruct->selection_received);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_begin, (jintLong)lpStruct->drag_begin);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_end, (jintLong)lpStruct->drag_end);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_get, (jintLong)lpStruct->drag_data_get);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_delete, (jintLong)lpStruct->drag_data_delete);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_leave, (jintLong)lpStruct->drag_leave);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_motion, (jintLong)lpStruct->drag_motion);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_drop, (jintLong)lpStruct->drag_drop);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.drag_data_received, (jintLong)lpStruct->drag_data_received);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.popup_menu, (jintLong)lpStruct->popup_menu);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.show_help, (jintLong)lpStruct->show_help);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.get_accessible, (jintLong)lpStruct->get_accessible);
+ (*env)->SetIntLongField(env, lpObject, GtkWidgetClassFc.screen_changed, (jintLong)lpStruct->screen_changed);
}
#endif
@@ -2077,7 +2077,7 @@ void cachePangoAttributeFields(JNIEnv *env, jobject lpObject)
{
if (PangoAttributeFc.cached) return;
PangoAttributeFc.clazz = (*env)->GetObjectClass(env, lpObject);
- PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", "I");
+ PangoAttributeFc.klass = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "klass", I_J);
PangoAttributeFc.start_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "start_index", "I");
PangoAttributeFc.end_index = (*env)->GetFieldID(env, PangoAttributeFc.clazz, "end_index", "I");
PangoAttributeFc.cached = 1;
@@ -2086,7 +2086,7 @@ void cachePangoAttributeFields(JNIEnv *env, jobject lpObject)
PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct)
{
if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject);
- lpStruct->klass = (const PangoAttrClass *)(*env)->GetIntField(env, lpObject, PangoAttributeFc.klass);
+ lpStruct->klass = (const PangoAttrClass *)(*env)->GetIntLongField(env, lpObject, PangoAttributeFc.klass);
lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.start_index);
lpStruct->end_index = (*env)->GetIntField(env, lpObject, PangoAttributeFc.end_index);
return lpStruct;
@@ -2095,7 +2095,7 @@ PangoAttribute *getPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttr
void setPangoAttributeFields(JNIEnv *env, jobject lpObject, PangoAttribute *lpStruct)
{
if (!PangoAttributeFc.cached) cachePangoAttributeFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, PangoAttributeFc.klass, (jint)lpStruct->klass);
+ (*env)->SetIntLongField(env, lpObject, PangoAttributeFc.klass, (jintLong)lpStruct->klass);
(*env)->SetIntField(env, lpObject, PangoAttributeFc.start_index, (jint)lpStruct->start_index);
(*env)->SetIntField(env, lpObject, PangoAttributeFc.end_index, (jint)lpStruct->end_index);
}
@@ -2117,12 +2117,12 @@ void cachePangoItemFields(JNIEnv *env, jobject lpObject)
PangoItemFc.offset = (*env)->GetFieldID(env, PangoItemFc.clazz, "offset", "I");
PangoItemFc.length = (*env)->GetFieldID(env, PangoItemFc.clazz, "length", "I");
PangoItemFc.num_chars = (*env)->GetFieldID(env, PangoItemFc.clazz, "num_chars", "I");
- PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", "I");
- PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", "I");
- PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", "I");
+ PangoItemFc.analysis_shape_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_shape_engine", I_J);
+ PangoItemFc.analysis_lang_engine = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_lang_engine", I_J);
+ PangoItemFc.analysis_font = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_font", I_J);
PangoItemFc.analysis_level = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_level", "B");
- PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", "I");
- PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", "I");
+ PangoItemFc.analysis_language = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_language", I_J);
+ PangoItemFc.analysis_extra_attrs = (*env)->GetFieldID(env, PangoItemFc.clazz, "analysis_extra_attrs", I_J);
PangoItemFc.cached = 1;
}
@@ -2132,12 +2132,12 @@ PangoItem *getPangoItemFields(JNIEnv *env, jobject lpObject, PangoItem *lpStruct
lpStruct->offset = (*env)->GetIntField(env, lpObject, PangoItemFc.offset);
lpStruct->length = (*env)->GetIntField(env, lpObject, PangoItemFc.length);
lpStruct->num_chars = (*env)->GetIntField(env, lpObject, PangoItemFc.num_chars);
- lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_shape_engine);
- lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_lang_engine);
- lpStruct->analysis.font = (PangoFont *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_font);
+ lpStruct->analysis.shape_engine = (PangoEngineShape *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_shape_engine);
+ lpStruct->analysis.lang_engine = (PangoEngineLang *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_lang_engine);
+ lpStruct->analysis.font = (PangoFont *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_font);
lpStruct->analysis.level = (*env)->GetByteField(env, lpObject, PangoItemFc.analysis_level);
- lpStruct->analysis.language = (PangoLanguage *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_language);
- lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetIntField(env, lpObject, PangoItemFc.analysis_extra_attrs);
+ lpStruct->analysis.language = (PangoLanguage *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_language);
+ lpStruct->analysis.extra_attrs = (GSList *)(*env)->GetIntLongField(env, lpObject, PangoItemFc.analysis_extra_attrs);
return lpStruct;
}
@@ -2147,12 +2147,12 @@ void setPangoItemFields(JNIEnv *env, jobject lpObject, PangoItem *lpStruct)
(*env)->SetIntField(env, lpObject, PangoItemFc.offset, (jint)lpStruct->offset);
(*env)->SetIntField(env, lpObject, PangoItemFc.length, (jint)lpStruct->length);
(*env)->SetIntField(env, lpObject, PangoItemFc.num_chars, (jint)lpStruct->num_chars);
- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_shape_engine, (jint)lpStruct->analysis.shape_engine);
- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_lang_engine, (jint)lpStruct->analysis.lang_engine);
- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_font, (jint)lpStruct->analysis.font);
+ (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_shape_engine, (jintLong)lpStruct->analysis.shape_engine);
+ (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_lang_engine, (jintLong)lpStruct->analysis.lang_engine);
+ (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_font, (jintLong)lpStruct->analysis.font);
(*env)->SetByteField(env, lpObject, PangoItemFc.analysis_level, (jbyte)lpStruct->analysis.level);
- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_language, (jint)lpStruct->analysis.language);
- (*env)->SetIntField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jint)lpStruct->analysis.extra_attrs);
+ (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_language, (jintLong)lpStruct->analysis.language);
+ (*env)->SetIntLongField(env, lpObject, PangoItemFc.analysis_extra_attrs, (jintLong)lpStruct->analysis.extra_attrs);
}
#endif
@@ -2169,30 +2169,30 @@ void cachePangoLayoutLineFields(JNIEnv *env, jobject lpObject)
{
if (PangoLayoutLineFc.cached) return;
PangoLayoutLineFc.clazz = (*env)->GetObjectClass(env, lpObject);
- PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", "I");
+ PangoLayoutLineFc.layout = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "layout", I_J);
PangoLayoutLineFc.start_index = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "start_index", "I");
PangoLayoutLineFc.length = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "length", "I");
- PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", "I");
+ PangoLayoutLineFc.runs = (*env)->GetFieldID(env, PangoLayoutLineFc.clazz, "runs", I_J);
PangoLayoutLineFc.cached = 1;
}
PangoLayoutLine *getPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct)
{
if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject);
- lpStruct->layout = (PangoLayout *)(*env)->GetIntField(env, lpObject, PangoLayoutLineFc.layout);
+ lpStruct->layout = (PangoLayout *)(*env)->GetIntLongField(env, lpObject, PangoLayoutLineFc.layout);
lpStruct->start_index = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.start_index);
lpStruct->length = (*env)->GetIntField(env, lpObject, PangoLayoutLineFc.length);
- lpStruct->runs = (GSList *)(*env)->GetIntField(env, lpObject, PangoLayoutLineFc.runs);
+ lpStruct->runs = (GSList *)(*env)->GetIntLongField(env, lpObject, PangoLayoutLineFc.runs);
return lpStruct;
}
void setPangoLayoutLineFields(JNIEnv *env, jobject lpObject, PangoLayoutLine *lpStruct)
{
if (!PangoLayoutLineFc.cached) cachePangoLayoutLineFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.layout, (jint)lpStruct->layout);
+ (*env)->SetIntLongField(env, lpObject, PangoLayoutLineFc.layout, (jintLong)lpStruct->layout);
(*env)->SetIntField(env, lpObject, PangoLayoutLineFc.start_index, (jint)lpStruct->start_index);
(*env)->SetIntField(env, lpObject, PangoLayoutLineFc.length, (jint)lpStruct->length);
- (*env)->SetIntField(env, lpObject, PangoLayoutLineFc.runs, (jint)lpStruct->runs);
+ (*env)->SetIntLongField(env, lpObject, PangoLayoutLineFc.runs, (jintLong)lpStruct->runs);
}
#endif
@@ -2209,24 +2209,24 @@ void cachePangoLayoutRunFields(JNIEnv *env, jobject lpObject)
{
if (PangoLayoutRunFc.cached) return;
PangoLayoutRunFc.clazz = (*env)->GetObjectClass(env, lpObject);
- PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", "I");
- PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", "I");
+ PangoLayoutRunFc.item = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "item", I_J);
+ PangoLayoutRunFc.glyphs = (*env)->GetFieldID(env, PangoLayoutRunFc.clazz, "glyphs", I_J);
PangoLayoutRunFc.cached = 1;
}
PangoLayoutRun *getPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct)
{
if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject);
- lpStruct->item = (PangoItem *)(*env)->GetIntField(env, lpObject, PangoLayoutRunFc.item);
- lpStruct->glyphs = (PangoGlyphString *)(*env)->GetIntField(env, lpObject, PangoLayoutRunFc.glyphs);
+ lpStruct->item = (PangoItem *)(*env)->GetIntLongField(env, lpObject, PangoLayoutRunFc.item);
+ lpStruct->glyphs = (PangoGlyphString *)(*env)->GetIntLongField(env, lpObject, PangoLayoutRunFc.glyphs);
return lpStruct;
}
void setPangoLayoutRunFields(JNIEnv *env, jobject lpObject, PangoLayoutRun *lpStruct)
{
if (!PangoLayoutRunFc.cached) cachePangoLayoutRunFields(env, lpObject);
- (*env)->SetIntField(env, lpObject, PangoLayoutRunFc.item, (jint)lpStruct->item);
- (*env)->SetIntField(env, lpObject, PangoLayoutRunFc.glyphs, (jint)lpStruct->glyphs);
+ (*env)->SetIntLongField(env, lpObject, PangoLayoutRunFc.item, (jintLong)lpStruct->item);
+ (*env)->SetIntLongField(env, lpObject, PangoLayoutRunFc.glyphs, (jintLong)lpStruct->glyphs);
}
#endif
@@ -2342,10 +2342,10 @@ void cacheXAnyEventFields(JNIEnv *env, jobject lpObject)
if (XAnyEventFc.cached) return;
cacheXEventFields(env, lpObject);
XAnyEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
- XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", "I");
+ XAnyEventFc.serial = (*env)->GetFieldID(env, XAnyEventFc.clazz, "serial", I_J);
XAnyEventFc.send_event = (*env)->GetFieldID(env, XAnyEventFc.clazz, "send_event", "I");
- XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", "I");
- XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", "I");
+ XAnyEventFc.display = (*env)->GetFieldID(env, XAnyEventFc.clazz, "display", I_J);
+ XAnyEventFc.window = (*env)->GetFieldID(env, XAnyEventFc.clazz, "window", I_J);
XAnyEventFc.cached = 1;
}
@@ -2353,10 +2353,10 @@ XAnyEvent *getXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct
{
if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject);
getXEventFields(env, lpObject, (XEvent *)lpStruct);
- lpStruct->serial = (*env)->GetIntField(env, lpObject, XAnyEventFc.serial);
+ lpStruct->serial = (*env)->GetIntLongField(env, lpObject, XAnyEventFc.serial);
lpStruct->send_event = (*env)->GetIntField(env, lpObject, XAnyEventFc.send_event);
- lpStruct->display = (Display *)(*env)->GetIntField(env, lpObject, XAnyEventFc.display);
- lpStruct->window = (Window)(*env)->GetIntField(env, lpObject, XAnyEventFc.window);
+ lpStruct->display = (Display *)(*env)->GetIntLongField(env, lpObject, XAnyEventFc.display);
+ lpStruct->window = (Window)(*env)->GetIntLongField(env, lpObject, XAnyEventFc.window);
return lpStruct;
}
@@ -2364,10 +2364,10 @@ void setXAnyEventFields(JNIEnv *env, jobject lpObject, XAnyEvent *lpStruct)
{
if (!XAnyEventFc.cached) cacheXAnyEventFields(env, lpObject);
setXEventFields(env, lpObject, (XEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, XAnyEventFc.serial, (jint)lpStruct->serial);
+ (*env)->SetIntLongField(env, lpObject, XAnyEventFc.serial, (jintLong)lpStruct->serial);
(*env)->SetIntField(env, lpObject, XAnyEventFc.send_event, (jint)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, XAnyEventFc.display, (jint)lpStruct->display);
- (*env)->SetIntField(env, lpObject, XAnyEventFc.window, (jint)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, XAnyEventFc.display, (jintLong)lpStruct->display);
+ (*env)->SetIntLongField(env, lpObject, XAnyEventFc.window, (jintLong)lpStruct->window);
}
#endif
@@ -2446,13 +2446,13 @@ void cacheXClientMessageEventFields(JNIEnv *env, jobject lpObject)
if (XClientMessageEventFc.cached) return;
XClientMessageEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
XClientMessageEventFc.type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "type", "I");
- XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", "I");
+ XClientMessageEventFc.serial = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "serial", I_J);
XClientMessageEventFc.send_event = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "send_event", "Z");
- XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", "I");
- XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", "I");
- XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", "I");
+ XClientMessageEventFc.display = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "display", I_J);
+ XClientMessageEventFc.window = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "window", I_J);
+ XClientMessageEventFc.message_type = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "message_type", I_J);
XClientMessageEventFc.format = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "format", "I");
- XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", "[I");
+ XClientMessageEventFc.data = (*env)->GetFieldID(env, XClientMessageEventFc.clazz, "data", I_JArray);
XClientMessageEventFc.cached = 1;
}
@@ -2460,15 +2460,15 @@ XClientMessageEvent *getXClientMessageEventFields(JNIEnv *env, jobject lpObject,
{
if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject);
lpStruct->type = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.type);
- lpStruct->serial = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.serial);
+ lpStruct->serial = (*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.serial);
lpStruct->send_event = (*env)->GetBooleanField(env, lpObject, XClientMessageEventFc.send_event);
- lpStruct->display = (Display *)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.display);
- lpStruct->window = (Window)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.window);
- lpStruct->message_type = (Atom)(*env)->GetIntField(env, lpObject, XClientMessageEventFc.message_type);
+ lpStruct->display = (Display *)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.display);
+ lpStruct->window = (Window)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.window);
+ lpStruct->message_type = (Atom)(*env)->GetIntLongField(env, lpObject, XClientMessageEventFc.message_type);
lpStruct->format = (*env)->GetIntField(env, lpObject, XClientMessageEventFc.format);
{
- jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
- (*env)->GetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
+ jintLongArray lpObject1 = (jintLongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
+ (*env)->GetIntLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jintLong), (jintLong *)lpStruct->data.l);
}
return lpStruct;
}
@@ -2477,15 +2477,15 @@ void setXClientMessageEventFields(JNIEnv *env, jobject lpObject, XClientMessageE
{
if (!XClientMessageEventFc.cached) cacheXClientMessageEventFields(env, lpObject);
(*env)->SetIntField(env, lpObject, XClientMessageEventFc.type, (jint)lpStruct->type);
- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.serial, (jint)lpStruct->serial);
+ (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.serial, (jintLong)lpStruct->serial);
(*env)->SetBooleanField(env, lpObject, XClientMessageEventFc.send_event, (jboolean)lpStruct->send_event);
- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.display, (jint)lpStruct->display);
- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.window, (jint)lpStruct->window);
- (*env)->SetIntField(env, lpObject, XClientMessageEventFc.message_type, (jint)lpStruct->message_type);
+ (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.display, (jintLong)lpStruct->display);
+ (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.window, (jintLong)lpStruct->window);
+ (*env)->SetIntLongField(env, lpObject, XClientMessageEventFc.message_type, (jintLong)lpStruct->message_type);
(*env)->SetIntField(env, lpObject, XClientMessageEventFc.format, (jint)lpStruct->format);
{
- jintArray lpObject1 = (jintArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
- (*env)->SetIntArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / 4, (jint *)lpStruct->data.l);
+ jintLongArray lpObject1 = (jintLongArray)(*env)->GetObjectField(env, lpObject, XClientMessageEventFc.data);
+ (*env)->SetIntLongArrayRegion(env, lpObject1, 0, sizeof(lpStruct->data.l) / sizeof(jintLong), (jintLong *)lpStruct->data.l);
}
}
#endif
@@ -2504,8 +2504,8 @@ void cacheXCrossingEventFields(JNIEnv *env, jobject lpObject)
if (XCrossingEventFc.cached) return;
cacheXAnyEventFields(env, lpObject);
XCrossingEventFc.clazz = (*env)->GetObjectClass(env, lpObject);
- XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", "I");
- XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", "I");
+ XCrossingEventFc.root = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "root", I_J);
+ XCrossingEventFc.subwindow = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "subwindow", I_J);
XCrossingEventFc.time = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "time", "I");
XCrossingEventFc.x = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "x", "I");
XCrossingEventFc.y = (*env)->GetFieldID(env, XCrossingEventFc.clazz, "y", "I");
@@ -2523,8 +2523,8 @@ XCrossingEvent *getXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossing
{
if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
getXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
- lpStruct->root = (Window)(*env)->GetIntField(env, lpObject, XCrossingEventFc.root);
- lpStruct->subwindow = (Window)(*env)->GetIntField(env, lpObject, XCrossingEventFc.subwindow);
+ lpStruct->root = (Window)(*env)->GetIntLongField(env, lpObject, XCrossingEventFc.root);
+ lpStruct->subwindow = (Window)(*env)->GetIntLongField(env, lpObject, XCrossingEventFc.subwindow);
lpStruct->time = (Time)(*env)->GetIntField(env, lpObject, XCrossingEventFc.time);
lpStruct->x = (*env)->GetIntField(env, lpObject, XCrossingEventFc.x);
lpStruct->y = (*env)->GetIntField(env, lpObject, XCrossingEventFc.y);
@@ -2542,8 +2542,8 @@ void setXCrossingEventFields(JNIEnv *env, jobject lpObject, XCrossingEvent *lpSt
{
if (!XCrossingEventFc.cached) cacheXCrossingEventFields(env, lpObject);
setXAnyEventFields(env, lpObject, (XAnyEvent *)lpStruct);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.root, (jint)lpStruct->root);
- (*env)->SetIntField(env, lpObject, XCrossingEventFc.subwindow, (jint)lpStruct->subwindow);
+ (*env)->SetIntLongField(env, lpObject, XCrossingEventFc.root, (jintLong)lpStruct->root);
+ (*env)->SetIntLongField(env, lpObject, XCrossingEventFc.subwindow, (jintLong)lpStruct->subwindow);
(*env)->SetIntField(env, lpObject, XCrossingEventFc.time, (jint)lpStruct->time);
(*env)->SetIntField(env, lpObject, XCrossingEventFc.x, (jint)lpStruct->x);
(*env)->SetIntField(env, lpObject, XCrossingEventFc.y, (jint)lpStruct->y);
@@ -2685,17 +2685,17 @@ void cacheXRenderPictureAttributesFields(JNIEnv *env, jobject lpObject)
if (XRenderPictureAttributesFc.cached) return;
XRenderPictureAttributesFc.clazz = (*env)->GetObjectClass(env, lpObject);
XRenderPictureAttributesFc.repeat = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "repeat", "Z");
- XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", "I");
+ XRenderPictureAttributesFc.alpha_map = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_map", I_J);
XRenderPictureAttributesFc.alpha_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_x_origin", "I");
XRenderPictureAttributesFc.alpha_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "alpha_y_origin", "I");
XRenderPictureAttributesFc.clip_x_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_x_origin", "I");
XRenderPictureAttributesFc.clip_y_origin = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_y_origin", "I");
- XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", "I");
+ XRenderPictureAttributesFc.clip_mask = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "clip_mask", I_J);
XRenderPictureAttributesFc.graphics_exposures = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "graphics_exposures", "Z");
XRenderPictureAttributesFc.subwindow_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "subwindow_mode", "I");
XRenderPictureAttributesFc.poly_edge = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_edge", "I");
XRenderPictureAttributesFc.poly_mode = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "poly_mode", "I");
- XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", "I");
+ XRenderPictureAttributesFc.dither = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "dither", I_J);
XRenderPictureAttributesFc.component_alpha = (*env)->GetFieldID(env, XRenderPictureAttributesFc.clazz, "component_alpha", "Z");
XRenderPictureAttributesFc.cached = 1;
}
@@ -2704,17 +2704,17 @@ XRenderPictureAttributes *getXRenderPictureAttributesFields(JNIEnv *env, jobject
{
if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
lpStruct->repeat = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat);
- lpStruct->alpha_map = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
+ lpStruct->alpha_map = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map);
lpStruct->alpha_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin);
lpStruct->alpha_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin);
lpStruct->clip_x_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin);
lpStruct->clip_y_origin = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin);
- lpStruct->clip_mask = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
+ lpStruct->clip_mask = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask);
lpStruct->graphics_exposures = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures);
lpStruct->subwindow_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode);
lpStruct->poly_edge = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge);
lpStruct->poly_mode = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode);
- lpStruct->dither = (*env)->GetIntField(env, lpObject, XRenderPictureAttributesFc.dither);
+ lpStruct->dither = (*env)->GetIntLongField(env, lpObject, XRenderPictureAttributesFc.dither);
lpStruct->component_alpha = (*env)->GetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha);
return lpStruct;
}
@@ -2723,17 +2723,17 @@ void setXRenderPictureAttributesFields(JNIEnv *env, jobject lpObject, XRenderPic
{
if (!XRenderPictureAttributesFc.cached) cacheXRenderPictureAttributesFields(env, lpObject);
(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.repeat, (jboolean)lpStruct->repeat);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jint)lpStruct->alpha_map);
+ (*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.alpha_map, (jintLong)lpStruct->alpha_map);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_x_origin, (jint)lpStruct->alpha_x_origin);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.alpha_y_origin, (jint)lpStruct->alpha_y_origin);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_x_origin, (jint)lpStruct->clip_x_origin);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_y_origin, (jint)lpStruct->clip_y_origin);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jint)lpStruct->clip_mask);
+ (*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.clip_mask, (jintLong)lpStruct->clip_mask);
(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.graphics_exposures, (jboolean)lpStruct->graphics_exposures);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.subwindow_mode, (jint)lpStruct->subwindow_mode);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_edge, (jint)lpStruct->poly_edge);
(*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.poly_mode, (jint)lpStruct->poly_mode);
- (*env)->SetIntField(env, lpObject, XRenderPictureAttributesFc.dither, (jint)lpStruct->dither);
+ (*env)->SetIntLongField(env, lpObject, XRenderPictureAttributesFc.dither, (jintLong)lpStruct->dither);
(*env)->SetBooleanField(env, lpObject, XRenderPictureAttributesFc.component_alpha, (jboolean)lpStruct->component_alpha);
}
#endif
@@ -2790,7 +2790,7 @@ void cacheXWindowChangesFields(JNIEnv *env, jobject lpObject)
XWindowChangesFc.width = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "width", "I");
XWindowChangesFc.height = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "height", "I");
XWindowChangesFc.border_width = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "border_width", "I");
- XWindowChangesFc.sibling = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "sibling", "I");
+ XWindowChangesFc.sibling = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "sibling", I_J);
XWindowChangesFc.stack_mode = (*env)->GetFieldID(env, XWindowChangesFc.clazz, "stack_mode", "I");
XWindowChangesFc.cached = 1;
}
@@ -2803,7 +2803,7 @@ XWindowChanges *getXWindowChangesFields(JNIEnv *env, jobject lpObject, XWindowCh
lpStruct->width = (*env)->GetIntField(env, lpObject, XWindowChangesFc.width);
lpStruct->height = (*env)->GetIntField(env, lpObject, XWindowChangesFc.height);
lpStruct->border_width = (*env)->GetIntField(env, lpObject, XWindowChangesFc.border_width);
- lpStruct->sibling = (*env)->GetIntField(env, lpObject, XWindowChangesFc.sibling);
+ lpStruct->sibling = (*env)->GetIntLongField(env, lpObject, XWindowChangesFc.sibling);
lpStruct->stack_mode = (*env)->GetIntField(env, lpObject, XWindowChangesFc.stack_mode);
return lpStruct;
}
@@ -2816,7 +2816,7 @@ void setXWindowChangesFields(JNIEnv *env, jobject lpObject, XWindowChanges *lpSt
(*env)->SetIntField(env, lpObject, XWindowChangesFc.width, (jint)lpStruct->width);
(*env)->SetIntField(env, lpObject, XWindowChangesFc.height, (jint)lpStruct->height);
(*env)->SetIntField(env, lpObject, XWindowChangesFc.border_width, (jint)lpStruct->border_width);
- (*env)->SetIntField(env, lpObject, XWindowChangesFc.sibling, (jint)lpStruct->sibling);
+ (*env)->SetIntLongField(env, lpObject, XWindowChangesFc.sibling, (jintLong)lpStruct->sibling);
(*env)->SetIntField(env, lpObject, XWindowChangesFc.stack_mode, (jint)lpStruct->stack_mode);
}
#endif
diff --git a/swt.h b/swt.h
index 5404f57..b955471 100644
--- a/swt.h
+++ b/swt.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -28,37 +28,105 @@ extern "C" {
extern int IS_JNI_1_2;
+#ifndef JNI64
+#if __x86_64__
+#define JNI64
+#endif
+#endif
+
/* 64 bit support */
-#ifndef SWT_PTR_SIZE_64
-
-#define GetSWT_PTRField GetIntField
-#define SetSWT_PTRField SetIntField
-#define NewSWT_PTRArray NewIntArray
-#define CallStaticSWT_PTRMethodV CallStaticIntMethodV
-#define CallSWT_PTRMethodV CallIntMethodV
-#define CallStaticSWT_PTRMethod CallStaticIntMethod
-#define CallSWT_PTRMethod CallIntMethod
-#define GetSWT_PTRArrayElements GetIntArrayElements
-#define ReleaseSWT_PTRArrayElements ReleaseIntArrayElements
-#define SWT_PTRArray jintArray
-#define SWT_PTR jint
-#define SWT_PTR_SIGNATURE "I"
+#ifndef JNI64
+
+/* int/long defines */
+#define GetIntLongField GetIntField
+#define SetIntLongField SetIntField
+#define GetIntLongArrayElements GetIntArrayElements
+#define ReleaseIntLongArrayElements ReleaseIntArrayElements
+#define GetIntLongArrayRegion GetIntArrayRegion
+#define SetIntLongArrayRegion SetIntArrayRegion
+#define NewIntLongArray NewIntArray
+#define CallStaticIntLongMethod CallStaticIntMethod
+#define CallIntLongMethod CallIntMethod
+#define CallStaticIntLongMethodV CallStaticIntMethodV
+#define CallIntLongMethodV CallIntMethodV
+#define jintLongArray jintArray
+#define jintLong jint
+#define I_J "I"
+#define I_JArray "[I"
+
+/* float/double defines */
+#define GetFloatDoubleField GetFloatField
+#define SetFloatDoubleField SetFloatField
+#define GetFloatDoubleArrayElements GetFloatArrayElements
+#define ReleaseFloatDoubleArrayElements ReleaseFloatArrayElements
+#define GetFloatDoubleArrayRegion GetFloatArrayRegion
+#define jfloatDoubleArray jfloatArray
+#define jfloatDouble jfloat
+#define F_D "F"
+#define F_DArray "[F"
#else
-#define GetSWT_PTRField GetLongField
-#define SetSWT_PTRField SetLongField
-#define NewSWT_PTRArray NewLongArray
-#define CallStaticSWT_PTRMethodV CallStaticLongMethodV
-#define CallSWT_PTRMethodV CallLongMethodV
-#define CallStaticSWT_PTRMethod CallStaticLongMethod
-#define CallSWT_PTRMethod CallLongMethod
-#define GetSWT_PTRArrayElements GetLongArrayElements
-#define ReleaseSWT_PTRArrayElements ReleaseLongArrayElements
-#define SWT_PTRArray jlongArray
-#define SWT_PTR jlong
-#define SWT_PTR_SIGNATURE "J"
+/* int/long defines */
+#define GetIntLongField GetLongField
+#define SetIntLongField SetLongField
+#define GetIntLongArrayElements GetLongArrayElements
+#define ReleaseIntLongArrayElements ReleaseLongArrayElements
+#define GetIntLongArrayRegion GetLongArrayRegion
+#define SetIntLongArrayRegion SetLongArrayRegion
+#define NewIntLongArray NewLongArray
+#define CallStaticIntLongMethod CallStaticLongMethod
+#define CallIntLongMethod CallLongMethod
+#define CallStaticIntLongMethodV CallStaticLongMethodV
+#define CallIntLongMethodV CallLongMethodV
+#define jintLongArray jlongArray
+#define jintLong jlong
+#define I_J "J"
+#define I_JArray "[J"
+/* float/double defines */
+#define GetFloatDoubleField GetDoubleField
+#define SetFloatDoubleField SetDoubleField
+#define GetFloatDoubleArrayElements GetDoubleArrayElements
+#define ReleaseFloatDoubleArrayElements ReleaseDoubleArrayElements
+#define GetFloatDoubleArrayRegion GetDoubleArrayRegion
+#define jfloatDoubleArray jdoubleArray
+#define jfloatDouble jdouble
+#define F_D "D"
+#define F_DArray "[D"
+
+#endif
+
+#ifdef __APPLE__
+#define CALLING_CONVENTION
+#define LOAD_FUNCTION(var, name) \
+ static int initialized = 0; \
+ static void *var = NULL; \
+ if (!initialized) { \
+ CFBundleRef bundle = CFBundleGetBundleWithIdentifier(CFSTR(name##_LIB)); \
+ if (bundle) var = CFBundleGetFunctionPointerForName(bundle, CFSTR(#name)); \
+ initialized = 1; \
+ }
+#elif defined (_WIN32) || defined (_WIN32_WCE)
+#define CALLING_CONVENTION CALLBACK
+#define LOAD_FUNCTION(var, name) \
+ static int initialized = 0; \
+ static FARPROC var = NULL; \
+ if (!initialized) { \
+ HMODULE hm = LoadLibrary(name##_LIB); \
+ if (hm) var = GetProcAddress(hm, #name); \
+ initialized = 1; \
+ }
+#else
+#define CALLING_CONVENTION
+#define LOAD_FUNCTION(var, name) \
+ static int initialized = 0; \
+ static void *var = NULL; \
+ if (!initialized) { \
+ void* handle = dlopen(name##_LIB, RTLD_LAZY); \
+ if (handle) var = dlsym(handle, #name); \
+ initialized = 1; \
+ }
#endif
void throwOutOfMemory(JNIEnv *env);
diff --git a/swt_awt.c b/swt_awt.c
index ffa8ef2..c43fdc5 100644
--- a/swt_awt.c
+++ b/swt_awt.c
@@ -1,13 +1,13 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
#include "swt.h"
#include "jawt_md.h"
@@ -15,14 +15,14 @@
#define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func
#ifndef NO_getAWTHandle
-JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle)
+JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
(JNIEnv *env, jclass that, jobject canvas)
{
JAWT awt;
JAWT_DrawingSurface* ds;
JAWT_DrawingSurfaceInfo* dsi;
JAWT_X11DrawingSurfaceInfo* dsi_x11;
- SWT_PTR result = 0;
+ jintLong result = 0;
jint lock;
awt.version = JAWT_VERSION_1_3;
@@ -33,7 +33,7 @@ JNIEXPORT SWT_PTR JNICALL SWT_AWT_NATIVE(getAWTHandle)
if ((lock & JAWT_LOCK_ERROR) == 0) {
dsi = ds->GetDrawingSurfaceInfo(ds);
dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
- result = (SWT_PTR)dsi_x11->drawable;
+ result = (jintLong)dsi_x11->drawable;
ds->FreeDrawingSurfaceInfo(dsi);
ds->Unlock(ds);
}
diff --git a/version.txt b/version.txt
index 1198fb6..a33f388 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-version 3.452
\ No newline at end of file
+version 3.555
\ No newline at end of file
diff --git a/xpcom.cpp b/xpcom.cpp
index 07b9dce..1e5ec46 100644
--- a/xpcom.cpp
+++ b/xpcom.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -15,748 +15,1667 @@
#define XPCOM_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOM_##func
-#ifndef NO_Call
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(Call)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
+#if (!defined(NO__1Call__I) && !defined(JNI64)) || (!defined(NO__1Call__J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__I)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__I)(JNIEnv *env, jclass that, jintLong arg0)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__J)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__J)(JNIEnv *env, jclass that, jintLong arg0)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1Call__I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1Call__J_FUNC);
+#endif
+ rc = (jint)((jint (*)())arg0)();
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1Call__I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1Call__J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1Call__IIIIII) && !defined(JNI64)) || (!defined(NO__1Call__JJJJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1Call__IIIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1Call__JJJJJI_FUNC);
+#endif
+ rc = (jint)((SWT_XREInitEmbedding)arg0)((nsILocalFile *)arg1, (nsILocalFile *)arg2, (nsIDirectoryServiceProvider *)arg3, (nsStaticModuleInfo const *)arg4, arg5);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1Call__IIIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1Call__JJJJJI_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1Call__III_3BII_3I) && !defined(JNI64)) || (!defined(NO__1Call__JJJ_3BII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__JJJ_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__JJJ_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6)
+#endif
{
jbyte *lparg3=NULL;
jint *lparg6=NULL;
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, Call_FUNC);
+ jintLong rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1Call__III_3BII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1Call__JJJ_3BII_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- rc = (jint)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
+ rc = (jintLong)((nsWriteSegmentFun)arg0)((nsIInputStream *)arg1, (void *)arg2, (const char *)lparg3, arg4, arg5, (PRUint32 *)lparg6);
fail:
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, Call_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1Call__III_3BII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1Call__JJJ_3BII_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_NS_1GetComponentManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)(JNIEnv *env, jclass that, jintArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetComponentManager)
- (JNIEnv *env, jclass that, jintArray arg0)
+#ifndef NO__1NS_1GetComponentManager
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetComponentManager)(JNIEnv *env, jclass that, jintLongArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetComponentManager)
+ (JNIEnv *env, jclass that, jintLongArray arg0)
{
- jint *lparg0=NULL;
+ jintLong *lparg0=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1GetComponentManager_FUNC);
- if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
+ XPCOM_NATIVE_ENTER(env, that, _1NS_1GetComponentManager_FUNC);
+ if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
rc = (jint)NS_GetComponentManager((nsIComponentManager**)lparg0);
fail:
- if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, NS_1GetComponentManager_FUNC);
+ if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
+ XPCOM_NATIVE_EXIT(env, that, _1NS_1GetComponentManager_FUNC);
return rc;
}
#endif
-#ifndef NO_NS_1GetServiceManager
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)(JNIEnv *env, jclass that, jintArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1GetServiceManager)
- (JNIEnv *env, jclass that, jintArray arg0)
+#ifndef NO__1NS_1GetServiceManager
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetServiceManager)(JNIEnv *env, jclass that, jintLongArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1GetServiceManager)
+ (JNIEnv *env, jclass that, jintLongArray arg0)
{
- jint *lparg0=NULL;
+ jintLong *lparg0=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1GetServiceManager_FUNC);
- if (arg0) if ((lparg0 = env->GetIntArrayElements(arg0, NULL)) == NULL) goto fail;
+ XPCOM_NATIVE_ENTER(env, that, _1NS_1GetServiceManager_FUNC);
+ if (arg0) if ((lparg0 = env->GetIntLongArrayElements(arg0, NULL)) == NULL) goto fail;
rc = (jint)NS_GetServiceManager((nsIServiceManager**)lparg0);
fail:
- if (arg0 && lparg0) env->ReleaseIntArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, NS_1GetServiceManager_FUNC);
+ if (arg0 && lparg0) env->ReleaseIntLongArrayElements(arg0, lparg0, 0);
+ XPCOM_NATIVE_EXIT(env, that, _1NS_1GetServiceManager_FUNC);
return rc;
}
#endif
-#ifndef NO_NS_1InitXPCOM2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1InitXPCOM2)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#ifndef NO__1NS_1InitXPCOM2
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1InitXPCOM2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1InitXPCOM2)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1InitXPCOM2_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1NS_1InitXPCOM2_FUNC);
rc = (jint)NS_InitXPCOM2((nsIServiceManager **)arg0, (nsIFile *)arg1, (nsIDirectoryServiceProvider *)arg2);
- XPCOM_NATIVE_EXIT(env, that, NS_1InitXPCOM2_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1NS_1InitXPCOM2_FUNC);
return rc;
}
#endif
-#ifndef NO_NS_1NewLocalFile
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1NewLocalFile)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+#ifndef NO__1NS_1NewLocalFile
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile)(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLongArray arg2)
{
- jint *lparg2=NULL;
+ jintLong *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, NS_1NewLocalFile_FUNC);
- if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
+ XPCOM_NATIVE_ENTER(env, that, _1NS_1NewLocalFile_FUNC);
+ if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail;
rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2);
fail:
- if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, NS_1NewLocalFile_FUNC);
+ if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0);
+ XPCOM_NATIVE_EXIT(env, that, _1NS_1NewLocalFile_FUNC);
return rc;
}
#endif
-#ifndef NO_VtblCall__II
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1VtblCall__II) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint))(*(jint **)arg1)[arg0])(arg1);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong))(*(jintLong **)arg1)[arg0])(arg1);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIF
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIF)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
+#if (!defined(NO__1VtblCall__IID) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJD) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IID)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IID)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJD)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJD)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jdouble arg2)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIF_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat))(*(jint **)arg1)[arg0])(arg1, arg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIF_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IID_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJD_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jdouble))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IID_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJD_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#if (!defined(NO__1VtblCall__IIF) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJF) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJF)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloat arg2)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIF_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJF_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIF_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJF_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+#if (!defined(NO__1VtblCall__III) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4)
+#if (!defined(NO__1VtblCall__IIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#if (!defined(NO__1VtblCall__IIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO__1VtblCall__IIIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO__1VtblCall__IIIIIIIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIIIIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIIIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIIIIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#if (!defined(NO__1VtblCall__IIIIIIIIIIIIIIISI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIIIIIIIIISI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIIIIIIIIISI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIIIIIIIIISI_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIIIIIIIIISI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIIIIIIIIISI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIIIIIIIIIIIISI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIIIIIIIIIISI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jint arg16)
+#if (!defined(NO__1VtblCall__IIIIIIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIIII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jint arg8, jintArray arg9)
+#endif
{
+ jint *lparg9=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIIIIIIIIIISI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIIII_3I_FUNC);
+#endif
+ if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
+fail:
+ if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIIII_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIIIII_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIII_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
+#if (!defined(NO__1VtblCall__IIIIIIII_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIII_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jint arg7, jcharArray arg8, jintArray arg9, jintArray arg10)
+#endif
{
jchar *lparg8=NULL;
jint *lparg9=NULL;
jint *lparg10=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIII_3C_3I_3I_FUNC);
+#endif
if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
fail:
if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIII_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIII_3C_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jint arg6, jintArray arg7)
+#endif
+{
+ jint *lparg7=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIII_3I_FUNC);
+#endif
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIII_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIIIJII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIIIJII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
+#if (!defined(NO__1VtblCall__IIIIIIJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIIIJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIIIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jlong arg6, jint arg7, jint arg8)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIIIJII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIIIJII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIIIJII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIIIJII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIIIJII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIIIJII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIII_3CIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3CIIIII_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
+#if (!defined(NO__1VtblCall__IIIIII_3CIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3CIIIII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3CIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jintArray arg12, jintArray arg13)
+#endif
{
jchar *lparg6=NULL;
jint *lparg12=NULL;
jint *lparg13=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg12) if ((lparg12 = env->GetIntArrayElements(arg12, NULL)) == NULL) goto fail;
if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jint, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
fail:
if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
if (arg12 && lparg12) env->ReleaseIntArrayElements(arg12, lparg12, 0);
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3CIIIII_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIII_3C_3BIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3BIIIII_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
+#if (!defined(NO__1VtblCall__IIIIII_3C_3BIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3C_3BIIIII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3BIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jintArray arg13, jintArray arg14)
+#endif
{
jchar *lparg6=NULL;
jbyte *lparg7=NULL;
jint *lparg13=NULL;
jint *lparg14=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg13) if ((lparg13 = env->GetIntArrayElements(arg13, NULL)) == NULL) goto fail;
if (arg14) if ((lparg14 = env->GetIntArrayElements(arg14, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jbyte *, jint, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
fail:
if (arg14 && lparg14) env->ReleaseIntArrayElements(arg14, lparg14, 0);
if (arg13 && lparg13) env->ReleaseIntArrayElements(arg13, lparg13, 0);
if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIII_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO__1VtblCall__IIIIII_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
{
jchar *lparg6=NULL;
jint *lparg7=NULL;
jint *lparg8=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3C_3I_3I_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
fail:
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIII_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
+#if (!defined(NO__1VtblCall__IIIIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7)
+#endif
{
jint *lparg6=NULL;
jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3I_3I_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIII_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
+#if (!defined(NO__1VtblCall__IIIIII_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIII_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#endif
+{
+ jint *lparg6=NULL;
+ jint *lparg7=NULL;
+ jint *lparg8=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIII_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIII_3I_3I_3I_FUNC);
+#endif
+ if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+fail:
+ if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIII_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIII_3I_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIII_3B_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jbyteArray arg5, jbyteArray arg6, jint arg7)
+#endif
+{
+ jbyte *lparg5=NULL;
+ jbyte *lparg6=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3B_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3B_3BI_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, arg7);
+fail:
+ if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
+ if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3B_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3B_3BI_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIII_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jcharArray arg5)
+#endif
{
jchar *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3C_FUNC);
+#endif
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIII_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__IIIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5)
+#endif
{
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIII_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3I_FUNC);
+#endif
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIII_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIIJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIIJJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO__1VtblCall__IIIII_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIII_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIII_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+#endif
{
+ jint *lparg5=NULL;
+ jint *lparg6=NULL;
+ jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIIJJJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIIJJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIII_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIII_3I_3I_3I_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIII_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIII_3I_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIIJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIIJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIIJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIIJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIIJJJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIIJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIIJJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4)
+#if (!defined(NO__1VtblCall__IIII_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4)
+#endif
{
jbyte *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3B_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4)
+#if (!defined(NO__1VtblCall__IIII_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5)
+#endif
+{
+ jbyte *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3BI_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
+fail:
+ if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3BI_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIII_3BII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3BII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3BII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5, jint arg6)
+#endif
+{
+ jbyte *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3BII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3BII_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6);
+fail:
+ if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3BII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3BII_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIII_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jbyteArray arg4, jbyteArray arg5)
+#endif
+{
+ jbyte *lparg4=NULL;
+ jbyte *lparg5=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3B_3B_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3B_3B_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIII_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4)
+#endif
{
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3C_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3CIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CIJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#if (!defined(NO__1VtblCall__IIII_3CIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3CIJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#endif
{
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CIJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3CIJI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3CIJI_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CIJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3CIJI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3CIJI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3CJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3CJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO__1VtblCall__IIII_3CJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3CJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
{
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3CJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3CJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3CJJJ_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3CJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3CJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3CJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3C_3CI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3C_3CI_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+#if (!defined(NO__1VtblCall__IIII_3C_3CI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3C_3CI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3C_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jcharArray arg4, jcharArray arg5, jint arg6, jintArray arg7)
+#endif
{
jchar *lparg4=NULL;
jchar *lparg5=NULL;
jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3C_3CI_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3C_3CI_3I_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jchar *, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jchar *, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3C_3CI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3C_3CI_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3C_3CI_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__IIII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4)
+#endif
{
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3I_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIII_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIII_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__IIII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jintArray arg4, jintArray arg5)
+#endif
+{
+ jint *lparg4=NULL;
+ jint *lparg5=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3I_3I_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIII_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJII_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jint arg3, jlongArray arg4)
+#endif
{
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIII_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIII_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJII_3J_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIII_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIII_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJII_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIJJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIIJJJJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJIJJJJJJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJIJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8, jlongArray arg9)
+#endif
+{
+ jlong *lparg9=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIIJJJJJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJIJJJJJJ_3J_FUNC);
+#endif
+ if (arg9) if ((lparg9 = env->GetLongArrayElements(arg9, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, lparg9);
+fail:
+ if (arg9 && lparg9) env->ReleaseLongArrayElements(arg9, lparg9, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIIJJJJJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJIJJJJJJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIIJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIIJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jlong arg3, jlong arg4)
+#if (!defined(NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3)
+#endif
{
+ nsID _arg3, *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIIJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIIJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
+ if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
+fail:
+ if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+#if (!defined(NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jint arg4, jint arg5, jintArray arg6)
+#endif
{
nsID _arg3, *lparg3=NULL;
+ jint *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6);
fail:
+ if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jobject arg3, jintArray arg4)
+#endif
{
nsID _arg3, *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3)
+#if (!defined(NO__1VtblCall__III_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3)
+#endif
{
jbyte *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1VtblCall__III_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4)
+#endif
{
jbyte *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3BI_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3BI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3BI_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__III_3BI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3BI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jint arg4, jintArray arg5)
+#endif
{
jbyte *lparg3=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3BI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BI_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3BI_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3BI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BI_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3BI_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3B_3B_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3B_3BI_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+#if (!defined(NO__1VtblCall__III_3BS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3BS) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jshort arg4)
+#endif
+{
+ jbyte *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3BS_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3BS_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+ if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3BS_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3BS_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__III_3B_3B_3BI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B_3B_3BI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3B_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jint arg6, jintArray arg7)
+#endif
{
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jbyte *lparg5=NULL;
jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3B_3BI_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_3B_3BI_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jbyte *, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3B_3BI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3B_3BI_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_3B_3BI_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3B_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
+#if (!defined(NO__1VtblCall__III_3B_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jcharArray arg4)
+#endif
{
jbyte *lparg3=NULL;
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_3C_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3B_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__III_3B_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3B_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jbyteArray arg3, jintArray arg4)
+#endif
{
jbyte *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3B_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3B_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3B_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3B_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3B_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3B_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3)
+#if (!defined(NO__1VtblCall__III_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3)
+#endif
{
jchar *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3CI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3CI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jint arg4)
+#if (!defined(NO__1VtblCall__III_3CI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3CI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jint arg4)
+#endif
{
jchar *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3CI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3CI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3CI_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3CI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3CI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3CI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4)
+#if (!defined(NO__1VtblCall__III_3C_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#if (!defined(NO__1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -767,7 +1686,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
jint *lparg10=NULL;
jint *lparg11=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -776,7 +1699,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I)
if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
fail:
if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
@@ -786,15 +1709,23 @@ fail:
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3CI_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO__1VtblCall__III_3C_3CI_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3CI_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3CI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jint arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -802,54 +1733,78 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3CI_3I_3I_3I)
jint *lparg7=NULL;
jint *lparg8=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
fail:
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#if (!defined(NO__1VtblCall__III_3C_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jchar *lparg5=NULL;
jint *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3C_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
fail:
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3C_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#if (!defined(NO__1VtblCall__III_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -857,51 +1812,75 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3C_3I_3I)
jint *lparg6=NULL;
jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__III_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3C_3I_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO__1VtblCall__III_3C_3C_3I_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3I_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -910,14 +1889,18 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3C_3I_3I)
jint *lparg7=NULL;
jint *lparg8=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
fail:
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
@@ -925,15 +1908,23 @@ fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3C_3C_3I_3I_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#if (!defined(NO__1VtblCall__III_3C_3C_3I_3I_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jcharArray arg4, jintArray arg5, jintArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -943,7 +1934,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
jint *lparg8=NULL;
jint *lparg9=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -951,7 +1946,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3C_3C_3I_3I_3C_3I_3I)
if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jchar *, jint *, jint *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
fail:
if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
@@ -960,658 +1955,1754 @@ fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3)
+#if (!defined(NO__1VtblCall__III_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jcharArray arg3, jintArray arg4)
+#endif
+{
+ jchar *lparg3=NULL;
+ jint *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3C_3I_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+fail:
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3C_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__III_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3)
+#endif
+{
+ jint *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
+fail:
+ if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__III_3II) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3II) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3II)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jint arg4)
+#endif
{
jint *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3II_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3II_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3II_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3II_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__III_3I_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__III_3I_3I_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO__1VtblCall__III_3IJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3IJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3IJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jlong arg4)
+#endif
+{
+ jint *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3IJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3IJ_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+ if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3IJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3IJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__III_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#endif
+{
+ jint *lparg3=NULL;
+ jint *lparg4=NULL;
+ jint *lparg5=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_3I_3I_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__III_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
+#endif
{
jint *lparg3=NULL;
jint *lparg4=NULL;
jint *lparg5=NULL;
jint *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_3I_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
fail:
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__III_3I_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_3I_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__III_3I_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJI_3I_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__III_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJI_3I_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jint arg2, jintArray arg3, jintArray arg4, jlongArray arg5)
+#endif
+{
+ jint *lparg3=NULL;
+ jint *lparg4=NULL;
+ jlong *lparg5=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__III_3I_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJI_3I_3I_3J_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint, jint *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__III_3I_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJI_3I_3I_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2)
+#if (!defined(NO__1VtblCall__IIJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong))(*(jint **)arg1)[arg0])(arg1, arg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3)
+#if (!defined(NO__1VtblCall__IIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJI_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJIIJIIIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#if (!defined(NO__1VtblCall__IIJIIJIIIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJIIIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJIIIIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJIIIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJIIJIIIIIIIIISJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJIIIIIIIIISJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
+#if (!defined(NO__1VtblCall__IIJIIJIIIIIIIIISJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJIIIIIIIIISJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJIIIIIIIIISJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jint arg6, jint arg7, jint arg8, jint arg9, jint arg10, jint arg11, jint arg12, jint arg13, jint arg14, jshort arg15, jlong arg16)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint, jint, jint, jint, jint, jint, jint, jint, jint, jshort, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJIIIIIIIIISJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJIIJ_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJIIJ_3I_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
+#if (!defined(NO__1VtblCall__IIJIIJ_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIIJ_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIIJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintArray arg6, jlongArray arg7)
+#endif
{
jint *lparg6=NULL;
jlong *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIIJ_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIIJ_3I_3J_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jint, jlong, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jlong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJIIJ_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIIJ_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIIJ_3I_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jint arg4, jintArray arg5)
+#endif
+{
+ jint *lparg5=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJII_3I_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJII_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJIJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jint arg5, jint arg6)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJII_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJIJJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJJ_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jlong arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+#endif
+{
+ jint *lparg6=NULL;
+ jint *lparg7=NULL;
+ jint *lparg8=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJJ_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJJ_3I_3I_3I_FUNC);
+#endif
+ if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jlong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+fail:
+ if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJJ_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJJ_3I_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJI_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJI_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__IIJIJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJIJ_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJIJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlong arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+#endif
+{
+ jint *lparg5=NULL;
+ jint *lparg6=NULL;
+ jint *lparg7=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJIJ_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJIJ_3I_3I_3I_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJIJ_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJIJ_3I_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJI_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJI_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jint arg3, jlongArray arg4)
+#endif
{
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJI_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJI_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJI_3J_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJI_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJI_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJI_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3)
+#if (!defined(NO__1VtblCall__IIJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4)
+#if (!defined(NO__1VtblCall__IIJJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJI_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
+#if (!defined(NO__1VtblCall__IIJJII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#if (!defined(NO__1VtblCall__IIJJIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jint arg5, jint arg6, jint arg7)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIIII_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJIIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJIJ_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJIJ_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO__1VtblCall__IIJJIJ_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJIJ_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJIJ_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jlong arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
{
jchar *lparg6=NULL;
jint *lparg7=NULL;
jint *lparg8=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJIJ_3C_3I_3I_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jlong, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, lparg8);
fail:
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJIJ_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJIJ_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJI_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
+#if (!defined(NO__1VtblCall__IIJJI_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJI_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jcharArray arg5)
+#endif
{
jchar *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJI_3C_FUNC);
+#endif
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJI_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJI_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__IIJJI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jint arg4, jintArray arg5)
+#endif
{
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJI_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJI_3I_FUNC);
+#endif
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJI_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJI_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4)
+#if (!defined(NO__1VtblCall__IIJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
+#if (!defined(NO__1VtblCall__IIJJJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5)
+#endif
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJI_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJI_3CJJIJI_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3CJJIJI_3J_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
+#if (!defined(NO__1VtblCall__IIJJJI_3CJJIJI_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJI_3CJJIJI_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3CJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jlong arg7, jlong arg8, jint arg9, jlong arg10, jint arg11, jlongArray arg12, jlongArray arg13)
+#endif
{
jchar *lparg6=NULL;
jlong *lparg12=NULL;
jlong *lparg13=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg12) if ((lparg12 = env->GetLongArrayElements(arg12, NULL)) == NULL) goto fail;
if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint, jchar *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, arg7, arg8, arg9, arg10, arg11, lparg12, lparg13);
fail:
if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
if (arg12 && lparg12) env->ReleaseLongArrayElements(arg12, lparg12, 0);
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJI_3C_3BJJIJI_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
+#if (!defined(NO__1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jcharArray arg6, jbyteArray arg7, jlong arg8, jlong arg9, jint arg10, jlong arg11, jint arg12, jlongArray arg13, jlongArray arg14)
+#endif
{
jchar *lparg6=NULL;
jbyte *lparg7=NULL;
jlong *lparg13=NULL;
jlong *lparg14=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#endif
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg13) if ((lparg13 = env->GetLongArrayElements(arg13, NULL)) == NULL) goto fail;
if (arg14) if ((lparg14 = env->GetLongArrayElements(arg14, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint, jchar *, jbyte *, jlong, jlong, jint, jlong, jint, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, lparg6, lparg7, arg8, arg9, arg10, arg11, arg12, lparg13, lparg14);
fail:
if (arg14 && lparg14) env->ReleaseLongArrayElements(arg14, lparg14, 0);
if (arg13 && lparg13) env->ReleaseLongArrayElements(arg13, lparg13, 0);
if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJJIJ_3C_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJIJ_3C_3I_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
+#if (!defined(NO__1VtblCall__IIJJJJIJ_3C_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJIJ_3C_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJIJ_3C_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jcharArray arg8, jintArray arg9, jlongArray arg10)
+#endif
{
jchar *lparg8=NULL;
jint *lparg9=NULL;
jlong *lparg10=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
+#endif
if (arg8) if ((lparg8 = env->GetCharArrayElements(arg8, NULL)) == NULL) goto fail;
if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
if (arg10) if ((lparg10 = env->GetLongArrayElements(arg10, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jint, jlong, jchar *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, lparg8, lparg9, lparg10);
fail:
if (arg10 && lparg10) env->ReleaseLongArrayElements(arg10, lparg10, 0);
if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
if (arg8 && lparg8) env->ReleaseCharArrayElements(arg8, lparg8, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJIJ_3C_3I_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJJJJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJJJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJJJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJJJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlongArray arg7)
+#endif
+{
+ jlong *lparg7=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJJJ_3J_FUNC);
+#endif
+ if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJJJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
+#if (!defined(NO__1VtblCall__IIJJJ_3B_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ_3B_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jbyteArray arg5, jbyteArray arg6, jlong arg7)
+#endif
{
+ jbyte *lparg5=NULL;
+ jbyte *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3B_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_3B_3BJ_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jbyte *, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5, lparg6, arg7);
+fail:
+ if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
+ if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3B_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_3B_3BJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO__1VtblCall__IIJJJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jintArray arg5)
+#endif
{
+ jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_3I_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJJJJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJJJJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
+#if (!defined(NO__1VtblCall__IIJJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlong arg4, jlongArray arg5)
+#endif
{
+ jlong *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJJJJJJ_FUNC);
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jlong, jlong, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJJJJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJJ_3J_FUNC);
+#endif
+ if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJ_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jbyteArray arg4)
+#if (!defined(NO__1VtblCall__IIJJ_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4)
+#endif
{
jbyte *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3B_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJ_3CIJI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CIJI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#if (!defined(NO__1VtblCall__IIJJ_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5)
+#endif
+{
+ jbyte *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3BJ_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5);
+fail:
+ if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3BJ_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJ_3BJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3BJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3BJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jlong arg5, jint arg6)
+#endif
+{
+ jbyte *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3BJI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3BJI_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6);
+fail:
+ if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3BJI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3BJI_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJ_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jbyteArray arg4, jbyteArray arg5)
+#endif
+{
+ jbyte *lparg4=NULL;
+ jbyte *lparg5=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3B_3B_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3B_3B_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJ_3CIJI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3CIJI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CIJI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jint arg5, jlong arg6, jint arg7)
+#endif
{
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CIJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3CIJI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3CIJI_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jint, jlong, jint))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jint, jlong, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CIJI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3CIJI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3CIJI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJ_3CJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3CJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#if (!defined(NO__1VtblCall__IIJJ_3CJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3CJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3CJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jlong arg5, jlong arg6, jlong arg7)
+#endif
{
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3CJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3CJJJ_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, arg5, arg6, arg7);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3CJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3CJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3CJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJ_3C_3CI_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3C_3CI_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+#if (!defined(NO__1VtblCall__IIJJ_3C_3CI_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3C_3CI_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3C_3CI_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jcharArray arg4, jcharArray arg5, jint arg6, jlongArray arg7)
+#endif
{
jchar *lparg4=NULL;
jchar *lparg5=NULL;
jlong *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3C_3CI_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3C_3CI_3J_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jchar *, jchar *, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5, arg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3C_3CI_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3C_3CI_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3C_3CI_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4)
+#endif
+{
+ jint *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3I_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+fail:
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJJ_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJJ_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__IIJJ_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jintArray arg4, jintArray arg5)
+#endif
{
jint *lparg4=NULL;
+ jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJJ_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3I_3I_FUNC);
+#endif
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4, lparg5);
fail:
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJJ_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3)
+#if (!defined(NO__1VtblCall__IIJJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlong arg3, jlongArray arg4)
+#endif
+{
+ jlong *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJJ_3J_FUNC);
+#endif
+ if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, lparg4);
+fail:
+ if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJJ_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3)
+#endif
+{
+ nsID _arg3, *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
+ if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
+fail:
+ if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlongArray arg6)
+#endif
{
nsID _arg3, *lparg3=NULL;
+ jlong *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
+#endif
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *, jlong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, arg5, lparg6);
fail:
+ if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jobject arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jobject arg3, jlongArray arg4)
+#endif
{
nsID _arg3, *lparg3=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJ_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3)
+#endif
+{
+ jbyte *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3B_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
+fail:
+ if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3)
+#if (!defined(NO__1VtblCall__IIJ_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jint arg4)
+#endif
{
jbyte *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BI_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1VtblCall__IIJ_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4)
+#endif
{
jbyte *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BJ_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3BJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3BJ_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
+#if (!defined(NO__1VtblCall__IIJ_3BJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jlong arg4, jlongArray arg5)
+#endif
{
jbyte *lparg3=NULL;
jlong *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BJ_3J_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3BJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BJ_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJ_3BS) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3BS) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3BS)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jshort arg4)
+#endif
+{
+ jbyte *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3BS_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3BS_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jshort))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+fail:
+ if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3BS_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3BS_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3B_3B_3BJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3B_3BJ_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+#if (!defined(NO__1VtblCall__IIJ_3B_3B_3BJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3B_3B_3BJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3B_3BJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
+#endif
{
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jbyte *lparg5=NULL;
jlong *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jbyte *, jbyte *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, arg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3B_3B_3BJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3B_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3B_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
+#if (!defined(NO__1VtblCall__IIJ_3B_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3B_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3B_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jbyteArray arg3, jcharArray arg4)
+#endif
{
jbyte *lparg3=NULL;
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3B_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3B_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3B_3C_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jbyte *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jbyte *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3B_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3B_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3B_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3CI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3CI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jint arg4)
+#if (!defined(NO__1VtblCall__IIJ_3CI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3CI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3CI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jint arg4)
+#endif
{
jchar *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3CI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3CI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3CI_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jint))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3CI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3CI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3CI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#if (!defined(NO__1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jcharArray arg6, jcharArray arg7, jcharArray arg8, jcharArray arg9, jintArray arg10, jintArray arg11)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -1622,7 +3713,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
jint *lparg10=NULL;
jint *lparg11=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
@@ -1631,7 +3726,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I)
if (arg9) if ((lparg9 = env->GetCharArrayElements(arg9, NULL)) == NULL) goto fail;
if (arg10) if ((lparg10 = env->GetIntArrayElements(arg10, NULL)) == NULL) goto fail;
if (arg11) if ((lparg11 = env->GetIntArrayElements(arg11, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint, jchar *, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8, lparg9, lparg10, lparg11);
fail:
if (arg11 && lparg11) env->ReleaseIntArrayElements(arg11, lparg11, 0);
if (arg10 && lparg10) env->ReleaseIntArrayElements(arg10, lparg10, 0);
@@ -1641,15 +3736,23 @@ fail:
if (arg6 && lparg6) env->ReleaseCharArrayElements(arg6, lparg6, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3CI_3J_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO__1VtblCall__IIJ_3C_3CI_3J_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3CI_3J_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3CI_3J_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -1657,54 +3760,78 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3CI_3J_3I_3I)
jint *lparg7=NULL;
jint *lparg8=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint, jlong *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, arg5, lparg6, lparg7, lparg8);
fail:
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jchar *lparg5=NULL;
jint *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6);
fail:
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jcharArray arg5, jintArray arg6, jintArray arg7)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -1712,74 +3839,110 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3C_3I_3I)
jint *lparg6=NULL;
jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetCharArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseCharArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jintArray arg5)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
jlong *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3J_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C_3J_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C_3J_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3J_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jcharArray arg6, jintArray arg7, jintArray arg8)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -1788,14 +3951,18 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3C_3I_3I)
jint *lparg7=NULL;
jint *lparg8=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetCharArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8);
fail:
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
@@ -1803,15 +3970,23 @@ fail:
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#if (!defined(NO__1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jcharArray arg4, jlongArray arg5, jlongArray arg6, jcharArray arg7, jintArray arg8, jintArray arg9)
+#endif
{
jchar *lparg3=NULL;
jchar *lparg4=NULL;
@@ -1821,7 +3996,11 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
jint *lparg8=NULL;
jint *lparg9=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetCharArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
@@ -1829,7 +4008,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I)
if (arg7) if ((lparg7 = env->GetCharArrayElements(arg7, NULL)) == NULL) goto fail;
if (arg8) if ((lparg8 = env->GetIntArrayElements(arg8, NULL)) == NULL) goto fail;
if (arg9) if ((lparg9 = env->GetIntArrayElements(arg9, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jchar *, jlong *, jlong *, jchar *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4, lparg5, lparg6, lparg7, lparg8, lparg9);
fail:
if (arg9 && lparg9) env->ReleaseIntArrayElements(arg9, lparg9, 0);
if (arg8 && lparg8) env->ReleaseIntArrayElements(arg8, lparg8, 0);
@@ -1838,198 +4017,346 @@ fail:
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseCharArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jintArray arg3)
+#if (!defined(NO__1VtblCall__IIJ_3C_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3C_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3C_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jcharArray arg3, jlongArray arg4)
+#endif
+{
+ jchar *lparg3=NULL;
+ jlong *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3C_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3C_3J_FUNC);
+#endif
+ if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jchar *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3, lparg4);
+fail:
+ if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+ if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3C_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3C_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IIJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jintArray arg3)
+#endif
{
jint *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3I_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jint *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IIJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IIJ_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlongArray arg3)
+#if (!defined(NO__1VtblCall__IIJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IIJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlong arg2, jlongArray arg3)
+#endif
{
jlong *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IIJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IIJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJJ_3J_FUNC);
+#endif
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, arg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, arg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IIJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IIJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3)
+#endif
{
nsID _arg2, *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
fail:
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jint arg3, jobject arg4, jintArray arg5)
+#endif
{
nsID _arg2, *lparg2=NULL;
nsID _arg4, *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3)
+#endif
{
nsID _arg2, *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
fail:
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#endif
{
nsID _arg2, *lparg2=NULL;
nsID _arg4, *lparg4=NULL;
jlong *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jintArray arg4)
+#endif
{
nsID _arg2, *lparg2=NULL;
nsID _arg3, *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jobject arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jobject arg3, jlongArray arg4)
+#endif
{
nsID _arg2, *lparg2=NULL;
nsID _arg3, *lparg3=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5)
+#endif
{
nsID _arg2, *lparg2=NULL;
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
fail:
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jbyteArray arg6, jbyteArray arg7)
+#endif
{
nsID _arg2, *lparg2=NULL;
jbyte *lparg3=NULL;
@@ -2037,51 +4364,75 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozill
jbyte *lparg6=NULL;
jbyte *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jint, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5)
+#endif
{
nsID _arg2, *lparg2=NULL;
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5);
fail:
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jbyteArray arg3, jbyteArray arg4, jlong arg5, jbyteArray arg6, jbyteArray arg7)
+#endif
{
nsID _arg2, *lparg2=NULL;
jbyte *lparg3=NULL;
@@ -2089,1183 +4440,2157 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozill
jbyte *lparg6=NULL;
jbyte *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetByteArrayElements(arg6, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetByteArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jbyte *, jbyte *, jlong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, lparg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseByteArrayElements(arg7, lparg7, 0);
if (arg6 && lparg6) env->ReleaseByteArrayElements(arg6, lparg6, 0);
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jintArray arg3)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jintArray arg3)
+#endif
{
nsID _arg2, *lparg2=NULL;
jint *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jlongArray arg3)
+#if (!defined(NO__1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jobject arg2, jlongArray arg3)
+#endif
{
nsID _arg2, *lparg2=NULL;
jlong *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = getnsIDFields(env, arg2, &_arg2)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) setnsIDFields(env, arg2, lparg2);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IISIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJSIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jint arg3, jint arg4, jint arg5)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IISIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJSIII_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IISIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJSIII_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__IISJIJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJSJIJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IISJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJSJIJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshort arg2, jlong arg3, jint arg4, jlong arg5)
+#endif
+{
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IISJIJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJSJIJ_FUNC);
+#endif
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort, jlong, jint, jlong))(*(jintLong **)arg1)[arg0])(arg1, arg2, arg3, arg4, arg5);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IISJIJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJSJIJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2)
+#if (!defined(NO__1VtblCall__II_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2)
+#endif
{
jbyte *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
fail:
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3)
+#if (!defined(NO__1VtblCall__II_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3)
+#endif
{
jbyte *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
fail:
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BII_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BII_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#if (!defined(NO__1VtblCall__II_3BII_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BII_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BII_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jint arg4, jintArray arg5, jintArray arg6)
+#endif
{
jbyte *lparg2=NULL;
jint *lparg5=NULL;
jint *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BII_3I_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
fail:
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BII_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BII_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BII_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BIJ_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BIJ_3J_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
+#if (!defined(NO__1VtblCall__II_3BIJ_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BIJ_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BIJ_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlong arg4, jlongArray arg5, jintArray arg6)
+#endif
{
jbyte *lparg2=NULL;
jlong *lparg5=NULL;
jint *lparg6=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BIJ_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BIJ_3J_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jlong, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, lparg5, lparg6);
fail:
if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BIJ_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BIJ_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BIJ_3J_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jobject arg4, jintArray arg5)
+#endif
{
jbyte *lparg2=NULL;
nsID _arg4, *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3BI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4)
+#endif
{
jbyte *lparg2=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BI_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__II_3BI_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#endif
{
jbyte *lparg2=NULL;
jint *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_3I_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BI_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BI_3J_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__II_3BI_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BI_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BI_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jint arg3, jlongArray arg4, jintArray arg5)
+#endif
{
jbyte *lparg2=NULL;
jlong *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BI_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BI_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BI_3J_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BI_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BI_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BI_3J_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3)
+#if (!defined(NO__1VtblCall__II_3BJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3)
+#endif
{
jbyte *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BJ_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3);
fail:
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#if (!defined(NO__1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jobject arg4, jlongArray arg5)
+#endif
{
jbyte *lparg2=NULL;
nsID _arg4, *lparg4=NULL;
jlong *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = getnsIDFields(env, arg4, &_arg4)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) setnsIDFields(env, arg4, lparg4);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__II_3BJ_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlong arg3, jintArray arg4)
+#endif
+{
+ jbyte *lparg2=NULL;
+ jint *lparg4=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BJ_3I_FUNC);
+#endif
+ if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+fail:
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BJ_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BJ_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jint arg4)
+#endif
{
jbyte *lparg2=NULL;
nsID _arg3, *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
fail:
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlong arg4)
+#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlong arg4)
+#endif
{
jbyte *lparg2=NULL;
nsID _arg3, *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
fail:
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jintArray arg4)
+#endif
{
jbyte *lparg2=NULL;
nsID _arg3, *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jobject arg3, jlongArray arg4)
+#endif
{
jbyte *lparg2=NULL;
nsID _arg3, *lparg3=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = getnsIDFields(env, arg3, &_arg3)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, nsID *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, nsID *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) setnsIDFields(env, arg3, lparg3);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3B
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
+#if (!defined(NO__1VtblCall__II_3B_3B) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3)
+#endif
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3BI)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+#if (!defined(NO__1VtblCall__II_3B_3BI) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3BI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3BI)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jint arg4)
+#endif
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3BI_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3BI_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, arg4);
fail:
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3BI_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3BI_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3BI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3B_3BII_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
+#if (!defined(NO__1VtblCall__II_3B_3B_3BII_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3BII_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jintArray arg7)
+#endif
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3BII_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3BII_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jbyte *, jint, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3BII_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3BII_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3B_3BII_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3BII_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+#if (!defined(NO__1VtblCall__II_3B_3B_3BII_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3BII_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3BII_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4, jint arg5, jint arg6, jlongArray arg7)
+#endif
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jbyte *lparg4=NULL;
jlong *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3BII_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3BII_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetByteArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg7) if ((lparg7 = env->GetLongArrayElements(arg7, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jbyte *, jint, jint, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, arg5, arg6, lparg7);
fail:
if (arg7 && lparg7) env->ReleaseLongArrayElements(arg7, lparg7, 0);
if (arg4 && lparg4) env->ReleaseByteArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3BII_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3BII_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3BII_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3B_3B_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jintArray arg4)
+#endif
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3B_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3B_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__II_3B_3B_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3B_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jlongArray arg4)
+#endif
{
jbyte *lparg2=NULL;
jbyte *lparg3=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3B_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3B_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3B_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetByteArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseByteArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3B_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3B_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3B_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3)
+#if (!defined(NO__1VtblCall__II_3B_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3)
+#endif
{
jbyte *lparg2=NULL;
jint *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3B_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jintArray arg4)
+#endif
{
jbyte *lparg2=NULL;
jint *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3I_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3I_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__II_3B_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jintArray arg3, jlongArray arg4)
+#endif
{
jbyte *lparg2=NULL;
jint *lparg3=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3I_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3I_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3)
+#if (!defined(NO__1VtblCall__II_3B_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3)
+#endif
{
jbyte *lparg2=NULL;
jlong *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3B_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3B_3J_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3B_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3B_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3B_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jbyteArray arg2, jlongArray arg3, jintArray arg4)
+#endif
{
jbyte *lparg2=NULL;
jlong *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3B_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3B_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3B_3J_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetByteArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jbyte *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jbyte *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseByteArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3B_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3B_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3B_3J_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2)
+#if (!defined(NO__1VtblCall__II_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2)
+#endif
{
jchar *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3C_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
fail:
if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3CIIII
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#if (!defined(NO__1VtblCall__II_3CIIII) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CIIII) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIIII)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jint arg4, jint arg5, jint arg6)
+#endif
{
jchar *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CIIII_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CIIII_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint, jint, jint))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint, jint, jint))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
fail:
if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIIII_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CIIII_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CIIII_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3CIJJJ
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CIJJJ)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
+#if (!defined(NO__1VtblCall__II_3CIJJJ) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CIJJJ) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CIJJJ)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
+#endif
{
jchar *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CIJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CIJJJ_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CIJJJ_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jlong, jlong, jlong))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jlong, jlong, jlong))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, arg4, arg5, arg6);
fail:
if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CIJJJ_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CIJJJ_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CIJJJ_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3CI_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CI_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3CI_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CI_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CI_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jint arg3, jintArray arg4)
+#endif
{
jchar *lparg2=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CI_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CI_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jint, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CI_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CI_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CI_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3CJ_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3CJ_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__II_3CJ_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3CJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3CJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jlong arg3, jlongArray arg4)
+#endif
{
jchar *lparg2=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3CJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3CJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3CJ_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jlong, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jlong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3CJ_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3CJ_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3CJ_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3C_3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3C_3C)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jcharArray arg2, jcharArray arg3)
+#if (!defined(NO__1VtblCall__II_3C_3C) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3C_3C) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3C_3C)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jcharArray arg2, jcharArray arg3)
+#endif
{
jchar *lparg2=NULL;
jchar *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3C_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3C_3C_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3C_3C_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetCharArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jchar *, jchar *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jchar *, jchar *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseCharArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3C_3C_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3C_3C_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3C_3C_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3F
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3F)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jfloatArray arg2)
+#if (!defined(NO__1VtblCall__II_3F) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3F) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3F)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jfloatArray arg2)
+#endif
{
jfloat *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3F_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3F_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3F_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetFloatArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jfloat *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jfloat *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
fail:
if (arg2 && lparg2) env->ReleaseFloatArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3F_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3F_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3F_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+#if (!defined(NO__1VtblCall__II_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2)
+#endif
{
jint *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
fail:
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3)
+#if (!defined(NO__1VtblCall__II_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3)
+#endif
{
jint *lparg2=NULL;
jint *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4)
+#endif
{
jint *lparg2=NULL;
jint *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I_3I_3I_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3I_3I_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#if (!defined(NO__1VtblCall__II_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5)
+#endif
{
jint *lparg2=NULL;
jint *lparg3=NULL;
jint *lparg4=NULL;
jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_3I_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jint *, jint *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5);
fail:
if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3I_3I_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3)
+#if (!defined(NO__1VtblCall__II_3I_3I_3I_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3I_3I_3I_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3I_3I_3I_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7)
+#endif
+{
+ jint *lparg2=NULL;
+ jint *lparg3=NULL;
+ jint *lparg4=NULL;
+ jint *lparg5=NULL;
+ jint *lparg6=NULL;
+ jint *lparg7=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3I_3I_3I_3I_3I_FUNC);
+#endif
+ if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = env->GetIntArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = env->GetIntArrayElements(arg6, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jint *, jint *, jint *, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5, lparg6, lparg7);
+fail:
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg6 && lparg6) env->ReleaseIntArrayElements(arg6, lparg6, 0);
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg3 && lparg3) env->ReleaseIntArrayElements(arg3, lparg3, 0);
+ if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3I_3I_3I_3I_3I_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__II_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3)
+#endif
{
jint *lparg2=NULL;
jlong *lparg3=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
fail:
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I_3J_3I
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3I)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
+#if (!defined(NO__1VtblCall__II_3I_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jintArray arg4)
+#endif
{
jint *lparg2=NULL;
jlong *lparg3=NULL;
jint *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3J_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jint *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3I_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3J_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3I_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3I_3J_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__II_3I_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3I_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3I_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jintArray arg2, jlongArray arg3, jlongArray arg4)
+#endif
{
jint *lparg2=NULL;
jlong *lparg3=NULL;
jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3I_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3I_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3I_3J_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetIntArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jint *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jint *, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseIntArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3I_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3I_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3I_3J_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__II_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2)
+#endif
+{
+ jlong *lparg2=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_FUNC);
+#endif
+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
+fail:
+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_FUNC);
+#endif
+ return rc;
+}
+#endif
+
+#if (!defined(NO__1VtblCall__II_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3)
+#endif
+{
+ jlong *lparg2=NULL;
+ jlong *lparg3=NULL;
+ jint rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_3J_FUNC);
+#endif
+ if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3);
+fail:
+ if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
+ if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2)
+#if (!defined(NO__1VtblCall__II_3J_3J_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J_3J_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
+#endif
{
jlong *lparg2=NULL;
+ jlong *lparg3=NULL;
+ jlong *lparg4=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_3J_3J_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+ if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
fail:
+ if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
+ if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_3J_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3J_3J_3J
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)(JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3J_3J_3J)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
+#if (!defined(NO__1VtblCall__II_3J_3J_3J_3J_3J_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3J_3J_3J_3J_3J_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3J_3J_3J_3J_3J_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4, jlongArray arg5, jlongArray arg6, jintArray arg7)
+#endif
{
jlong *lparg2=NULL;
jlong *lparg3=NULL;
jlong *lparg4=NULL;
+ jlong *lparg5=NULL;
+ jlong *lparg6=NULL;
+ jint *lparg7=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3J_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3J_3J_3J_3J_3J_3I_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetLongArrayElements(arg2, NULL)) == NULL) goto fail;
if (arg3) if ((lparg3 = env->GetLongArrayElements(arg3, NULL)) == NULL) goto fail;
if (arg4) if ((lparg4 = env->GetLongArrayElements(arg4, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jlong *, jlong *, jlong *))(*(jint **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4);
+ if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg6) if ((lparg6 = env->GetLongArrayElements(arg6, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntArrayElements(arg7, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jlong *, jlong *, jlong *, jlong *, jlong *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, lparg3, lparg4, lparg5, lparg6, lparg7);
fail:
+ if (arg7 && lparg7) env->ReleaseIntArrayElements(arg7, lparg7, 0);
+ if (arg6 && lparg6) env->ReleaseLongArrayElements(arg6, lparg6, 0);
+ if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
if (arg4 && lparg4) env->ReleaseLongArrayElements(arg4, lparg4, 0);
if (arg3 && lparg3) env->ReleaseLongArrayElements(arg3, lparg3, 0);
if (arg2 && lparg2) env->ReleaseLongArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3J_3J_3J_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3J_3J_3J_3J_3J_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_VtblCall__II_3S
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(VtblCall__II_3S)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jshortArray arg2)
+#if (!defined(NO__1VtblCall__II_3S) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3S) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3S)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2)
+#endif
{
jshort *lparg2=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, VtblCall__II_3S_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3S_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3S_FUNC);
+#endif
if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
- rc = (jint)((jint (STDMETHODCALLTYPE *)(jint, jshort *))(*(jint **)arg1)[arg0])(arg1, lparg2);
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *))(*(jintLong **)arg1)[arg0])(arg1, lparg2);
fail:
if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
- XPCOM_NATIVE_EXIT(env, that, VtblCall__II_3S_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3S_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3S_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_XPCOMGlueShutdown
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueShutdown)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueShutdown)
- (JNIEnv *env, jclass that)
+#if (!defined(NO__1VtblCall__II_3SI_3I_3I) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3SI_3I_3I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SI_3I_3I)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jint arg3, jintArray arg4, jintArray arg5)
+#endif
{
+ jshort *lparg2=NULL;
+ jint *lparg4=NULL;
+ jint *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, XPCOMGlueShutdown_FUNC);
- rc = (jint)XPCOMGlueShutdown();
- XPCOM_NATIVE_EXIT(env, that, XPCOMGlueShutdown_FUNC);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3SI_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3SI_3I_3I_FUNC);
+#endif
+ if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetIntArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *, jint, jint *, jint *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
+fail:
+ if (arg5 && lparg5) env->ReleaseIntArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3SI_3I_3I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3SI_3I_3I_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_XPCOMGlueStartup
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueStartup)
- (JNIEnv *env, jclass that, jbyteArray arg0)
+#if (!defined(NO__1VtblCall__II_3SJ_3I_3J) && !defined(JNI64)) || (!defined(NO__1VtblCall__IJ_3SJ_3I_3J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__II_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5)
+#else
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1VtblCall__IJ_3SJ_3I_3J)(JNIEnv *env, jclass that, jint arg0, jintLong arg1, jshortArray arg2, jlong arg3, jintArray arg4, jlongArray arg5)
+#endif
{
- jbyte *lparg0=NULL;
+ jshort *lparg2=NULL;
+ jint *lparg4=NULL;
+ jlong *lparg5=NULL;
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, XPCOMGlueStartup_FUNC);
- if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)XPCOMGlueStartup((const char *)lparg0);
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__II_3SJ_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1VtblCall__IJ_3SJ_3I_3J_FUNC);
+#endif
+ if (arg2) if ((lparg2 = env->GetShortArrayElements(arg2, NULL)) == NULL) goto fail;
+ if (arg4) if ((lparg4 = env->GetIntArrayElements(arg4, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetLongArrayElements(arg5, NULL)) == NULL) goto fail;
+ rc = (jint)((jint (STDMETHODCALLTYPE *)(jintLong, jshort *, jlong, jint *, jlong *))(*(jintLong **)arg1)[arg0])(arg1, lparg2, arg3, lparg4, lparg5);
fail:
- if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, XPCOMGlueStartup_FUNC);
+ if (arg5 && lparg5) env->ReleaseLongArrayElements(arg5, lparg5, 0);
+ if (arg4 && lparg4) env->ReleaseIntArrayElements(arg4, lparg4, 0);
+ if (arg2 && lparg2) env->ReleaseShortArrayElements(arg2, lparg2, 0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__II_3SJ_3I_3J_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1VtblCall__IJ_3SJ_3I_3J_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO__1XPCOMGlueLoadXULFunctions
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueLoadXULFunctions)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueLoadXULFunctions)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- nsID _arg1, *lparg1=NULL;
- XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
- if (arg1) if ((lparg1 = getnsIDFields(env, arg1, &_arg1)) == NULL) goto fail;
- memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
-fail:
- if (arg1 && lparg1) setnsIDFields(env, arg1, lparg1);
- XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueLoadXULFunctions_FUNC);
+ rc = (jint)XPCOMGlueLoadXULFunctions((const nsDynamicFunctionLoad *)arg0);
+ XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueLoadXULFunctions_FUNC);
+ return rc;
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2);
-JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO__1XPCOMGlueShutdown
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueShutdown)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueShutdown)
+ (JNIEnv *env, jclass that)
{
- nsID _arg0, *lparg0=NULL;
- XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
- if (arg0) if ((lparg0 = getnsIDFields(env, arg0, &_arg0)) == NULL) goto fail;
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueShutdown_FUNC);
+ rc = (jint)XPCOMGlueShutdown();
+ XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueShutdown_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1XPCOMGlueStartup
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1XPCOMGlueStartup)
+ (JNIEnv *env, jclass that, jbyteArray arg0)
+{
+ jbyte *lparg0=NULL;
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1XPCOMGlueStartup_FUNC);
+ if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
+ rc = (jint)XPCOMGlueStartup((const char *)lparg0);
fail:
- if (arg0 && lparg0) setnsIDFields(env, arg0, lparg0);
- XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
+ if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
+ XPCOM_NATIVE_EXIT(env, that, _1XPCOMGlueStartup_FUNC);
+ return rc;
}
#endif
-#ifndef NO_nsEmbedCString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1Length)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsEmbedCString_1Length
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1Length)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedCString_1Length)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1Length_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1Length_FUNC);
rc = (jint)((nsEmbedCString *)arg0)->Length();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1Length_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1Length_FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedCString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedCString_1delete)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsEmbedCString_1delete
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedCString_1delete)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedCString_1delete)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1delete_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1delete_FUNC);
delete (nsEmbedCString *)arg0;
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1delete_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1delete_FUNC);
}
#endif
-#ifndef NO_nsEmbedCString_1get
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1get)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsEmbedCString_1get
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1get)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1get)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1get_FUNC);
- rc = (jint)((nsEmbedCString *)arg0)->get();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1get_FUNC);
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1get_FUNC);
+ rc = (jintLong)((nsEmbedCString *)arg0)->get();
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1get_FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedCString_1new__
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__)
+#ifndef NO__1nsEmbedCString_1new__
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___FUNC);
- rc = (jint)new nsEmbedCString();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___FUNC);
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new___FUNC);
+ rc = (jintLong)new nsEmbedCString();
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new___FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedCString_1new__II
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new__II)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#if (!defined(NO__1nsEmbedCString_1new__II) && !defined(JNI64)) || (!defined(NO__1nsEmbedCString_1new__JI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__II)(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+#else
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__JI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new__JI)(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+#endif
{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new__II_FUNC);
- rc = (jint)new nsEmbedCString((const char *)arg0, arg1);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new__II_FUNC);
+ jintLong rc = 0;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new__II_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new__JI_FUNC);
+#endif
+ rc = (jintLong)new nsEmbedCString((const char *)arg0, arg1);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new__II_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new__JI_FUNC);
+#endif
return rc;
}
#endif
-#ifndef NO_nsEmbedCString_1new___3BI
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedCString_1new___3BI)
+#ifndef NO__1nsEmbedCString_1new___3BI
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new___3BI)(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedCString_1new___3BI)
(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
{
jbyte *lparg0=NULL;
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedCString_1new___3BI_FUNC);
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedCString_1new___3BI_FUNC);
if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)new nsEmbedCString((const char *)lparg0, arg1);
+ rc = (jintLong)new nsEmbedCString((const char *)lparg0, arg1);
fail:
if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedCString_1new___3BI_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedCString_1new___3BI_FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedString_1Length
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1Length)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsEmbedString_1Length
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1Length)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsEmbedString_1Length)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1Length_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1Length_FUNC);
rc = (jint)((nsEmbedString *)arg0)->Length();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1Length_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1Length_FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedString_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(nsEmbedString_1delete)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsEmbedString_1delete
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedString_1delete)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsEmbedString_1delete)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1delete_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1delete_FUNC);
delete (nsEmbedString *)arg0;
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1delete_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1delete_FUNC);
}
#endif
-#ifndef NO_nsEmbedString_1get
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1get)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsEmbedString_1get
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1get)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1get)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1get_FUNC);
- rc = (jint)((nsEmbedString *)arg0)->get();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1get_FUNC);
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1get_FUNC);
+ rc = (jintLong)((nsEmbedString *)arg0)->get();
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1get_FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedString_1new__
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new__)
+#ifndef NO__1nsEmbedString_1new__
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new__)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new__)
(JNIEnv *env, jclass that)
{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___FUNC);
- rc = (jint)new nsEmbedString();
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___FUNC);
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1new___FUNC);
+ rc = (jintLong)new nsEmbedString();
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1new___FUNC);
return rc;
}
#endif
-#ifndef NO_nsEmbedString_1new___3C
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsEmbedString_1new___3C)
+#ifndef NO__1nsEmbedString_1new___3C
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new___3C)(JNIEnv *env, jclass that, jcharArray arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsEmbedString_1new___3C)
(JNIEnv *env, jclass that, jcharArray arg0)
{
jchar *lparg0=NULL;
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsEmbedString_1new___3C_FUNC);
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsEmbedString_1new___3C_FUNC);
if (arg0) if ((lparg0 = env->GetCharArrayElements(arg0, NULL)) == NULL) goto fail;
- rc = (jint)new nsEmbedString((PRUnichar *)lparg0);
+ rc = (jintLong)new nsEmbedString((PRUnichar *)lparg0);
fail:
if (arg0 && lparg0) env->ReleaseCharArrayElements(arg0, lparg0, 0);
- XPCOM_NATIVE_EXIT(env, that, nsEmbedString_1new___3C_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsEmbedString_1new___3C_FUNC);
return rc;
}
#endif
-#ifndef NO_nsID_1Equals
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)(JNIEnv *env, jclass that, jint arg0, jint arg1);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)
- (JNIEnv *env, jclass that, jint arg0, jint arg1)
+#ifndef NO__1nsID_1Equals
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1Equals)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsID_1Equals)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1Equals_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1nsID_1Equals_FUNC);
rc = (jint)((nsID *)arg0)->Equals(*(nsID *)arg1);
- XPCOM_NATIVE_EXIT(env, that, nsID_1Equals_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsID_1Equals_FUNC);
return rc;
}
#endif
-#ifndef NO_nsID_1delete
-extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)
- (JNIEnv *env, jclass that, jint arg0)
+#ifndef NO__1nsID_1delete
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsID_1delete)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT void JNICALL XPCOM_NATIVE(_1nsID_1delete)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
- XPCOM_NATIVE_ENTER(env, that, nsID_1delete_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, _1nsID_1delete_FUNC);
delete (nsID *)arg0;
- XPCOM_NATIVE_EXIT(env, that, nsID_1delete_FUNC);
+ XPCOM_NATIVE_EXIT(env, that, _1nsID_1delete_FUNC);
+}
+#endif
+
+#ifndef NO__1nsID_1new
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsID_1new)(JNIEnv *env, jclass that);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsID_1new)
+ (JNIEnv *env, jclass that)
+{
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsID_1new_FUNC);
+ rc = (jintLong)new nsID();
+ XPCOM_NATIVE_EXIT(env, that, _1nsID_1new_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1nsIMemory_1Alloc
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Alloc)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Alloc)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsIMemory_1Alloc_FUNC);
+ rc = (jintLong)((nsIMemory *)arg0)->Alloc((size_t)arg1);
+ XPCOM_NATIVE_EXIT(env, that, _1nsIMemory_1Alloc_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1nsIMemory_1Realloc
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Realloc)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIMemory_1Realloc)
+ (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
+{
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsIMemory_1Realloc_FUNC);
+ rc = (jintLong)((nsIMemory *)arg0)->Realloc((void *)arg1, (size_t)arg2);
+ XPCOM_NATIVE_EXIT(env, that, _1nsIMemory_1Realloc_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptContext_1GetNativeContext
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptContext_1GetNativeContext)(JNIEnv *env, jclass that, jintLong arg0);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptContext_1GetNativeContext)
+ (JNIEnv *env, jclass that, jintLong arg0)
+{
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsIScriptContext_1GetNativeContext_FUNC);
+ rc = (jintLong)((nsIScriptContext *)arg0)->GetNativeContext();
+ XPCOM_NATIVE_EXIT(env, that, _1nsIScriptContext_1GetNativeContext_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptGlobalObject_1EnsureScriptEnvironment
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1EnsureScriptEnvironment)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1EnsureScriptEnvironment)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC);
+ rc = (jint)((nsIScriptGlobalObject *)arg0)->EnsureScriptEnvironment(arg1);
+ XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptGlobalObject_1GetScriptContext
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptContext)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptContext)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1GetScriptContext_FUNC);
+ rc = (jintLong)((nsIScriptGlobalObject *)arg0)->GetScriptContext(arg1);
+ XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1GetScriptContext_FUNC);
+ return rc;
+}
+#endif
+
+#ifndef NO__1nsIScriptGlobalObject_1GetScriptGlobal
+extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptGlobal)(JNIEnv *env, jclass that, jintLong arg0, jint arg1);
+JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1nsIScriptGlobalObject_1GetScriptGlobal)
+ (JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+{
+ jintLong rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1nsIScriptGlobalObject_1GetScriptGlobal_FUNC);
+ rc = (jintLong)((nsIScriptGlobalObject *)arg0)->GetScriptGlobal(arg1);
+ XPCOM_NATIVE_EXIT(env, that, _1nsIScriptGlobalObject_1GetScriptGlobal_FUNC);
+ return rc;
+}
+#endif
+
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#else
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+#endif
+{
+ nsDynamicFunctionLoad _arg1, *lparg1=NULL;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J_FUNC);
+#endif
+ if (arg1) if ((lparg1 = getnsDynamicFunctionLoadFields(env, arg1, &_arg1)) == NULL) goto fail;
+ memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+fail:
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#else
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2)
+#endif
+{
+ nsID _arg1, *lparg1=NULL;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
+ if (arg1) if ((lparg1 = getnsIDFields(env, arg1, &_arg1)) == NULL) goto fail;
+ memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
+fail:
+ if (arg1 && lparg1) setnsIDFields(env, arg1, lparg1);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC);
+#endif
+}
+#endif
+
+#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI) && defined(JNI64))
+#ifndef JNI64
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#else
+extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2);
+JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
+#endif
+{
+ nsID _arg0, *lparg0=NULL;
+#ifndef JNI64
+ XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
+#else
+ XPCOM_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
+#endif
+ if (arg0) if ((lparg0 = getnsIDFields(env, arg0, &_arg0)) == NULL) goto fail;
+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+fail:
+ if (arg0 && lparg0) setnsIDFields(env, arg0, lparg0);
+#ifndef JNI64
+ XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC);
+#else
+ XPCOM_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC);
+#endif
}
#endif
-#ifndef NO_nsID_1new
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1new)
+#ifndef NO_nsDynamicFunctionLoad_1sizeof
+extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsDynamicFunctionLoad_1sizeof)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOM_NATIVE(nsDynamicFunctionLoad_1sizeof)
(JNIEnv *env, jclass that)
{
jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1new_FUNC);
- rc = (jint)new nsID();
- XPCOM_NATIVE_EXIT(env, that, nsID_1new_FUNC);
+ XPCOM_NATIVE_ENTER(env, that, nsDynamicFunctionLoad_1sizeof_FUNC);
+ rc = (jint)nsDynamicFunctionLoad_sizeof();
+ XPCOM_NATIVE_EXIT(env, that, nsDynamicFunctionLoad_1sizeof_FUNC);
return rc;
}
#endif
diff --git a/xpcom.h b/xpcom.h
index 130cb55..5e7e33d 100644
--- a/xpcom.h
+++ b/xpcom.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,13 +18,26 @@
#include "nsXPCOM.h"
#include "nsEmbedString.h"
#include "nsIInputStream.h"
+#include "nsIMemory.h"
#include "nsISupportsUtils.h"
#include "nsXPCOMGlue.h"
+#include "xpcom_custom.h"
+
+#ifndef nsIScriptContext_h__
+#include "nsIScriptContext.h"
+#include "nsIScriptGlobalObject.h"
+#endif /* nsIScriptContext_h__ */
#ifdef _WIN32
#define STDMETHODCALLTYPE __stdcall
-#else
+#define NO__1NS_1InitXPCOM2
+#else /* _WIN32 */
#define STDMETHODCALLTYPE
-#endif
+#ifdef __APPLE__
+#define NO__1NS_1InitXPCOM2
+#endif /* __APPLE__ */
+#endif /* _WIN32 */
+
+#define SWT_XREInitEmbedding nsresult (*)(nsILocalFile *,nsILocalFile *,nsIDirectoryServiceProvider *,nsStaticModuleInfo const *,PRUint32)
#endif /* INC_xpcom_H */
diff --git a/xpcom_custom.cpp b/xpcom_custom.cpp
index cf6de2c..d84a81d 100644
--- a/xpcom_custom.cpp
+++ b/xpcom_custom.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,7 +19,7 @@ extern "C" {
#ifndef NO_strlen_1PRUnichar
JNIEXPORT jint JNICALL XPCOM_NATIVE(strlen_1PRUnichar)
- (JNIEnv *env, jclass that, SWT_PTR arg0)
+ (JNIEnv *env, jclass that, jintLong arg0)
{
jint rc;
XPCOM_NATIVE_ENTER(env, that, strlen_1PRUnichar_FUNC);
@@ -35,4 +35,54 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(strlen_1PRUnichar)
}
#endif
+#ifndef NO__1JS_1EvaluateUCScriptForPrincipals
+JNIEXPORT jint JNICALL XPCOM_NATIVE(_1JS_1EvaluateUCScriptForPrincipals)
+ (JNIEnv *env, jclass that, jbyteArray mozillaPath, jintLong arg0, jintLong arg1, jintLong arg2, jcharArray arg3, jint arg4, jbyteArray arg5, jint arg6, jintLongArray arg7)
+{
+ jbyte *lpmozillaPath=NULL;
+ jchar *lparg3=NULL;
+ jbyte *lparg5=NULL;
+ jintLong *lparg7=NULL;
+ jint rc = 0;
+ XPCOM_NATIVE_ENTER(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC);
+ if (mozillaPath) if ((lpmozillaPath = env->GetByteArrayElements(mozillaPath, NULL)) == NULL) goto fail;
+ if (arg3) if ((lparg3 = env->GetCharArrayElements(arg3, NULL)) == NULL) goto fail;
+ if (arg5) if ((lparg5 = env->GetByteArrayElements(arg5, NULL)) == NULL) goto fail;
+ if (arg7) if ((lparg7 = env->GetIntLongArrayElements(arg7, NULL)) == NULL) goto fail;
+/*
+ rc = (jint)JS_EvaluateUCScriptForPrincipals(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+*/
+ {
+
+#ifdef _WIN32
+ LOAD_FUNCTION(fp, JS_EvaluateUCScriptForPrincipals)
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+ }
+#else
+#define CALLING_CONVENTION
+ static int initialized = 0;
+ static void *fp = NULL;
+ if (!initialized) {
+ void* handle = dlopen((const char *)lpmozillaPath, RTLD_LAZY);
+ if (handle) {
+ fp = dlsym(handle, "JS_EvaluateUCScriptForPrincipals");
+ }
+ initialized = 1;
+ }
+ if (fp) {
+ rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jchar *, jint, jbyte *, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3, arg4, lparg5, arg6, lparg7);
+ }
+#endif /* _WIN32 */
+ }
+fail:
+ if (arg7 && lparg7) env->ReleaseIntLongArrayElements(arg7, lparg7, 0);
+ if (arg5 && lparg5) env->ReleaseByteArrayElements(arg5, lparg5, 0);
+ if (arg3 && lparg3) env->ReleaseCharArrayElements(arg3, lparg3, 0);
+ if (mozillaPath && lpmozillaPath) env->ReleaseByteArrayElements(mozillaPath, lpmozillaPath, 0);
+ XPCOM_NATIVE_EXIT(env, that, _1JS_1EvaluateUCScriptForPrincipals_FUNC);
+ return rc;
+}
+#endif
+
}
diff --git a/org/eclipse/swt/internal/image/LZWNode.java b/xpcom_custom.h
old mode 100755
new mode 100644
similarity index 71%
copy from org/eclipse/swt/internal/image/LZWNode.java
copy to xpcom_custom.h
index e24bff1..c11fe30
--- a/org/eclipse/swt/internal/image/LZWNode.java
+++ b/xpcom_custom.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,10 +8,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.swt.internal.image;
-
-final class LZWNode {
- public LZWNode left, right, children;
- public int code, prefix, suffix;
-}
+#ifdef _WIN32
+#include <windows.h>
+#define JS_EvaluateUCScriptForPrincipals_LIB "js3250.dll"
+#define XP_WIN
+#else
+#include <dlfcn.h>
+#endif
diff --git a/xpcom_stats.cpp b/xpcom_stats.cpp
index b276290..3e9979b 100644
--- a/xpcom_stats.cpp
+++ b/xpcom_stats.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,178 +14,1018 @@
#ifdef NATIVE_STATS
-int XPCOM_nativeFunctionCount = 170;
-int XPCOM_nativeFunctionCallCount[170];
+int XPCOM_nativeFunctionCount = 226;
+int XPCOM_nativeFunctionCallCount[226];
char * XPCOM_nativeFunctionNames[] = {
- "Call",
- "NS_1GetComponentManager",
- "NS_1GetServiceManager",
- "NS_1InitXPCOM2",
- "NS_1NewLocalFile",
- "VtblCall__II",
- "VtblCall__IIF",
- "VtblCall__III",
- "VtblCall__IIII",
- "VtblCall__IIIII",
- "VtblCall__IIIIII",
- "VtblCall__IIIIIII",
- "VtblCall__IIIIIIII",
- "VtblCall__IIIIIIIIIIII",
- "VtblCall__IIIIIIIIIIIIIIISI",
- "VtblCall__IIIIIIII_3C_3I_3I",
- "VtblCall__IIIIIIJII",
- "VtblCall__IIIIII_3CIIIII_3I_3I",
- "VtblCall__IIIIII_3C_3BIIIII_3I_3I",
- "VtblCall__IIIIII_3C_3I_3I",
- "VtblCall__IIIIII_3I_3I",
- "VtblCall__IIIII_3C",
- "VtblCall__IIIII_3I",
- "VtblCall__IIIIJJJJ",
- "VtblCall__IIII_3B",
- "VtblCall__IIII_3C",
- "VtblCall__IIII_3CIJI",
- "VtblCall__IIII_3CJJJ",
- "VtblCall__IIII_3C_3CI_3I",
- "VtblCall__IIII_3I",
- "VtblCall__IIII_3J",
- "VtblCall__IIIJJ",
- "VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
- "VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
- "VtblCall__III_3B",
- "VtblCall__III_3BI",
- "VtblCall__III_3BI_3I",
- "VtblCall__III_3B_3B_3BI_3I",
- "VtblCall__III_3B_3C",
- "VtblCall__III_3B_3I",
- "VtblCall__III_3C",
- "VtblCall__III_3CI",
- "VtblCall__III_3C_3C",
- "VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
- "VtblCall__III_3C_3CI_3I_3I_3I",
- "VtblCall__III_3C_3C_3C_3I",
- "VtblCall__III_3C_3C_3C_3I_3I",
- "VtblCall__III_3C_3C_3I",
- "VtblCall__III_3C_3C_3I_3C_3I_3I",
- "VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
- "VtblCall__III_3I",
- "VtblCall__III_3I_3I_3I_3I",
- "VtblCall__IIJ",
- "VtblCall__IIJI",
- "VtblCall__IIJIIJIIIIII",
- "VtblCall__IIJIIJIIIIIIIIISJ",
- "VtblCall__IIJIIJ_3I_3J",
- "VtblCall__IIJI_3J",
- "VtblCall__IIJJ",
- "VtblCall__IIJJI",
- "VtblCall__IIJJII",
- "VtblCall__IIJJIIII",
- "VtblCall__IIJJIJ_3C_3I_3I",
- "VtblCall__IIJJI_3C",
- "VtblCall__IIJJI_3I",
- "VtblCall__IIJJJ",
- "VtblCall__IIJJJI",
- "VtblCall__IIJJJI_3CJJIJI_3J_3J",
- "VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
- "VtblCall__IIJJJJIJ_3C_3I_3J",
- "VtblCall__IIJJJJJ",
- "VtblCall__IIJJJJJJ",
- "VtblCall__IIJJJJJJJ",
- "VtblCall__IIJJ_3B",
- "VtblCall__IIJJ_3CIJI",
- "VtblCall__IIJJ_3CJJJ",
- "VtblCall__IIJJ_3C_3CI_3J",
- "VtblCall__IIJJ_3I",
- "VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
- "VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
- "VtblCall__IIJ_3B",
- "VtblCall__IIJ_3BI",
- "VtblCall__IIJ_3BJ_3J",
- "VtblCall__IIJ_3B_3B_3BJ_3J",
- "VtblCall__IIJ_3B_3C",
- "VtblCall__IIJ_3CI",
- "VtblCall__IIJ_3C_3C",
- "VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
- "VtblCall__IIJ_3C_3CI_3J_3I_3I",
- "VtblCall__IIJ_3C_3C_3C_3I",
- "VtblCall__IIJ_3C_3C_3C_3I_3I",
- "VtblCall__IIJ_3C_3C_3I",
- "VtblCall__IIJ_3C_3C_3J",
- "VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
- "VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
- "VtblCall__IIJ_3I",
- "VtblCall__IIJ_3J",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
- "VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
- "VtblCall__II_3B",
- "VtblCall__II_3BI",
- "VtblCall__II_3BII_3I_3I",
- "VtblCall__II_3BIJ_3J_3I",
- "VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
- "VtblCall__II_3BI_3I",
- "VtblCall__II_3BI_3I_3I",
- "VtblCall__II_3BI_3J_3I",
- "VtblCall__II_3BJ",
- "VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
- "VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
- "VtblCall__II_3B_3B",
- "VtblCall__II_3B_3BI",
- "VtblCall__II_3B_3B_3BII_3I",
- "VtblCall__II_3B_3B_3BII_3J",
- "VtblCall__II_3B_3B_3I",
- "VtblCall__II_3B_3B_3J",
- "VtblCall__II_3B_3I",
- "VtblCall__II_3B_3I_3I",
- "VtblCall__II_3B_3I_3J",
- "VtblCall__II_3B_3J",
- "VtblCall__II_3B_3J_3I",
- "VtblCall__II_3C",
- "VtblCall__II_3CIIII",
- "VtblCall__II_3CIJJJ",
- "VtblCall__II_3CI_3I",
- "VtblCall__II_3CJ_3J",
- "VtblCall__II_3C_3C",
- "VtblCall__II_3F",
- "VtblCall__II_3I",
- "VtblCall__II_3I_3I",
- "VtblCall__II_3I_3I_3I",
- "VtblCall__II_3I_3I_3I_3I",
- "VtblCall__II_3I_3J",
- "VtblCall__II_3I_3J_3I",
- "VtblCall__II_3I_3J_3J",
- "VtblCall__II_3J",
- "VtblCall__II_3J_3J_3J",
- "VtblCall__II_3S",
- "XPCOMGlueShutdown",
- "XPCOMGlueStartup",
+ "GetAddress",
+#ifndef JNI64
+ "_1Call__I",
+#else
+ "_1Call__J",
+#endif
+#ifndef JNI64
+ "_1Call__IIIIII",
+#else
+ "_1Call__JJJJJI",
+#endif
+#ifndef JNI64
+ "_1Call__III_3BII_3I",
+#else
+ "_1Call__JJJ_3BII_3I",
+#endif
+ "_1JS_1EvaluateUCScriptForPrincipals",
+ "_1NS_1GetComponentManager",
+ "_1NS_1GetServiceManager",
+ "_1NS_1InitXPCOM2",
+ "_1NS_1NewLocalFile",
+#ifndef JNI64
+ "_1VtblCall__II",
+#else
+ "_1VtblCall__IJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IID",
+#else
+ "_1VtblCall__IJD",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIF",
+#else
+ "_1VtblCall__IJF",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III",
+#else
+ "_1VtblCall__IJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII",
+#else
+ "_1VtblCall__IJII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIII",
+#else
+ "_1VtblCall__IJIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIII",
+#else
+ "_1VtblCall__IJIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIII",
+#else
+ "_1VtblCall__IJIIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIIII",
+#else
+ "_1VtblCall__IJIIIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIIIIIIII",
+#else
+ "_1VtblCall__IJIIIIIIIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIIIIIIIIIIISI",
+#else
+ "_1VtblCall__IJIIIIIIIIIIIIISI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIIIII_3I",
+#else
+ "_1VtblCall__IJIIIIIII_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIIII_3C_3I_3I",
+#else
+ "_1VtblCall__IJIIIIII_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIII_3I",
+#else
+ "_1VtblCall__IJIIIII_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIIIJII",
+#else
+ "_1VtblCall__IJIIIIJII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIII_3CIIIII_3I_3I",
+#else
+ "_1VtblCall__IJIIII_3CIIIII_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIII_3C_3BIIIII_3I_3I",
+#else
+ "_1VtblCall__IJIIII_3C_3BIIIII_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIII_3C_3I_3I",
+#else
+ "_1VtblCall__IJIIII_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIII_3I_3I",
+#else
+ "_1VtblCall__IJIIII_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIII_3I_3I_3I",
+#else
+ "_1VtblCall__IJIIII_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIII_3B_3BI",
+#else
+ "_1VtblCall__IJIII_3B_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIII_3C",
+#else
+ "_1VtblCall__IJIII_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIII_3I",
+#else
+ "_1VtblCall__IJIII_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIII_3I_3I_3I",
+#else
+ "_1VtblCall__IJIII_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIIJJJJ",
+#else
+ "_1VtblCall__IJIIJJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3B",
+#else
+ "_1VtblCall__IJII_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3BI",
+#else
+ "_1VtblCall__IJII_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3BII",
+#else
+ "_1VtblCall__IJII_3BII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3B_3B",
+#else
+ "_1VtblCall__IJII_3B_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3C",
+#else
+ "_1VtblCall__IJII_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3CIJI",
+#else
+ "_1VtblCall__IJII_3CIJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3CJJJ",
+#else
+ "_1VtblCall__IJII_3CJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3C_3CI_3I",
+#else
+ "_1VtblCall__IJII_3C_3CI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3I",
+#else
+ "_1VtblCall__IJII_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3I_3I",
+#else
+ "_1VtblCall__IJII_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIII_3J",
+#else
+ "_1VtblCall__IJII_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIJJ",
+#else
+ "_1VtblCall__IJIJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIIJJJJJJ_3J",
+#else
+ "_1VtblCall__IJIJJJJJJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2",
+#else
+ "_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I",
+#else
+ "_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+ "_1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3B",
+#else
+ "_1VtblCall__IJI_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3BI",
+#else
+ "_1VtblCall__IJI_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3BI_3I",
+#else
+ "_1VtblCall__IJI_3BI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3BS",
+#else
+ "_1VtblCall__IJI_3BS",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3B_3B_3BI_3I",
+#else
+ "_1VtblCall__IJI_3B_3B_3BI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3B_3C",
+#else
+ "_1VtblCall__IJI_3B_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3B_3I",
+#else
+ "_1VtblCall__IJI_3B_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C",
+#else
+ "_1VtblCall__IJI_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3CI",
+#else
+ "_1VtblCall__IJI_3CI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3C",
+#else
+ "_1VtblCall__IJI_3C_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I",
+#else
+ "_1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3CI_3I_3I_3I",
+#else
+ "_1VtblCall__IJI_3C_3CI_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3C_3C_3I",
+#else
+ "_1VtblCall__IJI_3C_3C_3C_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3C_3C_3I_3I",
+#else
+ "_1VtblCall__IJI_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3C_3I",
+#else
+ "_1VtblCall__IJI_3C_3C_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3C_3I_3C_3I_3I",
+#else
+ "_1VtblCall__IJI_3C_3C_3I_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3C_3I_3I_3C_3I_3I",
+#else
+ "_1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3C_3I",
+#else
+ "_1VtblCall__IJI_3C_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3I",
+#else
+ "_1VtblCall__IJI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3II",
+#else
+ "_1VtblCall__IJI_3II",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3IJ",
+#else
+ "_1VtblCall__IJI_3IJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3I_3I_3I",
+#else
+ "_1VtblCall__IJI_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3I_3I_3I_3I",
+#else
+ "_1VtblCall__IJI_3I_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__III_3I_3I_3J",
+#else
+ "_1VtblCall__IJI_3I_3I_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ",
+#else
+ "_1VtblCall__IJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJI",
+#else
+ "_1VtblCall__IJJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJIIJIIIIII",
+#else
+ "_1VtblCall__IJJIIJIIIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJIIJIIIIIIIIISJ",
+#else
+ "_1VtblCall__IJJIIJIIIIIIIIISJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJIIJ_3I_3J",
+#else
+ "_1VtblCall__IJJIIJ_3I_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJII_3I",
+#else
+ "_1VtblCall__IJJII_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJIJII",
+#else
+ "_1VtblCall__IJJIJII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJIJJ_3I_3I_3I",
+#else
+ "_1VtblCall__IJJIJJ_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJIJ_3I_3I_3I",
+#else
+ "_1VtblCall__IJJIJ_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJI_3J",
+#else
+ "_1VtblCall__IJJI_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ",
+#else
+ "_1VtblCall__IJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJI",
+#else
+ "_1VtblCall__IJJJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJII",
+#else
+ "_1VtblCall__IJJJII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJIIII",
+#else
+ "_1VtblCall__IJJJIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJIJ_3C_3I_3I",
+#else
+ "_1VtblCall__IJJJIJ_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJI_3C",
+#else
+ "_1VtblCall__IJJJI_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJI_3I",
+#else
+ "_1VtblCall__IJJJI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJ",
+#else
+ "_1VtblCall__IJJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJI",
+#else
+ "_1VtblCall__IJJJJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJI_3CJJIJI_3J_3J",
+#else
+ "_1VtblCall__IJJJJI_3CJJIJI_3J_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J",
+#else
+ "_1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJJIJ_3C_3I_3J",
+#else
+ "_1VtblCall__IJJJJJIJ_3C_3I_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJJJ",
+#else
+ "_1VtblCall__IJJJJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJJJJ",
+#else
+ "_1VtblCall__IJJJJJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJJJJJ",
+#else
+ "_1VtblCall__IJJJJJJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJJJ_3J",
+#else
+ "_1VtblCall__IJJJJJJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJ_3B_3BJ",
+#else
+ "_1VtblCall__IJJJJ_3B_3BJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJ_3I",
+#else
+ "_1VtblCall__IJJJJ_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJJ_3J",
+#else
+ "_1VtblCall__IJJJJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3B",
+#else
+ "_1VtblCall__IJJJ_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3BJ",
+#else
+ "_1VtblCall__IJJJ_3BJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3BJI",
+#else
+ "_1VtblCall__IJJJ_3BJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3B_3B",
+#else
+ "_1VtblCall__IJJJ_3B_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3CIJI",
+#else
+ "_1VtblCall__IJJJ_3CIJI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3CJJJ",
+#else
+ "_1VtblCall__IJJJ_3CJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3C_3CI_3J",
+#else
+ "_1VtblCall__IJJJ_3C_3CI_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3I",
+#else
+ "_1VtblCall__IJJJ_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3I_3I",
+#else
+ "_1VtblCall__IJJJ_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJJ_3J",
+#else
+ "_1VtblCall__IJJJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2",
+#else
+ "_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J",
+#else
+ "_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+ "_1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3B",
+#else
+ "_1VtblCall__IJJ_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3BI",
+#else
+ "_1VtblCall__IJJ_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3BJ",
+#else
+ "_1VtblCall__IJJ_3BJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3BJ_3J",
+#else
+ "_1VtblCall__IJJ_3BJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3BS",
+#else
+ "_1VtblCall__IJJ_3BS",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3B_3B_3BJ_3J",
+#else
+ "_1VtblCall__IJJ_3B_3B_3BJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3B_3C",
+#else
+ "_1VtblCall__IJJ_3B_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3CI",
+#else
+ "_1VtblCall__IJJ_3CI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C",
+#else
+ "_1VtblCall__IJJ_3C_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I",
+#else
+ "_1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3CI_3J_3I_3I",
+#else
+ "_1VtblCall__IJJ_3C_3CI_3J_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C_3C_3I",
+#else
+ "_1VtblCall__IJJ_3C_3C_3C_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C_3C_3I_3I",
+#else
+ "_1VtblCall__IJJ_3C_3C_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C_3I",
+#else
+ "_1VtblCall__IJJ_3C_3C_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C_3J",
+#else
+ "_1VtblCall__IJJ_3C_3C_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C_3J_3C_3I_3I",
+#else
+ "_1VtblCall__IJJ_3C_3C_3J_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I",
+#else
+ "_1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3C_3J",
+#else
+ "_1VtblCall__IJJ_3C_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3I",
+#else
+ "_1VtblCall__IJJ_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IIJ_3J",
+#else
+ "_1VtblCall__IJJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+ "_1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IISIII",
+#else
+ "_1VtblCall__IJSIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__IISJIJ",
+#else
+ "_1VtblCall__IJSJIJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B",
+#else
+ "_1VtblCall__IJ_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BI",
+#else
+ "_1VtblCall__IJ_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BII_3I_3I",
+#else
+ "_1VtblCall__IJ_3BII_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BIJ_3J_3I",
+#else
+ "_1VtblCall__IJ_3BIJ_3J_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+ "_1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BI_3I",
+#else
+ "_1VtblCall__IJ_3BI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BI_3I_3I",
+#else
+ "_1VtblCall__IJ_3BI_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BI_3J_3I",
+#else
+ "_1VtblCall__IJ_3BI_3J_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BJ",
+#else
+ "_1VtblCall__IJ_3BJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+ "_1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BJ_3I",
+#else
+ "_1VtblCall__IJ_3BJ_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#else
+ "_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
+#else
+ "_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#else
+ "_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#else
+ "_1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3B",
+#else
+ "_1VtblCall__IJ_3B_3B",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3BI",
+#else
+ "_1VtblCall__IJ_3B_3BI",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3B_3BII_3I",
+#else
+ "_1VtblCall__IJ_3B_3B_3BII_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3B_3BII_3J",
+#else
+ "_1VtblCall__IJ_3B_3B_3BII_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3B_3I",
+#else
+ "_1VtblCall__IJ_3B_3B_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3B_3J",
+#else
+ "_1VtblCall__IJ_3B_3B_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3I",
+#else
+ "_1VtblCall__IJ_3B_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3I_3I",
+#else
+ "_1VtblCall__IJ_3B_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3I_3J",
+#else
+ "_1VtblCall__IJ_3B_3I_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3J",
+#else
+ "_1VtblCall__IJ_3B_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3B_3J_3I",
+#else
+ "_1VtblCall__IJ_3B_3J_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3C",
+#else
+ "_1VtblCall__IJ_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3CIIII",
+#else
+ "_1VtblCall__IJ_3CIIII",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3CIJJJ",
+#else
+ "_1VtblCall__IJ_3CIJJJ",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3CI_3I",
+#else
+ "_1VtblCall__IJ_3CI_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3CJ_3J",
+#else
+ "_1VtblCall__IJ_3CJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3C_3C",
+#else
+ "_1VtblCall__IJ_3C_3C",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3F",
+#else
+ "_1VtblCall__IJ_3F",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I",
+#else
+ "_1VtblCall__IJ_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3I",
+#else
+ "_1VtblCall__IJ_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3I_3I",
+#else
+ "_1VtblCall__IJ_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3I_3I_3I",
+#else
+ "_1VtblCall__IJ_3I_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3I_3I_3I_3I_3I",
+#else
+ "_1VtblCall__IJ_3I_3I_3I_3I_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3J",
+#else
+ "_1VtblCall__IJ_3I_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3J_3I",
+#else
+ "_1VtblCall__IJ_3I_3J_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3I_3J_3J",
+#else
+ "_1VtblCall__IJ_3I_3J_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3J",
+#else
+ "_1VtblCall__IJ_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3J_3J",
+#else
+ "_1VtblCall__IJ_3J_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3J_3J_3J",
+#else
+ "_1VtblCall__IJ_3J_3J_3J",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3J_3J_3J_3J_3J_3I",
+#else
+ "_1VtblCall__IJ_3J_3J_3J_3J_3J_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3S",
+#else
+ "_1VtblCall__IJ_3S",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3SI_3I_3I",
+#else
+ "_1VtblCall__IJ_3SI_3I_3I",
+#endif
+#ifndef JNI64
+ "_1VtblCall__II_3SJ_3I_3J",
+#else
+ "_1VtblCall__IJ_3SJ_3I_3J",
+#endif
+ "_1XPCOMGlueLoadXULFunctions",
+ "_1XPCOMGlueShutdown",
+ "_1XPCOMGlueStartup",
+ "_1nsEmbedCString_1Length",
+ "_1nsEmbedCString_1delete",
+ "_1nsEmbedCString_1get",
+ "_1nsEmbedCString_1new__",
+#ifndef JNI64
+ "_1nsEmbedCString_1new__II",
+#else
+ "_1nsEmbedCString_1new__JI",
+#endif
+ "_1nsEmbedCString_1new___3BI",
+ "_1nsEmbedString_1Length",
+ "_1nsEmbedString_1delete",
+ "_1nsEmbedString_1get",
+ "_1nsEmbedString_1new__",
+ "_1nsEmbedString_1new___3C",
+ "_1nsID_1Equals",
+ "_1nsID_1delete",
+ "_1nsID_1new",
+ "_1nsIMemory_1Alloc",
+ "_1nsIMemory_1Realloc",
+ "_1nsIScriptContext_1GetNativeContext",
+ "_1nsIScriptGlobalObject_1EnsureScriptEnvironment",
+ "_1nsIScriptGlobalObject_1GetScriptContext",
+ "_1nsIScriptGlobalObject_1GetScriptGlobal",
+#ifndef JNI64
+ "memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J",
+#endif
+#ifndef JNI64
"memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
+#else
+ "memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I",
+#endif
+#ifndef JNI64
"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II",
- "nsEmbedCString_1Length",
- "nsEmbedCString_1delete",
- "nsEmbedCString_1get",
- "nsEmbedCString_1new__",
- "nsEmbedCString_1new__II",
- "nsEmbedCString_1new___3BI",
- "nsEmbedString_1Length",
- "nsEmbedString_1delete",
- "nsEmbedString_1get",
- "nsEmbedString_1new__",
- "nsEmbedString_1new___3C",
- "nsID_1Equals",
- "nsID_1delete",
- "nsID_1new",
+#else
+ "memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI",
+#endif
+ "nsDynamicFunctionLoad_1sizeof",
"strlen_1PRUnichar",
};
diff --git a/xpcom_stats.h b/xpcom_stats.h
index 11990c6..0e0c0dc 100644
--- a/xpcom_stats.h
+++ b/xpcom_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,174 +25,1014 @@ extern char* XPCOM_nativeFunctionNames[];
#endif
typedef enum {
- Call_FUNC,
- NS_1GetComponentManager_FUNC,
- NS_1GetServiceManager_FUNC,
- NS_1InitXPCOM2_FUNC,
- NS_1NewLocalFile_FUNC,
- VtblCall__II_FUNC,
- VtblCall__IIF_FUNC,
- VtblCall__III_FUNC,
- VtblCall__IIII_FUNC,
- VtblCall__IIIII_FUNC,
- VtblCall__IIIIII_FUNC,
- VtblCall__IIIIIII_FUNC,
- VtblCall__IIIIIIII_FUNC,
- VtblCall__IIIIIIIIIIII_FUNC,
- VtblCall__IIIIIIIIIIIIIIISI_FUNC,
- VtblCall__IIIIIIII_3C_3I_3I_FUNC,
- VtblCall__IIIIIIJII_FUNC,
- VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
- VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
- VtblCall__IIIIII_3C_3I_3I_FUNC,
- VtblCall__IIIIII_3I_3I_FUNC,
- VtblCall__IIIII_3C_FUNC,
- VtblCall__IIIII_3I_FUNC,
- VtblCall__IIIIJJJJ_FUNC,
- VtblCall__IIII_3B_FUNC,
- VtblCall__IIII_3C_FUNC,
- VtblCall__IIII_3CIJI_FUNC,
- VtblCall__IIII_3CJJJ_FUNC,
- VtblCall__IIII_3C_3CI_3I_FUNC,
- VtblCall__IIII_3I_FUNC,
- VtblCall__IIII_3J_FUNC,
- VtblCall__IIIJJ_FUNC,
- VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
- VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
- VtblCall__III_3B_FUNC,
- VtblCall__III_3BI_FUNC,
- VtblCall__III_3BI_3I_FUNC,
- VtblCall__III_3B_3B_3BI_3I_FUNC,
- VtblCall__III_3B_3C_FUNC,
- VtblCall__III_3B_3I_FUNC,
- VtblCall__III_3C_FUNC,
- VtblCall__III_3CI_FUNC,
- VtblCall__III_3C_3C_FUNC,
- VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
- VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
- VtblCall__III_3C_3C_3C_3I_FUNC,
- VtblCall__III_3C_3C_3C_3I_3I_FUNC,
- VtblCall__III_3C_3C_3I_FUNC,
- VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
- VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
- VtblCall__III_3I_FUNC,
- VtblCall__III_3I_3I_3I_3I_FUNC,
- VtblCall__IIJ_FUNC,
- VtblCall__IIJI_FUNC,
- VtblCall__IIJIIJIIIIII_FUNC,
- VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
- VtblCall__IIJIIJ_3I_3J_FUNC,
- VtblCall__IIJI_3J_FUNC,
- VtblCall__IIJJ_FUNC,
- VtblCall__IIJJI_FUNC,
- VtblCall__IIJJII_FUNC,
- VtblCall__IIJJIIII_FUNC,
- VtblCall__IIJJIJ_3C_3I_3I_FUNC,
- VtblCall__IIJJI_3C_FUNC,
- VtblCall__IIJJI_3I_FUNC,
- VtblCall__IIJJJ_FUNC,
- VtblCall__IIJJJI_FUNC,
- VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
- VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
- VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
- VtblCall__IIJJJJJ_FUNC,
- VtblCall__IIJJJJJJ_FUNC,
- VtblCall__IIJJJJJJJ_FUNC,
- VtblCall__IIJJ_3B_FUNC,
- VtblCall__IIJJ_3CIJI_FUNC,
- VtblCall__IIJJ_3CJJJ_FUNC,
- VtblCall__IIJJ_3C_3CI_3J_FUNC,
- VtblCall__IIJJ_3I_FUNC,
- VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
- VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
- VtblCall__IIJ_3B_FUNC,
- VtblCall__IIJ_3BI_FUNC,
- VtblCall__IIJ_3BJ_3J_FUNC,
- VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
- VtblCall__IIJ_3B_3C_FUNC,
- VtblCall__IIJ_3CI_FUNC,
- VtblCall__IIJ_3C_3C_FUNC,
- VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
- VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
- VtblCall__IIJ_3C_3C_3C_3I_FUNC,
- VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
- VtblCall__IIJ_3C_3C_3I_FUNC,
- VtblCall__IIJ_3C_3C_3J_FUNC,
- VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
- VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
- VtblCall__IIJ_3I_FUNC,
- VtblCall__IIJ_3J_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
- VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
- VtblCall__II_3B_FUNC,
- VtblCall__II_3BI_FUNC,
- VtblCall__II_3BII_3I_3I_FUNC,
- VtblCall__II_3BIJ_3J_3I_FUNC,
- VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
- VtblCall__II_3BI_3I_FUNC,
- VtblCall__II_3BI_3I_3I_FUNC,
- VtblCall__II_3BI_3J_3I_FUNC,
- VtblCall__II_3BJ_FUNC,
- VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
- VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
- VtblCall__II_3B_3B_FUNC,
- VtblCall__II_3B_3BI_FUNC,
- VtblCall__II_3B_3B_3BII_3I_FUNC,
- VtblCall__II_3B_3B_3BII_3J_FUNC,
- VtblCall__II_3B_3B_3I_FUNC,
- VtblCall__II_3B_3B_3J_FUNC,
- VtblCall__II_3B_3I_FUNC,
- VtblCall__II_3B_3I_3I_FUNC,
- VtblCall__II_3B_3I_3J_FUNC,
- VtblCall__II_3B_3J_FUNC,
- VtblCall__II_3B_3J_3I_FUNC,
- VtblCall__II_3C_FUNC,
- VtblCall__II_3CIIII_FUNC,
- VtblCall__II_3CIJJJ_FUNC,
- VtblCall__II_3CI_3I_FUNC,
- VtblCall__II_3CJ_3J_FUNC,
- VtblCall__II_3C_3C_FUNC,
- VtblCall__II_3F_FUNC,
- VtblCall__II_3I_FUNC,
- VtblCall__II_3I_3I_FUNC,
- VtblCall__II_3I_3I_3I_FUNC,
- VtblCall__II_3I_3I_3I_3I_FUNC,
- VtblCall__II_3I_3J_FUNC,
- VtblCall__II_3I_3J_3I_FUNC,
- VtblCall__II_3I_3J_3J_FUNC,
- VtblCall__II_3J_FUNC,
- VtblCall__II_3J_3J_3J_FUNC,
- VtblCall__II_3S_FUNC,
- XPCOMGlueShutdown_FUNC,
- XPCOMGlueStartup_FUNC,
+ GetAddress_FUNC,
+#ifndef JNI64
+ _1Call__I_FUNC,
+#else
+ _1Call__J_FUNC,
+#endif
+#ifndef JNI64
+ _1Call__IIIIII_FUNC,
+#else
+ _1Call__JJJJJI_FUNC,
+#endif
+#ifndef JNI64
+ _1Call__III_3BII_3I_FUNC,
+#else
+ _1Call__JJJ_3BII_3I_FUNC,
+#endif
+ _1JS_1EvaluateUCScriptForPrincipals_FUNC,
+ _1NS_1GetComponentManager_FUNC,
+ _1NS_1GetServiceManager_FUNC,
+ _1NS_1InitXPCOM2_FUNC,
+ _1NS_1NewLocalFile_FUNC,
+#ifndef JNI64
+ _1VtblCall__II_FUNC,
+#else
+ _1VtblCall__IJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IID_FUNC,
+#else
+ _1VtblCall__IJD_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIF_FUNC,
+#else
+ _1VtblCall__IJF_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_FUNC,
+#else
+ _1VtblCall__IJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_FUNC,
+#else
+ _1VtblCall__IJII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIII_FUNC,
+#else
+ _1VtblCall__IJIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIII_FUNC,
+#else
+ _1VtblCall__IJIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIII_FUNC,
+#else
+ _1VtblCall__IJIIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIIII_FUNC,
+#else
+ _1VtblCall__IJIIIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIIIIIIII_FUNC,
+#else
+ _1VtblCall__IJIIIIIIIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIIIIIIIIIIISI_FUNC,
+#else
+ _1VtblCall__IJIIIIIIIIIIIIISI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIIIII_3I_FUNC,
+#else
+ _1VtblCall__IJIIIIIII_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIIII_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIIIIII_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIII_3I_FUNC,
+#else
+ _1VtblCall__IJIIIII_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIIIJII_FUNC,
+#else
+ _1VtblCall__IJIIIIJII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIII_3CIIIII_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIIII_3CIIIII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIII_3C_3BIIIII_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIIII_3C_3BIIIII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIII_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIIII_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIII_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIIII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIII_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIIII_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIII_3B_3BI_FUNC,
+#else
+ _1VtblCall__IJIII_3B_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIII_3C_FUNC,
+#else
+ _1VtblCall__IJIII_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIII_3I_FUNC,
+#else
+ _1VtblCall__IJIII_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIII_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJIII_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIIJJJJ_FUNC,
+#else
+ _1VtblCall__IJIIJJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3B_FUNC,
+#else
+ _1VtblCall__IJII_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3BI_FUNC,
+#else
+ _1VtblCall__IJII_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3BII_FUNC,
+#else
+ _1VtblCall__IJII_3BII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3B_3B_FUNC,
+#else
+ _1VtblCall__IJII_3B_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3C_FUNC,
+#else
+ _1VtblCall__IJII_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3CIJI_FUNC,
+#else
+ _1VtblCall__IJII_3CIJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3CJJJ_FUNC,
+#else
+ _1VtblCall__IJII_3CJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3C_3CI_3I_FUNC,
+#else
+ _1VtblCall__IJII_3C_3CI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3I_FUNC,
+#else
+ _1VtblCall__IJII_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3I_3I_FUNC,
+#else
+ _1VtblCall__IJII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIII_3J_FUNC,
+#else
+ _1VtblCall__IJII_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIJJ_FUNC,
+#else
+ _1VtblCall__IJIJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIIJJJJJJ_3J_FUNC,
+#else
+ _1VtblCall__IJIJJJJJJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#else
+ _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC,
+#else
+ _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2II_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+ _1VtblCall__IJILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3B_FUNC,
+#else
+ _1VtblCall__IJI_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3BI_FUNC,
+#else
+ _1VtblCall__IJI_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3BI_3I_FUNC,
+#else
+ _1VtblCall__IJI_3BI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3BS_FUNC,
+#else
+ _1VtblCall__IJI_3BS_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3B_3B_3BI_3I_FUNC,
+#else
+ _1VtblCall__IJI_3B_3B_3BI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3B_3C_FUNC,
+#else
+ _1VtblCall__IJI_3B_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3B_3I_FUNC,
+#else
+ _1VtblCall__IJI_3B_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_FUNC,
+#else
+ _1VtblCall__IJI_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3CI_FUNC,
+#else
+ _1VtblCall__IJI_3CI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3C_FUNC,
+#else
+ _1VtblCall__IJI_3C_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3CI_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3CI_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3C_3C_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3C_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3C_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3C_3I_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3C_3I_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3C_3I_3I_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3C_3I_3I_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3C_3I_FUNC,
+#else
+ _1VtblCall__IJI_3C_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3I_FUNC,
+#else
+ _1VtblCall__IJI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3II_FUNC,
+#else
+ _1VtblCall__IJI_3II_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3IJ_FUNC,
+#else
+ _1VtblCall__IJI_3IJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3I_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJI_3I_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__III_3I_3I_3J_FUNC,
+#else
+ _1VtblCall__IJI_3I_3I_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_FUNC,
+#else
+ _1VtblCall__IJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJI_FUNC,
+#else
+ _1VtblCall__IJJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJIIJIIIIII_FUNC,
+#else
+ _1VtblCall__IJJIIJIIIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJIIJIIIIIIIIISJ_FUNC,
+#else
+ _1VtblCall__IJJIIJIIIIIIIIISJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJIIJ_3I_3J_FUNC,
+#else
+ _1VtblCall__IJJIIJ_3I_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJII_3I_FUNC,
+#else
+ _1VtblCall__IJJII_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJIJII_FUNC,
+#else
+ _1VtblCall__IJJIJII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJIJJ_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJIJJ_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJIJ_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJIJ_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJI_3J_FUNC,
+#else
+ _1VtblCall__IJJI_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_FUNC,
+#else
+ _1VtblCall__IJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJI_FUNC,
+#else
+ _1VtblCall__IJJJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJII_FUNC,
+#else
+ _1VtblCall__IJJJII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJIIII_FUNC,
+#else
+ _1VtblCall__IJJJIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJIJ_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJJIJ_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJI_3C_FUNC,
+#else
+ _1VtblCall__IJJJI_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJI_3I_FUNC,
+#else
+ _1VtblCall__IJJJI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJ_FUNC,
+#else
+ _1VtblCall__IJJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJI_FUNC,
+#else
+ _1VtblCall__IJJJJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJI_3CJJIJI_3J_3J_FUNC,
+#else
+ _1VtblCall__IJJJJI_3CJJIJI_3J_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJI_3C_3BJJIJI_3J_3J_FUNC,
+#else
+ _1VtblCall__IJJJJI_3C_3BJJIJI_3J_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJJIJ_3C_3I_3J_FUNC,
+#else
+ _1VtblCall__IJJJJJIJ_3C_3I_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJJJ_FUNC,
+#else
+ _1VtblCall__IJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJJJJ_FUNC,
+#else
+ _1VtblCall__IJJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJJJJJ_FUNC,
+#else
+ _1VtblCall__IJJJJJJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJJJ_3J_FUNC,
+#else
+ _1VtblCall__IJJJJJJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJ_3B_3BJ_FUNC,
+#else
+ _1VtblCall__IJJJJ_3B_3BJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJ_3I_FUNC,
+#else
+ _1VtblCall__IJJJJ_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJJ_3J_FUNC,
+#else
+ _1VtblCall__IJJJJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3B_FUNC,
+#else
+ _1VtblCall__IJJJ_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3BJ_FUNC,
+#else
+ _1VtblCall__IJJJ_3BJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3BJI_FUNC,
+#else
+ _1VtblCall__IJJJ_3BJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3B_3B_FUNC,
+#else
+ _1VtblCall__IJJJ_3B_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3CIJI_FUNC,
+#else
+ _1VtblCall__IJJJ_3CIJI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3CJJJ_FUNC,
+#else
+ _1VtblCall__IJJJ_3CJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3C_3CI_3J_FUNC,
+#else
+ _1VtblCall__IJJJ_3C_3CI_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3I_FUNC,
+#else
+ _1VtblCall__IJJJ_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJJ_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJJ_3J_FUNC,
+#else
+ _1VtblCall__IJJJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#else
+ _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC,
+#else
+ _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2JJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+ _1VtblCall__IJJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3B_FUNC,
+#else
+ _1VtblCall__IJJ_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3BI_FUNC,
+#else
+ _1VtblCall__IJJ_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3BJ_FUNC,
+#else
+ _1VtblCall__IJJ_3BJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3BJ_3J_FUNC,
+#else
+ _1VtblCall__IJJ_3BJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3BS_FUNC,
+#else
+ _1VtblCall__IJJ_3BS_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3B_3B_3BJ_3J_FUNC,
+#else
+ _1VtblCall__IJJ_3B_3B_3BJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3B_3C_FUNC,
+#else
+ _1VtblCall__IJJ_3B_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3CI_FUNC,
+#else
+ _1VtblCall__IJJ_3CI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3CI_3C_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3CI_3J_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3CI_3J_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_3C_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_3J_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_3J_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_3J_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3C_3J_3J_3C_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3C_3J_FUNC,
+#else
+ _1VtblCall__IJJ_3C_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3I_FUNC,
+#else
+ _1VtblCall__IJJ_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IIJ_3J_FUNC,
+#else
+ _1VtblCall__IJJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2JLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BJ_3B_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+ _1VtblCall__IJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IISIII_FUNC,
+#else
+ _1VtblCall__IJSIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__IISJIJ_FUNC,
+#else
+ _1VtblCall__IJSJIJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_FUNC,
+#else
+ _1VtblCall__IJ_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BI_FUNC,
+#else
+ _1VtblCall__IJ_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BII_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BII_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BIJ_3J_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BIJ_3J_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BI_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BI_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BI_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BI_3J_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BI_3J_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BJ_FUNC,
+#else
+ _1VtblCall__IJ_3BJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+ _1VtblCall__IJ_3BJLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BJ_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BJ_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#else
+ _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#else
+ _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#else
+ _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#else
+ _1VtblCall__IJ_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3B_FUNC,
+#else
+ _1VtblCall__IJ_3B_3B_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3BI_FUNC,
+#else
+ _1VtblCall__IJ_3B_3BI_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3B_3BII_3I_FUNC,
+#else
+ _1VtblCall__IJ_3B_3B_3BII_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3B_3BII_3J_FUNC,
+#else
+ _1VtblCall__IJ_3B_3B_3BII_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3B_3I_FUNC,
+#else
+ _1VtblCall__IJ_3B_3B_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3B_3J_FUNC,
+#else
+ _1VtblCall__IJ_3B_3B_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3I_FUNC,
+#else
+ _1VtblCall__IJ_3B_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3B_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3I_3J_FUNC,
+#else
+ _1VtblCall__IJ_3B_3I_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3J_FUNC,
+#else
+ _1VtblCall__IJ_3B_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3B_3J_3I_FUNC,
+#else
+ _1VtblCall__IJ_3B_3J_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3C_FUNC,
+#else
+ _1VtblCall__IJ_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3CIIII_FUNC,
+#else
+ _1VtblCall__IJ_3CIIII_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3CIJJJ_FUNC,
+#else
+ _1VtblCall__IJ_3CIJJJ_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3CI_3I_FUNC,
+#else
+ _1VtblCall__IJ_3CI_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3CJ_3J_FUNC,
+#else
+ _1VtblCall__IJ_3CJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3C_3C_FUNC,
+#else
+ _1VtblCall__IJ_3C_3C_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3F_FUNC,
+#else
+ _1VtblCall__IJ_3F_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_FUNC,
+#else
+ _1VtblCall__IJ_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3I_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3I_3I_3I_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3I_3I_3I_3I_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3J_FUNC,
+#else
+ _1VtblCall__IJ_3I_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3J_3I_FUNC,
+#else
+ _1VtblCall__IJ_3I_3J_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3I_3J_3J_FUNC,
+#else
+ _1VtblCall__IJ_3I_3J_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3J_FUNC,
+#else
+ _1VtblCall__IJ_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3J_3J_FUNC,
+#else
+ _1VtblCall__IJ_3J_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3J_3J_3J_FUNC,
+#else
+ _1VtblCall__IJ_3J_3J_3J_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3J_3J_3J_3J_3J_3I_FUNC,
+#else
+ _1VtblCall__IJ_3J_3J_3J_3J_3J_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3S_FUNC,
+#else
+ _1VtblCall__IJ_3S_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3SI_3I_3I_FUNC,
+#else
+ _1VtblCall__IJ_3SI_3I_3I_FUNC,
+#endif
+#ifndef JNI64
+ _1VtblCall__II_3SJ_3I_3J_FUNC,
+#else
+ _1VtblCall__IJ_3SJ_3I_3J_FUNC,
+#endif
+ _1XPCOMGlueLoadXULFunctions_FUNC,
+ _1XPCOMGlueShutdown_FUNC,
+ _1XPCOMGlueStartup_FUNC,
+ _1nsEmbedCString_1Length_FUNC,
+ _1nsEmbedCString_1delete_FUNC,
+ _1nsEmbedCString_1get_FUNC,
+ _1nsEmbedCString_1new___FUNC,
+#ifndef JNI64
+ _1nsEmbedCString_1new__II_FUNC,
+#else
+ _1nsEmbedCString_1new__JI_FUNC,
+#endif
+ _1nsEmbedCString_1new___3BI_FUNC,
+ _1nsEmbedString_1Length_FUNC,
+ _1nsEmbedString_1delete_FUNC,
+ _1nsEmbedString_1get_FUNC,
+ _1nsEmbedString_1new___FUNC,
+ _1nsEmbedString_1new___3C_FUNC,
+ _1nsID_1Equals_FUNC,
+ _1nsID_1delete_FUNC,
+ _1nsID_1new_FUNC,
+ _1nsIMemory_1Alloc_FUNC,
+ _1nsIMemory_1Realloc_FUNC,
+ _1nsIScriptContext_1GetNativeContext_FUNC,
+ _1nsIScriptGlobalObject_1EnsureScriptEnvironment_FUNC,
+ _1nsIScriptGlobalObject_1GetScriptContext_FUNC,
+ _1nsIScriptGlobalObject_1GetScriptGlobal_FUNC,
+#ifndef JNI64
+ memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J_FUNC,
+#endif
+#ifndef JNI64
memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#else
+ memmove__JLorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
+#endif
+#ifndef JNI64
memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC,
- nsEmbedCString_1Length_FUNC,
- nsEmbedCString_1delete_FUNC,
- nsEmbedCString_1get_FUNC,
- nsEmbedCString_1new___FUNC,
- nsEmbedCString_1new__II_FUNC,
- nsEmbedCString_1new___3BI_FUNC,
- nsEmbedString_1Length_FUNC,
- nsEmbedString_1delete_FUNC,
- nsEmbedString_1get_FUNC,
- nsEmbedString_1new___FUNC,
- nsEmbedString_1new___3C_FUNC,
- nsID_1Equals_FUNC,
- nsID_1delete_FUNC,
- nsID_1new_FUNC,
+#else
+ memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2JI_FUNC,
+#endif
+ nsDynamicFunctionLoad_1sizeof_FUNC,
strlen_1PRUnichar_FUNC,
} XPCOM_FUNCS;
diff --git a/xpcom_structs.cpp b/xpcom_structs.cpp
index f90f026..9e2d989 100644
--- a/xpcom_structs.cpp
+++ b/xpcom_structs.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,40 @@
#include "swt.h"
#include "xpcom_structs.h"
+#ifndef NO_nsDynamicFunctionLoad
+typedef struct nsDynamicFunctionLoad_FID_CACHE {
+ int cached;
+ jclass clazz;
+ jfieldID functionName, function;
+} nsDynamicFunctionLoad_FID_CACHE;
+
+nsDynamicFunctionLoad_FID_CACHE nsDynamicFunctionLoadFc;
+
+void cachensDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject)
+{
+ if (nsDynamicFunctionLoadFc.cached) return;
+ nsDynamicFunctionLoadFc.clazz = env->GetObjectClass(lpObject);
+ nsDynamicFunctionLoadFc.functionName = env->GetFieldID(nsDynamicFunctionLoadFc.clazz, "functionName", I_J);
+ nsDynamicFunctionLoadFc.function = env->GetFieldID(nsDynamicFunctionLoadFc.clazz, "function", I_J);
+ nsDynamicFunctionLoadFc.cached = 1;
+}
+
+nsDynamicFunctionLoad *getnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct)
+{
+ if (!nsDynamicFunctionLoadFc.cached) cachensDynamicFunctionLoadFields(env, lpObject);
+ lpStruct->functionName = (const char *)env->GetIntLongField(lpObject, nsDynamicFunctionLoadFc.functionName);
+ lpStruct->function = (NSFuncPtr *)env->GetIntLongField(lpObject, nsDynamicFunctionLoadFc.function);
+ return lpStruct;
+}
+
+void setnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct)
+{
+ if (!nsDynamicFunctionLoadFc.cached) cachensDynamicFunctionLoadFields(env, lpObject);
+ env->SetIntLongField(lpObject, nsDynamicFunctionLoadFc.functionName, (jintLong)lpStruct->functionName);
+ env->SetIntLongField(lpObject, nsDynamicFunctionLoadFc.function, (jintLong)lpStruct->function);
+}
+#endif
+
#ifndef NO_nsID
typedef struct nsID_FID_CACHE {
int cached;
diff --git a/xpcom_structs.h b/xpcom_structs.h
index ff8c118..51e3be1 100644
--- a/xpcom_structs.h
+++ b/xpcom_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,18 @@
#include "xpcom.h"
+#ifndef NO_nsDynamicFunctionLoad
+void cachensDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject);
+nsDynamicFunctionLoad *getnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct);
+void setnsDynamicFunctionLoadFields(JNIEnv *env, jobject lpObject, nsDynamicFunctionLoad *lpStruct);
+#define nsDynamicFunctionLoad_sizeof() sizeof(nsDynamicFunctionLoad)
+#else
+#define cachensDynamicFunctionLoadFields(a,b)
+#define getnsDynamicFunctionLoadFields(a,b,c) NULL
+#define setnsDynamicFunctionLoadFields(a,b,c)
+#define nsDynamicFunctionLoad_sizeof() 0
+#endif
+
#ifndef NO_nsID
void cachensIDFields(JNIEnv *env, jobject lpObject);
nsID *getnsIDFields(JNIEnv *env, jobject lpObject, nsID *lpStruct);
diff --git a/xpcominit.cpp b/xpcominit.cpp
index 8b8705d..45b342c 100644
--- a/xpcominit.cpp
+++ b/xpcominit.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@
#include "xpcominit_structs.h"
#include "xpcominit_stats.h"
-#define XPCOMInit_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOMInit_##func
+#define XPCOMInit_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_init_XPCOMInit_##func
#ifndef NO_GREVersionRange_1sizeof
extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREVersionRange_1sizeof)(JNIEnv *env, jclass that);
@@ -28,49 +28,49 @@ JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GREVersionRange_1sizeof)
}
#endif
-#ifndef NO_GRE_1GetGREPathWithProperties
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(GRE_1GetGREPathWithProperties)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+#ifndef NO__1GRE_1GetGREPathWithProperties
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1GRE_1GetGREPathWithProperties)(JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jint arg3, jintLong arg4, jint arg5);
+JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1GRE_1GetGREPathWithProperties)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jint arg3, jintLong arg4, jint arg5)
{
GREVersionRange _arg0, *lparg0=NULL;
jint rc = 0;
- XPCOMInit_NATIVE_ENTER(env, that, GRE_1GetGREPathWithProperties_FUNC);
+ XPCOMInit_NATIVE_ENTER(env, that, _1GRE_1GetGREPathWithProperties_FUNC);
if (arg0) if ((lparg0 = getGREVersionRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
rc = (jint)GRE_GetGREPathWithProperties((const GREVersionRange *)lparg0, arg1, (const GREProperty *)arg2, arg3, (char *)arg4, arg5);
fail:
if (arg0 && lparg0) setGREVersionRangeFields(env, arg0, lparg0);
- XPCOMInit_NATIVE_EXIT(env, that, GRE_1GetGREPathWithProperties_FUNC);
+ XPCOMInit_NATIVE_EXIT(env, that, _1GRE_1GetGREPathWithProperties_FUNC);
return rc;
}
#endif
-#ifndef NO_XPCOMGlueShutdown
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueShutdown)(JNIEnv *env, jclass that);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueShutdown)
+#ifndef NO__1XPCOMGlueShutdown
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueShutdown)(JNIEnv *env, jclass that);
+JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueShutdown)
(JNIEnv *env, jclass that)
{
jint rc = 0;
- XPCOMInit_NATIVE_ENTER(env, that, XPCOMGlueShutdown_FUNC);
+ XPCOMInit_NATIVE_ENTER(env, that, _1XPCOMGlueShutdown_FUNC);
rc = (jint)XPCOMGlueShutdown();
- XPCOMInit_NATIVE_EXIT(env, that, XPCOMGlueShutdown_FUNC);
+ XPCOMInit_NATIVE_EXIT(env, that, _1XPCOMGlueShutdown_FUNC);
return rc;
}
#endif
-#ifndef NO_XPCOMGlueStartup
-extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
-JNIEXPORT jint JNICALL XPCOMInit_NATIVE(XPCOMGlueStartup)
+#ifndef NO__1XPCOMGlueStartup
+extern "C" JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueStartup)(JNIEnv *env, jclass that, jbyteArray arg0);
+JNIEXPORT jint JNICALL XPCOMInit_NATIVE(_1XPCOMGlueStartup)
(JNIEnv *env, jclass that, jbyteArray arg0)
{
jbyte *lparg0=NULL;
jint rc = 0;
- XPCOMInit_NATIVE_ENTER(env, that, XPCOMGlueStartup_FUNC);
+ XPCOMInit_NATIVE_ENTER(env, that, _1XPCOMGlueStartup_FUNC);
if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
rc = (jint)XPCOMGlueStartup((const char *)lparg0);
fail:
if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
- XPCOMInit_NATIVE_EXIT(env, that, XPCOMGlueStartup_FUNC);
+ XPCOMInit_NATIVE_EXIT(env, that, _1XPCOMGlueStartup_FUNC);
return rc;
}
#endif
diff --git a/xpcominit_stats.cpp b/xpcominit_stats.cpp
index ffb6bc3..687a29a 100644
--- a/xpcominit_stats.cpp
+++ b/xpcominit_stats.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,9 +18,9 @@ int XPCOMInit_nativeFunctionCount = 4;
int XPCOMInit_nativeFunctionCallCount[4];
char * XPCOMInit_nativeFunctionNames[] = {
"GREVersionRange_1sizeof",
- "GRE_1GetGREPathWithProperties",
- "XPCOMGlueShutdown",
- "XPCOMGlueStartup",
+ "_1GRE_1GetGREPathWithProperties",
+ "_1XPCOMGlueShutdown",
+ "_1XPCOMGlueStartup",
};
#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
diff --git a/xpcominit_stats.h b/xpcominit_stats.h
index c20d074..048e3d7 100644
--- a/xpcominit_stats.h
+++ b/xpcominit_stats.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@ extern char* XPCOMInit_nativeFunctionNames[];
typedef enum {
GREVersionRange_1sizeof_FUNC,
- GRE_1GetGREPathWithProperties_FUNC,
- XPCOMGlueShutdown_FUNC,
- XPCOMGlueStartup_FUNC,
+ _1GRE_1GetGREPathWithProperties_FUNC,
+ _1XPCOMGlueShutdown_FUNC,
+ _1XPCOMGlueStartup_FUNC,
} XPCOMInit_FUNCS;
diff --git a/xpcominit_structs.cpp b/xpcominit_structs.cpp
index 02b533b..e9edfd6 100644
--- a/xpcominit_structs.cpp
+++ b/xpcominit_structs.cpp
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,9 +25,9 @@ void cacheGREVersionRangeFields(JNIEnv *env, jobject lpObject)
{
if (GREVersionRangeFc.cached) return;
GREVersionRangeFc.clazz = env->GetObjectClass(lpObject);
- GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", "I");
+ GREVersionRangeFc.lower = env->GetFieldID(GREVersionRangeFc.clazz, "lower", I_J);
GREVersionRangeFc.lowerInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "lowerInclusive", "Z");
- GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", "I");
+ GREVersionRangeFc.upper = env->GetFieldID(GREVersionRangeFc.clazz, "upper", I_J);
GREVersionRangeFc.upperInclusive = env->GetFieldID(GREVersionRangeFc.clazz, "upperInclusive", "Z");
GREVersionRangeFc.cached = 1;
}
@@ -35,9 +35,9 @@ void cacheGREVersionRangeFields(JNIEnv *env, jobject lpObject)
GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
{
if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
- lpStruct->lower = (const char *)env->GetIntField(lpObject, GREVersionRangeFc.lower);
+ lpStruct->lower = (const char *)env->GetIntLongField(lpObject, GREVersionRangeFc.lower);
lpStruct->lowerInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive);
- lpStruct->upper = (const char *)env->GetIntField(lpObject, GREVersionRangeFc.upper);
+ lpStruct->upper = (const char *)env->GetIntLongField(lpObject, GREVersionRangeFc.upper);
lpStruct->upperInclusive = env->GetBooleanField(lpObject, GREVersionRangeFc.upperInclusive);
return lpStruct;
}
@@ -45,9 +45,9 @@ GREVersionRange *getGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVers
void setGREVersionRangeFields(JNIEnv *env, jobject lpObject, GREVersionRange *lpStruct)
{
if (!GREVersionRangeFc.cached) cacheGREVersionRangeFields(env, lpObject);
- env->SetIntField(lpObject, GREVersionRangeFc.lower, (jint)lpStruct->lower);
+ env->SetIntLongField(lpObject, GREVersionRangeFc.lower, (jintLong)lpStruct->lower);
env->SetBooleanField(lpObject, GREVersionRangeFc.lowerInclusive, (jboolean)lpStruct->lowerInclusive);
- env->SetIntField(lpObject, GREVersionRangeFc.upper, (jint)lpStruct->upper);
+ env->SetIntLongField(lpObject, GREVersionRangeFc.upper, (jintLong)lpStruct->upper);
env->SetBooleanField(lpObject, GREVersionRangeFc.upperInclusive, (jboolean)lpStruct->upperInclusive);
}
#endif
diff --git a/xpcominit_structs.h b/xpcominit_structs.h
index 07b3ada..096a9da 100644
--- a/xpcominit_structs.h
+++ b/xpcominit_structs.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
hooks/post-receive
--
Debian packaging for swt-gtk.
More information about the pkg-java-commits
mailing list