--- swt-gtk-3.5.1.orig/debian/Makefile +++ swt-gtk-3.5.1/debian/Makefile @@ -0,0 +1,36 @@ +RELEASE=3.5.1 +JAVA=swt-gtk-$(RELEASE).jar +CLEANFILES=*.files *.jar *-stamp + +JAR=fastjar +JAVAC=javac -classpath . +RM=rm -f + +all: $(JAVA) + $(MAKE) -f make_linux.mak make_atk make_awt make_cairo make_glx \ + make_gnome make_mozilla make_swt make_xpcominit make_xulrunner + +clean distclean: + $(RM) $(CLEANFILES) + $(RM) -r swt-gtk-$(RELEASE) + -$(MAKE) -f make_linux.mak clean + +.PHONY: all clean distclean + +swt-gtk-$(RELEASE).files: + find org -name *.java | sort > $@ + +%-stamp: %.files + mkdir -p $* + for i in `cat $<`; do \ + if [ -e $*/$${i%java}class ]; then \ + echo SKIPPING $$i; \ + else \ + echo $(JAVAC) -d $* $$i; \ + $(JAVAC) -d $* $$i || exit $$?; \ + fi \ + done + touch $@ + +%.jar: %-stamp + $(JAR) -C $* -cf $@ . --- swt-gtk-3.5.1.orig/debian/NEWS.Debian +++ swt-gtk-3.5.1/debian/NEWS.Debian @@ -0,0 +1,22 @@ +swt-gtk (3.5.1-2) unstable; urgency=low + + * Update packaging for being the only source of the SWT libraries in + Debian, effectively dropping the tight connection with the eclipse + package. + - Drop eclipse binary packages for SWT and maintain only the swt-gtk + generated packages. + + - This was influenced by many arguments from different people, notably: + + + Myself (swt-gtk maintainer and eclipse co-maintainer). + + Benjamin Drung and Niels Thykier (eclipse co-maintainers). + + Onkar Shinde. + + Maykel Koch. + + - The main arguments is that this is a commonly used library which is used + more and more commonly outside the eclipse environment. + We don't want cases such as SWT being blocked by eclipse, or uploading + a new eclipse version for just including a SWT bugfix and viceversa, + among others. + + -- Adrian Perez Thu, 17 Dec 2009 19:55:19 -0500 --- swt-gtk-3.5.1.orig/debian/README +++ swt-gtk-3.5.1/debian/README @@ -0,0 +1,153 @@ +SWT + +The most succinct description of the Standard Widget Toolkit component +is this: + + The SWT component is designed to provide efficient, portable + access to the user-interface facilities of the operating systems + on which it is implemented. + +The SWT component implementors take each of the terms in this +statement to have a very specific meaning: + +"efficient" + implies that SWT must be as thin a layer on top of the operating + system facilities as possible. So, for example, SWT avoids the use + of a separate peer layer as is found in the Sun AWT class library, + thereby gaining increased speed and space efficiency at the cost + of some amount of implementation flexibility. SWT also attempts to + avoid "sugar coating" the limitations of the underlying operating + system, since doing this always implies significant overhead in + addition to introducing the potential for subtle failures and + incompatabilities; this is the "sometimes you have to let the o/s + win" rule. An example of the kind of problem that SWT would not + attempt to hide is the existence of limitations on cross-threaded + access to widgets. + + The only exceptions to the rule are cases where a particular + operating system is missing features that are required for it to + be a candidate Eclipse platform. If some small set of specific, + clearly defined "workarounds" can be made to enable Eclipse to run + on this target, then they will be implemented. For example, the + lack of a ToolBar type widget on Motif was addressed by providing + an "emulated" version on that window system, since ToolBars are + fundamental to the Eclipse look and feel. + +"portable" + implies both that it must be possible to create applications + (Eclipse, in particular) which will run on all of the supported + operating systems, and that SWT itself must be simple to port to + new operating systems. + + The former case is supported by providing a common programming + interface. By coding to this API, applications can be created that + run everywhere where SWT will run. It is important to note that, + because SWT uses the native (i.e. operating system provided) + widgets, the look and feel of applications built with SWT will + vary on each operating system so that they match the expectations + of users of that operating system. + + The later case, the porting of SWT itself, is supported by + ensuring that all but the lowest-level, direct interface to the + operating system is written in Java. In SWT there truly is + "nothing interesting in the C natives", which makes the initial + porting (and subsequent debugging) of SWT considerably easier + since it can largely be done using the facilities of Eclipse, + including the built in remote debugging. In addition, the coding + style of SWT is such that it is easy for programmers that are + familiar with a particular operating system to understand and + implement the code. + + A side-effect of the SWT implementation strategy is that it is + relatively simple to create operating system specific extensions + to SWT to support particularly important features. An example of + this would be ActiveX on Windows, which Eclipse uses (protected by + appropriate platform checks) to support embedded ActiveX controls + and documents. It was felt that to be competitive on that + platform, support for ActiveX was a requirement, even though it + was not available elsewhere. Because SWT is "close" to the + platform, this was not a difficult task. + +"access to the user-interface facilities of the operating system" + Although this has already been stated, it is worth reiterating + that the widgets that the SWT component provides are those that + are provided by the operating systems on which SWT runs. The + intent is to allow access to these native widgets (and the other + operating system user-interface facilities), not to "roll our own" + new widget system. As such, although the SWT component + implementors try very hard to make it possible for consumers of + SWT to be able to ignore which operating system they are running + on, developers need to understand that applications can + potentially behave differently to match the operating system + behavior. For example, programatically giving focus to a "radio" + button on Windows will cause it to be selected. Period. Since it + would be exceedingly difficult (and is counter to the Windows + user-interface look and feel) to prevent this behavior, the + Windows version of SWT generates events as if the user had + "clicked" the radio button when it is given focus. This means that + well-written applications can ignore the differences, but also + means that smart developers will test SWT applications on every + platform which they are to be delivered on. + + +Custom Widgets + +If that was all there was to this story, then everything would be +clear cut. However, in addition to the work described above, the SWT +component is responsible for one additional aspect of Eclipse: the +implementation of the custom widgets which provide the specific look +and feel (i.e. the "branding") of Eclipse. This is a complex task, +since it requires a delicate balance between the particular vision of +the user-interface designers, and the desire for the widgets to have +appearance and behavior that is consistant with the user-interface +guidelines of the operating system. + +It is important to note that, if Eclipse were to be built entirely +from custom widgets and used no native widgets, then the SWT component +implementors would consider their work to be a failure. The intent is +to provide a small set of carefully considered custom widgets to give +Eclipse its distinguishing features in a way that is still strongly +oriented towards the look and feel of the platform. For example, when +the user modifies the appearance of their desktop using platform +provided mechanisms (setting default window background colors, border +widths, "skinning", etc.) the custom widgets should reflect these +changes whenever (a) the changes can be detected and (b) they do not +specifically contradict the brand appearance. + +Currently, all custom widgets are coded in terms of existing SWT +widget and graphics APIs. They are portable and use underlying SWT +mechanisms to ensure that they have correct appearance. Although this +already works quite well, one of the research areas for the SWT +component is to further improve the ability to match the platform +appearance, for example in the presence of "programatic skinning" as +provided by window systems such as GTk. + + +Embedded Systems + +Another exciting aspect of SWT is that it is also being used as part +of the underlying implementation for several embedded systems efforts +because of its small size and focus on efficiency. The most notable of +these, currently at least, is in the AWT implementation provided as +part of the VisualAge/MicroEdition class libraries, where SWT +effectively becomes the peer layer for AWT. Further effort is ongoing +to improve SWT's utility in this area. + +And finally, one last aside: The above discussion blurs and sometimes +ignores the distinction between operating systems and window systems. +We do understand the difference, but wanted to avoid making things +even more verbose than they already were. + + +Get Involved! + +If you are interested in participating in the development of the SWT +component, check out the developer's mailing list: +platform-swt-dev@eclipse.org. Chat with people there about your +problems and interests, and find out what you can do to help. + +Hey! The SWT component implementors are always looking for smart, +dedicated people who "share the vision" to help us. If you are one +such, please do drop us a line. + +For more detailed information, check out the Development Resources. --- swt-gtk-3.5.1.orig/debian/README.Debian +++ swt-gtk-3.5.1/debian/README.Debian @@ -0,0 +1,20 @@ +swt for Debian +----------------- + +This is the Debian version of the Standard Widget Toolkit (SWT) for GTK+. + +The SWT libraries are maintained separately from the eclipse package. + +Currently, the full SWT distribution is provided by the following packages +(where X.Y is the current upstream version number): + + * libswt-cairo-gtk-X.Y-jni: Cairo JNI libraries. + * libswt-glx-gtk-X.Y-jni: GLX JNI libraries. + * libswt-gnome-gtk-X.Y-jni: GNOME JNI Library. + * libswt-gtk-X.Y-java: SWT JAR libraries. + * libswt-gtk-X.Y-java-gcj: native libraries built with gcj. + * libswt-gtk-X.Y-jni: SWT JNI libraries. + * libswt-mozilla-gtk-X.Y-jni: Mozilla JNI libraries. + + -- Adrian Perez , Thu, 17 Dec 2009 20:00:30 -0500 + --- swt-gtk-3.5.1.orig/debian/changelog +++ swt-gtk-3.5.1/debian/changelog @@ -0,0 +1,364 @@ +swt-gtk (3.5.1-2.1) unstable; urgency=low + + * NMU + * debian/control: + + Replace default-jdk-builddep with default-jdk, gcj-native-helper in B-D + + Bumped Standards-Version to 3.9.1 + * debian/rules: + + Call dh_xulrunner to add proper xulrunner dependency to + libswt-mozilla-gtk--jni (Closes: #587643) + + Fix from Ubuntu: Don't set DEB_MAKE_INVOKE and pass. AWT_LIB_PATH to + Makefile. This used to be overwritten by makefile- vars.mk in Lucid + anyway, and so it was ignored. It is not overwritten now, and causes the + package to FTBFS. Instead, export AWT_LIB_PATH before calling the + makefile (Closes: #577360) + * Explicitly set source format to 1.0 + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Mon, 09 Aug 2010 22:59:08 +0300 + +swt-gtk (3.5.1-2) unstable; urgency=low + + * debian/control: + - libswt-gtk-3.5-jni: Specify which libraries are provided by package. + - Improve Descriptions. + * debian/patches: + - 64/make_jni64.diff: Fix 64 bits makefile variable, now passes JNI64. + - 64/swt-ptr-size-64.patch: Remove obsolete patch. + - 64/arch64.diff: Rename x86_64 to arch64 being more concise about archs. + * debian/{NEWS,README}.Debian: + - Note that swt-gtk will be the only source of SWT libraries. + * debian/libswt-gtk-3.5-java.{postinst,prerm}: + - Remove, since alternatives are no longer needed. + * debian/libswt-gtk-3.5-java.links: Add links for /usr/share/java. + + -- Adrian Perez Thu, 17 Dec 2009 19:55:09 -0500 + +swt-gtk (3.5.1-1) unstable; urgency=low + + * New upstream release. Closes: #558663. + * debian/control: + - Add Vcs-* fields for Git repository. + - Allow DM-Uploads. + - Remove "Conflicts", package should live with eclipse. + * debian/rules: Fix default-java path around AWT_LIB_PATH. + * debian/copyright: Minor update. + + -- Adrian Perez Mon, 07 Dec 2009 10:22:24 -0500 + +swt-gtk (3.4.2-3) unstable; urgency=medium + + * debian/control: + - Build-Depend on libxt-dev. Fixes FTBFS with openjdk. Closes: #542990. + - Update Standards-Version to 3.8.3. + * debian/rules: + - Set makefile to debian/Makefile. + - Pass AWT_LIB_PATH dinamically to Makefile. + * debian/copyright: + - Update copyright holders and licenses. + - Use machine-readable format. + * debian/patches/01-make_linux.patch: Remove AWT_LIB_PATH from patch. + + -- Adrian Perez Mon, 24 Aug 2009 10:19:55 -0400 + +swt-gtk (3.4.2-2) unstable; urgency=low + + * Architecture-dependent package libswt-gtk-3.4-java installs to + /usr/lib/java by policy. + * Updated maintainer scripts and alternatives to reflect previous change. + + -- Adrian Perez Fri, 24 Jul 2009 12:26:59 -0400 + +swt-gtk (3.4.2-1) unstable; urgency=low + + * New upstream release. Closes: #532846 + * debian/control: + - Updated Maintainer. + - Updated policy to 3.8.2. No more changes. + - Versioned 'debhelper' build dependency to (>> 7.0). + - Added ${misc:Depends} to binary packages. + - Removed duplicated 'Section' field in binary packages. + - Section of libswt-gtk-3.4-java set to 'java'. + - Added 'Homepage' field. + * debian/compat: + - Changed compatibility to 7. + * debian/copyright: + - Included package adoption notice. + - Specified version of LGPL to 2. + - Notice that upstream distribution was repackaged. + * debian/patches: + - Updated diff for x86_64. + - Extracted make_linux patch to debian/patches/common to address x64. + Thanks to Shaun Jackman. + * debian/rules: + - Changed DEB_PATCHDIRS to include 'common' and arch-dependent patches. + * Fixed debian/watch file. + * Added README.Debian. + + -- Adrian Perez Mon, 6 Jul 2009 10:04:15 -0400 + +swt-gtk (3.4-2) unstable; urgency=low + + * Build and install the GLX library. Closes: #497119. + Thanks to Vincent Crevot. + * Link libswt-awt-gtk against libjawt. Closes: #488959. + * Use DEB_HOST_ARCH_CPU rather than DEB_HOST_ARCH to decide which + architectures are 64 bit. Closes: #497784. Thanks to Petr Salinger. + + -- Shaun Jackman Fri, 21 Nov 2008 22:14:13 -0800 + +swt-gtk (3.4-1) unstable; urgency=low + + * New upstream release. Closes: #490214. + * Update the policy to version 3.8.0.1. No changes were necessary. + + -- Shaun Jackman Thu, 10 Jul 2008 18:44:51 -0700 + +swt-gtk (3.4~rc3-1) unstable; urgency=medium + + * New upstream release. + * Build using xulrunner-dev rather than libxul-dev. Closes: #480818. + * Build and install the AWT JNI library. Closes: #482402. + * Add libxcb-render-util0-dev to the build dependencies. + + -- Shaun Jackman Sat, 14 Jun 2008 15:08:45 -0700 + +swt-gtk (3.3.1-4) unstable; urgency=low + + * Depend on default-jdk-builddep rather than java-gcj-compat-dev. + Closes: #477905. + * New native package, libswt-gtk-3.3-java-gcj, built using dh_nativejava. + * Remove libswt-gtk-3.3, libswt-mozilla-gtk-3.3, libswt-cairo-gtk-3.3, + libswt-gtk-dev, libswt-mozilla-gtk-dev, and libswt-cairo-gtk-dev. + These packages are all superseded by libswt-gtk-3.3-java-gcj. + * Do not strip the binaries. Closes: #438087. + + -- Shaun Jackman Sun, 27 Apr 2008 10:04:56 -0700 + +swt-gtk (3.3.1-3) unstable; urgency=low + + * Package the xulrunner and xpcominit JNI libraries. + + -- Shaun Jackman Fri, 11 Jan 2008 14:37:45 -0800 + +swt-gtk (3.3.1-2) unstable; urgency=low + + * Add Cairo packages. Closes: #451613. + * Update the policy to version 3.7.3. No changes were necessary. + + -- Shaun Jackman Fri, 14 Dec 2007 11:55:23 -0700 + +swt-gtk (3.3.1-1) unstable; urgency=low + + * New upstream release. + * Bump the soname version to 3.3. + * Bump the alternatives priority to 103. + + -- Shaun Jackman Mon, 15 Oct 2007 21:02:38 -0700 + +swt-gtk (3.2.2-2) unstable; urgency=medium + + * Fix the alternatives handling. Closes: #440690. + Thanks to Guillem Jover. + + -- Shaun Jackman Sat, 13 Oct 2007 10:24:41 -0700 + +swt-gtk (3.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Shaun Jackman Thu, 5 Jul 2007 09:46:34 -0600 + +swt-gtk (3.2.1-5) unstable; urgency=medium + + * Each of the JNI packages conflicts with libswt3.2-gtk-jni. + Closes: #401570, #406583. + + -- Shaun Jackman Tue, 16 Jan 2007 10:10:37 -0700 + +swt-gtk (3.2.1-4) unstable; urgency=medium + + * Define SWT_PTR_SIZE_64 on 64-bit architectures. Closes: #403057. + * Allow libswt3.2-gtk-jni as an alternative to libswt-gtk-3.2-jni. + Closes: #376672. + * Add ppc64 to the list of 64-bit architectures. Closes: #401145. + + -- Shaun Jackman Thu, 14 Dec 2006 10:13:46 -0700 + +swt-gtk (3.2.1-3) unstable; urgency=low + + * Support 64-bit architectures. Closes: #354358. + Use simple-patchsys and depend on patchutils. + * Revert the static_error patch. + * Prevent dh_makeshlibs from calling ldconfig for JNI packages. + * Make the package binary NMUable. + + -- Shaun Jackman Tue, 28 Nov 2006 14:52:44 -0700 + +swt-gtk (3.2.1-2) unstable; urgency=medium + + * Fix the swt.jar alternative. Closes: #396352. + * Use the Common Debian Build System (CDBS). + + -- Shaun Jackman Tue, 31 Oct 2006 14:58:10 -0700 + +swt-gtk (3.2.1-1) unstable; urgency=low + + * New upstream release. + * Update the policy to version 3.7.2.2. No changes were necessary. + + -- Shaun Jackman Sun, 29 Oct 2006 15:00:18 -0700 + +swt-gtk (3.2-1) unstable; urgency=low + + * New upstream release. + * Update the policy to version 3.7.2.1. No changes were necessary. + + -- Shaun Jackman Sun, 16 Jul 2006 12:53:38 -0600 + +swt-gtk (3.1.2-3) unstable; urgency=low + + * Build using java-gcj-compat-dev and gcj instead of libgcj-dev. + Closes: #359741. + * Build using libxul-dev instead of mozilla-dev. Closes: #364380. + * Update the policy to version 3.7.2.0. No changes were necessary. + + -- Shaun Jackman Sun, 28 May 2006 09:23:30 -0600 + +swt-gtk (3.1.2-2) unstable; urgency=low + + * Revert the patch to xpcom.cpp used to fix #324030. It fixed the build + but did not produce a working package on 64-bit architectures. + + -- Shaun Jackman Sun, 26 Feb 2006 10:25:49 -0700 + +swt-gtk (3.1.2-1.0.1) unstable; urgency=low + + * Rebuild against libgcc1 4.0.2. + + -- Shaun Jackman Sat, 25 Feb 2006 11:24:08 -0700 + +swt-gtk (3.1.2-1) unstable; urgency=low + + * New upstream release. + * Compile the class files using gcj -C instead of jikes. + * Remove jikes-classpath from the build dependencies. + * Add an alternative for /usr/share/java/swt.jar. + * Move the JNI shared libraries to /usr/lib/jni. + * Add a watch file. + * Ignore the lintian warning package-name-doesnt-match-sonames. + * Update the policy version to 3.6.2.2. No changes were necessary. + + -- Shaun Jackman Sun, 5 Feb 2006 11:42:56 -0700 + +swt-gtk (3.1-3) unstable; urgency=low + + * Created libswt-gnome-gtk-3.1-jni to eliminate the Gnome + dependency of libswt-gtk-3.1-jni. Closes: #309126. + * Updated the web address. + + -- Shaun Jackman Wed, 28 Sep 2005 09:55:01 -0600 + +swt-gtk (3.1-2) unstable; urgency=low + + * Patch xpcom.cpp to fix the build for 64-bit architectures. + Closes: #324030. Thanks to Andreas Jochens. + * Compile each source file on an individual command line to prevent + the build on m68k from timing out. + + -- Shaun Jackman Wed, 14 Sep 2005 09:34:21 -0600 + +swt-gtk (3.1-1) unstable; urgency=low + + * New upstream release. + * Merge libswt-mozilla-gtk-3.1-java into libswt-gtk-3.1-java. + + -- Shaun Jackman Wed, 7 Sep 2005 17:44:01 -0600 + +swt-gtk (3.0+3.1M4-5) unstable; urgency=low + + * Remove the setgid bit. Closes: #324057. Thanks to Matt Kraai. + * Update the Debian policy version to 3.6.2.1. + + -- Shaun Jackman Wed, 7 Sep 2005 16:45:20 -0600 + +swt-gtk (3.0+3.1M4-4) unstable; urgency=low + + * Depend on libgcj-dev instead of libgcj4-dev | libgcj-dev. + Closes: #310569, #320355. + * Build using gcj 4.0.1. + + -- Shaun Jackman Tue, 16 Aug 2005 14:19:08 -0700 + +swt-gtk (3.0+3.1M4-3) unstable; urgency=low + + * Add a libswt-3.1-java alternative provided by libswt-gtk-3.1-java. + * Compile the class files using jikes instead of gcj -C. + + -- Shaun Jackman Sat, 7 May 2005 11:56:28 -0700 + +swt-gtk (3.0+3.1M4-2) unstable; urgency=low + + * Add libXtst.so.6 to the dependencies of libswt-pi-gtk-3106.so. + + -- Shaun Jackman Wed, 4 May 2005 15:43:28 -0700 + +swt-gtk (3.0+3.1M4-1) unstable; urgency=low + + * New upstream release. + * Remove binaries from source package (closes: #264852). + + -- Shaun Jackman Fri, 21 Jan 2005 16:53:54 -0800 + +swt-gtk (3.0-6) unstable; urgency=low + + * Use libgcj4-dev as long as gcj provides gcj-3.3 (closes: #276052). + * Change section to libdevel. + + -- Shaun Jackman Tue, 12 Oct 2004 08:41:04 -0700 + +swt-gtk (3.0-5) unstable; urgency=low + + * Add libgcj5-dev as an alternative to the libgcj-dev dependency. + * Add fastjar to the dependencies (closes: #267931). + + -- Shaun Jackman Tue, 24 Aug 2004 23:35:41 -0700 + +swt-gtk (3.0-4) unstable; urgency=low + + * Add libxtst-dev to Build-Depends, thanks to Roland Stigge + (closes: #265694). + + -- Shaun Jackman Sat, 14 Aug 2004 12:07:59 -0700 + +swt-gtk (3.0-3) unstable; urgency=low + + * Patch SWT to build cleanly with gcj. + * Rebuild JAR files from source (closes: #264851). + * Add an alternative for the java-config script (closes: #264854). + * Depend on gcj and libgcj-dev instead of libgcj5-dev. + * Depend on mozilla-dev. + * Add Mozilla packages. + * Remove README.Debian. + * Rename swt-gtk-pi-3.jar to swt-pi-gtk-3.jar similar to upstream. + * Compile all shared libraries with -fPIC. + + -- Shaun Jackman Thu, 12 Aug 2004 13:46:53 -0700 + +swt-gtk (3.0-2) unstable; urgency=low + + * Build-Depends: Change libgtk2.0-dev to libgnomeui-dev. + * Change libswt-gtk-dev to Architecture: all. + * Split libswt-gtk3-java out of libswt-gtk-dev. + * Split libswt-gtk3-jni out of libswt-gtk3. + * Rename swt.jar to swt-gtk-3.jar, swt-pi.jar to swt-gtk-pi-3.jar. + * Add CLASSPATH to the pkg-config file. + * Add a java-config file. + + -- Shaun Jackman Wed, 11 Aug 2004 12:32:09 -0700 + +swt-gtk (3.0-1) unstable; urgency=low + + * Initial release (closes: #261388). + + -- Shaun Jackman Mon, 26 Jul 2004 09:39:10 -0700 + --- swt-gtk-3.5.1.orig/debian/compat +++ swt-gtk-3.5.1/debian/compat @@ -0,0 +1 @@ +7 --- swt-gtk-3.5.1.orig/debian/control +++ swt-gtk-3.5.1/debian/control @@ -0,0 +1,98 @@ +Source: swt-gtk +Section: libs +Priority: optional +Maintainer: Adrian Perez +DM-Upload-Allowed: yes +Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev, + xulrunner-dev, libxcb-render-util0-dev, libxt-dev, + libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, + fastjar, cdbs, patchutils, debhelper (>> 7.0) +Standards-Version: 3.9.1 +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.5-java +Architecture: any +Section: java +Depends: libswt-gtk-3.5-jni (= ${binary:Version}), ${misc:Depends} +Suggests: libswt-gtk-3.5-java-gcj +Description: Standard Widget Toolkit for GTK+ Java library + The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package includes the SWT JAR libraries. + +Package: libswt-gtk-3.5-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: libswt-gnome-gtk-3.5-jni +Description: Standard Widget Toolkit for GTK+ JNI library + The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package includes the JNI libraries (atk, awt, gtk, pi). + +Package: libswt-gnome-gtk-3.5-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Standard Widget Toolkit for GTK+ GNOME JNI library + The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package includes the GNOME JNI library. + +Package: libswt-mozilla-gtk-3.5-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Standard Widget Toolkit for GTK+ Mozilla JNI library + The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package includes the Mozilla JNI libraries. + +Package: libswt-cairo-gtk-3.5-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Standard Widget Toolkit for GTK+ Cairo JNI library + The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package includes the Cairo JNI libraries. + +Package: libswt-glx-gtk-3.5-jni +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Standard Widget Toolkit for GTK+ GLX JNI library + The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package includes the GLX JNI libraries. + +Package: libswt-gtk-3.5-java-gcj +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, + 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 Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java + programming language. SWT provides efficient, portable and fast access to + native controls and user interface facilities on the platforms where it has + been implemented. + . + This package contains a native library built using gcj. --- swt-gtk-3.5.1.orig/debian/copyright +++ swt-gtk-3.5.1/debian/copyright @@ -0,0 +1,837 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: SWT +Maintainer: The Eclipse Foundation +Source: http://www.eclipse.org/swt/ + +Files: * +Copyright: 2000-2009, IBM Corporation and others +License: EPL-1.0 + +Files: debian/* +Copyright: 2009, Adrian Perez + 2004-2009, Shaun Jackman +License: GPL-3+ + +Files: gnome*.[c|h], os*[.c|h], atk*.[c|h] +Copyright: 2000-2008, IBM Corporation and others +License: LGPL-2.1 + +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 +License: MPL-1.1 + +Files: org/eclipse/swt/internal/accessibility/gtk/* +Copyright: 2000-2006, IBM Corporation +License: LGPL-2.1 + +Files: org/eclipse/swt/internal/gtk/[^X]*.java +Copyright: 2000-2007, IBM Corporation and others +License: LGPL-2.1 + +Files: org/eclipse/swt/internal/image/JPEGFileFormat.java +Copyright: 2000-2008, IBM Corporation and others +License: other + + +License: GPL-3+ + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package. If not, see . + + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in /usr/share/common-licenses/GPL-3. + +License: LGPL-2.1 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/LGPL-2.1. + + +License: EPL-1.0 + + Eclipse Public License - v 1.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF + THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + + 1. DEFINITIONS + + "Contribution" means: + + a) in the case of the initial Contributor, the initial code and + documentation distributed under this Agreement, and b) in the case of + each subsequent Contributor: + + i) changes to the Program, and + + ii) additions to the Program; + + where such changes and/or additions to the Program originate from and are + distributed by that particular Contributor. A Contribution 'originates' + from a Contributor if it was added to the Program by such Contributor + itself or anyone acting on such Contributor's behalf. Contributions do + not include additions to the Program which: (i) are separate modules of + software distributed in conjunction with the Program under their own + license agreement, and (ii) are not derivative works of the Program. + + "Contributor" means any person or entity that distributes the Program. + + "Licensed Patents " mean patent claims licensable by a Contributor which + are necessarily infringed by the use or sale of its Contribution alone or + when combined with the Program. + + "Program" means the Contributions distributed in accordance with this + Agreement. + + "Recipient" means anyone who receives the Program under this Agreement, + including all Contributors. + + 2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free copyright license to + reproduce, prepare derivative works of, publicly display, publicly + perform, distribute and sublicense the Contribution of such Contributor, + if any, and such derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants + Recipient a non-exclusive, worldwide, royalty-free patent license under + Licensed Patents to make, use, sell, offer to sell, import and otherwise + transfer the Contribution of such Contributor, if any, in source code and + object code form. This patent license shall apply to the combination of + the Contribution and the Program if, at the time the Contribution is + added by the Contributor, such addition of the Contribution causes such + combination to be covered by the Licensed Patents. The patent license + shall not apply to any other combinations which include the + Contribution. No hardware per se is licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the patent + or other intellectual property rights of any other entity. Each + Contributor disclaims any liability to Recipient for claims brought by + any other entity based on infringement of intellectual property rights or + otherwise. As a condition to exercising the rights and licenses granted + hereunder, each Recipient hereby assumes sole responsibility to secure + any other intellectual property rights needed, if any. For example, if a + third party patent license is required to allow Recipient to distribute + the Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient + copyright rights in its Contribution, if any, to grant the copyright + license set forth in this Agreement. + + 3. REQUIREMENTS + + A Contributor may choose to distribute the Program in object code form + under its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + + i) effectively disclaims on behalf of all Contributors all warranties and + conditions, express and implied, including warranties or conditions of + title and non-infringement, and implied warranties or conditions of + merchantability and fitness for a particular purpose; + + ii) effectively excludes on behalf of all Contributors all liability for + damages, including direct, indirect, special, incidental and + consequential damages, such as lost profits; + + iii) states that any provisions which differ from this Agreement are + offered by that Contributor alone and not by any other party; and + + iv) states that source code for the Program is available from such + Contributor, and informs licensees how to obtain it in a reasonable + manner on or through a medium customarily used for software exchange. + + When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the + Program. + + Contributors may not remove or alter any copyright notices contained + within the Program. + + Each Contributor must identify itself as the originator of its + Contribution, if any, in a manner that reasonably allows subsequent + Recipients to identify the originator of the Contribution. + + 4. COMMERCIAL DISTRIBUTION + + Commercial distributors of software may accept certain responsibilities + with respect to end users, business partners and the like. While this + license is intended to facilitate the commercial use of the Program, the + Contributor who includes the Program in a commercial product offering + should do so in a manner which does not create potential liability for + other Contributors. Therefore, if a Contributor includes the Program in a + commercial product offering, such Contributor ("Commercial Contributor") + hereby agrees to defend and indemnify every other Contributor + ("Indemnified Contributor") against any losses, damages and costs + (collectively "Losses") arising from claims, lawsuits and other legal + actions brought by a third party against the Indemnified Contributor to + the extent caused by the acts or omissions of such Commercial Contributor + in connection with its distribution of the Program in a commercial + product offering. The obligations in this section do not apply to any + claims or Losses relating to any actual or alleged intellectual property + infringement. In order to qualify, an Indemnified Contributor must: a) + promptly notify the Commercial Contributor in writing of such claim, and + b) allow the Commercial Contributor to control, and cooperate with the + Commercial Contributor in, the defense and any related settlement + negotiations. The Indemnified Contributor may participate in any such + claim at its own expense. + + For example, a Contributor might include the Program in a commercial + product offering, Product X. That Contributor is then a Commercial + Contributor. If that Commercial Contributor then makes performance + claims, or offers warranties related to Product X, those performance + claims and warranties are such Commercial Contributor's responsibility + alone. Under this section, the Commercial Contributor would have to + defend claims against the other Contributors related to those performance + claims and warranties, and if a court requires any other Contributor to + pay any damages as a result, the Commercial Contributor must pay those + damages. + + 5. NO WARRANTY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED + ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER + EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR + CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A + PARTICULAR PURPOSE. Each Recipient is solely responsible for determining + the appropriateness of using and distributing the Program and assumes all + risks associated with its exercise of rights under this Agreement , + including but not limited to the risks and costs of program errors, + compliance with applicable laws, damage to or loss of data, programs or + equipment, and unavailability or interruption of operations. + + 6. DISCLAIMER OF LIABILITY + + EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR + ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING + WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR + DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED + HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 7. GENERAL + + If any provision of this Agreement is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of the + remainder of the terms of this Agreement, and without further action by + the parties hereto, such provision shall be reformed to the minimum + extent necessary to make such provision valid and enforceable. + + If Recipient institutes patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Program + itself (excluding combinations of the Program with other software or + hardware) infringes such Recipient's patent(s), then such Recipient's + rights granted under Section 2(b) shall terminate as of the date such + litigation is filed. + + All Recipient's rights under this Agreement shall terminate if it fails + to comply with any of the material terms or conditions of this Agreement + and does not cure such failure in a reasonable period of time after + becoming aware of such noncompliance. If all Recipient's rights under + this Agreement terminate, Recipient agrees to cease use and distribution + of the Program as soon as reasonably practicable. However, Recipient's + obligations under this Agreement and any licenses granted by Recipient + relating to the Program shall continue and survive. + + Everyone is permitted to copy and distribute copies of this Agreement, + but in order to avoid inconsistency the Agreement is copyrighted and may + only be modified in the following manner. The Agreement Steward reserves + the right to publish new versions (including revisions) of this Agreement + from time to time. No one other than the Agreement Steward has the right + to modify this Agreement. The Eclipse Foundation is the initial Agreement + Steward. The Eclipse Foundation may assign the responsibility to serve as + the Agreement Steward to a suitable separate entity. Each new version of + the Agreement will be given a distinguishing version number. The Program + (including Contributions) may always be distributed subject to the + version of the Agreement under which it was received. In addition, after + a new version of the Agreement is published, Contributor may elect to + distribute the Program (including its Contributions) under the new + version. Except as expressly stated in Sections 2(a) and 2(b) above, + Recipient receives no rights or licenses to the intellectual property of + any Contributor under this Agreement, whether expressly, by implication, + estoppel or otherwise. All rights in the Program not expressly granted + under this Agreement are reserved. + + This Agreement is governed by the laws of the State of New York and the + intellectual property laws of the United States of America. No party to + this Agreement will bring a legal action under this Agreement more than + one year after the cause of action arose. Each party waives its rights to + a jury trial in any resulting litigation. + +License: MPL-1.1 + + MOZILLA PUBLIC LICENSE + Version 1.1 + --------------- + + 1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + + 2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + + 3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + + 4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + + 5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + + 6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + + 7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + + 8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + + 9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + + 10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + + 11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + + 12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + + 13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + + EXHIBIT A -Mozilla Public License. + + ``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 ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + +License: other + + The class org.eclipse.swt.internal.image.JPEGFileFormat is based in part + on the work of the Independent JPEG Group's JPEG software release 6b + ("LIBJPEG"). LIBJPEG was used to implement the decoding of JPEG format + files in Java (TM). The Content does NOT include any portion of the + LIBJPEG file ansi2knr.c. + + Your use of LIBJPEG is subject to the the terms and conditions located + in the about_files/IJG_README which is included with the Content (and + portions follow below). + + LEGAL ISSUES + ============ + + In plain English: + + 1. We don't promise that this software works. (But if you find any bugs, + please let us know!) + 2. You can use this software for whatever you want. You don't have to pay us. + 3. You may not pretend that you wrote this software. If you use it in a + program, you must acknowledge somewhere in your documentation that + you've used the IJG code. + + In legalese: + + The authors make NO WARRANTY or representation, either express or implied, + with respect to this software, its quality, accuracy, merchantability, or + fitness for a particular purpose. This software is provided "AS IS", and you, + its user, assume the entire risk as to its quality and accuracy. + + This software is copyright (C) 1991-1998, Thomas G. Lane. + All Rights Reserved except as specified below. + + Permission is hereby granted to use, copy, modify, and distribute this + software (or portions thereof) for any purpose, without fee, subject to these + conditions: + (1) If any part of the source code for this software is distributed, then this + README file must be included, with this copyright and no-warranty notice + unaltered; and any additions, deletions, or changes to the original files + must be clearly indicated in accompanying documentation. + (2) If only executable code is distributed, then the accompanying + documentation must state that "this software is based in part on the work of + the Independent JPEG Group". + (3) Permission for use of this software is granted only if the user accepts + full responsibility for any undesirable consequences; the authors accept + NO LIABILITY for damages of any kind. + + These conditions apply to any software derived from or based on the IJG code, + not just to the unmodified library. If you use our work, you ought to + acknowledge us. + + Permission is NOT granted for the use of any IJG author's name or company name + in advertising or publicity relating to this software or products derived from + it. This software may be referred to only as "the Independent JPEG Group's + software". + + We specifically permit and encourage the use of this software as the basis of + commercial products, provided that all warranty or liability claims are + assumed by the product vendor. + --- swt-gtk-3.5.1.orig/debian/docs +++ swt-gtk-3.5.1/debian/docs @@ -0,0 +1,2 @@ +debian/README +debian/README.Debian --- swt-gtk-3.5.1.orig/debian/libswt-cairo-gtk-3.5-jni.install +++ swt-gtk-3.5.1/debian/libswt-cairo-gtk-3.5-jni.install @@ -0,0 +1 @@ +libswt-cairo-*[0-9].so usr/lib/jni --- swt-gtk-3.5.1.orig/debian/libswt-glx-gtk-3.5-jni.install +++ swt-gtk-3.5.1/debian/libswt-glx-gtk-3.5-jni.install @@ -0,0 +1 @@ +libswt-glx-*[0-9].so usr/lib/jni --- swt-gtk-3.5.1.orig/debian/libswt-gnome-gtk-3.5-jni.install +++ swt-gtk-3.5.1/debian/libswt-gnome-gtk-3.5-jni.install @@ -0,0 +1 @@ +libswt-gnome-*[0-9].so usr/lib/jni --- swt-gtk-3.5.1.orig/debian/libswt-gtk-3.5-java.install +++ swt-gtk-3.5.1/debian/libswt-gtk-3.5-java.install @@ -0,0 +1,2 @@ +swt-gtk-*.jar usr/lib/java +debian/java-config/libswt-gtk* usr/share/java-config --- swt-gtk-3.5.1.orig/debian/libswt-gtk-3.5-java.links +++ swt-gtk-3.5.1/debian/libswt-gtk-3.5-java.links @@ -0,0 +1,2 @@ +usr/lib/java/swt-gtk-3.5.1.jar usr/share/java/swt-gtk-3.5.1.jar +usr/share/java/swt-gtk-3.5.1.jar usr/share/java/swt.jar --- swt-gtk-3.5.1.orig/debian/libswt-gtk-3.5-jni.install +++ swt-gtk-3.5.1/debian/libswt-gtk-3.5-jni.install @@ -0,0 +1,4 @@ +libswt-atk-*[0-9].so usr/lib/jni +libswt-awt-*[0-9].so usr/lib/jni +libswt-gtk-*[0-9].so usr/lib/jni +libswt-pi-*[0-9].so usr/lib/jni --- swt-gtk-3.5.1.orig/debian/libswt-mozilla-gtk-3.5-jni.install +++ swt-gtk-3.5.1/debian/libswt-mozilla-gtk-3.5-jni.install @@ -0,0 +1,3 @@ +libswt-mozilla-*[0-9].so usr/lib/jni +libswt-xulrunner-*[0-9].so usr/lib/jni +libswt-xpcominit-*[0-9].so usr/lib/jni --- swt-gtk-3.5.1.orig/debian/rules +++ swt-gtk-3.5.1/debian/rules @@ -0,0 +1,39 @@ +#!/usr/bin/make -f + +alpha := 64 +amd64 := 64 +ia64 := 64 +ppc64 := 64 +DEB_PATCHDIRS = debian/patches/common debian/patches/$($(DEB_HOST_ARCH_CPU)) + +DEB_DH_MAKESHLIBS_ARGS_ALL := -Xjni + +AWT_LIB_DIR = $(DEB_HOST_ARCH_CPU) + +ifneq (,$(filter $(DEB_HOST_ARCH), lpia)) + AWT_LIB_DIR = i386 +endif + +ifneq (,$(filter $(DEB_HOST_ARCH), powerpc)) + AWT_LIB_DIR = ppc +endif + +export AWT_LIB_PATH=/usr/lib/jvm/default-java/jre/lib/$(AWT_LIB_DIR) + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +include /usr/share/gcj/debian_defaults + +makecleanbuildir::patch + +DEB_MAKE_MAKEFILE = debian/Makefile + +ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs))) +common-binary-post-install-arch:: + dh_nativejava -a +endif + +common-binary-predeb-arch:: + dh_xulrunner --- swt-gtk-3.5.1.orig/debian/watch +++ swt-gtk-3.5.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://mirror.cc.vt.edu/pub/eclipse/eclipse/downloads/drops/R-(.*)/swt-(.*)-gtk-linux-x86\.zip --- swt-gtk-3.5.1.orig/debian/java-config/libswt-gtk-3.5-java +++ swt-gtk-3.5.1/debian/java-config/libswt-gtk-3.5-java @@ -0,0 +1 @@ +JARS=/usr/lib/java/swt-gtk-3.5.1.jar --- swt-gtk-3.5.1.orig/debian/patches/64/arch64.diff +++ swt-gtk-3.5.1/debian/patches/64/arch64.diff @@ -0,0 +1,45531 @@ +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.*; + + class AccessibleFactory { +- int /*long*/ handle; +- int /*long*/ objectParentType; +- int /*long*/ widgetTypeName; ++ long /*int*/ handle; ++ long /*int*/ objectParentType; ++ long /*int*/ widgetTypeName; + Callback atkObjectFactoryCB_create_accessible; + Callback gTypeInfo_base_init_factory; + Hashtable accessibles = new Hashtable (9); + + static final Hashtable Types = new Hashtable (9); + static final Hashtable Factories = new Hashtable (9); +- static final int /*long*/ DefaultParentType = OS.g_type_from_name (Converter.wcsToMbcs (null, "GtkAccessible", true)); //$NON-NLS-1$ ++ static final long /*int*/ DefaultParentType = OS.g_type_from_name (Converter.wcsToMbcs (null, "GtkAccessible", true)); //$NON-NLS-1$ + 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$ +@@ -83,12 +83,12 @@ + static final Callback InitSelectionIfaceCB; + static final Callback InitTextIfaceCB; + /* interface definitions */ +- static int /*long*/ ObjectIfaceDefinition; +- static final int /*long*/ ActionIfaceDefinition; +- static final int /*long*/ ComponentIfaceDefinition; +- static final int /*long*/ HypertextIfaceDefinition; +- static final int /*long*/ SelectionIfaceDefinition; +- static final int /*long*/ TextIfaceDefinition; ++ static long /*int*/ ObjectIfaceDefinition; ++ static final long /*int*/ ActionIfaceDefinition; ++ static final long /*int*/ ComponentIfaceDefinition; ++ static final long /*int*/ HypertextIfaceDefinition; ++ static final long /*int*/ SelectionIfaceDefinition; ++ static final long /*int*/ TextIfaceDefinition; + 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$ +@@ -158,7 +158,7 @@ + return callback; + } + +- private AccessibleFactory (int /*long*/ widgetType) { ++ private AccessibleFactory (long /*int*/ widgetType) { + super (); + widgetTypeName = OS.g_type_name (widgetType); + int widgetTypeNameLength = OS.strlen (widgetTypeName) + 1; +@@ -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 */ +- int /*long*/ registry = ATK.atk_get_default_registry (); +- int /*long*/ previousFactory = ATK.atk_registry_get_factory (registry, widgetType); ++ long /*int*/ registry = ATK.atk_get_default_registry (); ++ long /*int*/ previousFactory = ATK.atk_registry_get_factory (registry, widgetType); + objectParentType = ATK.atk_object_factory_get_accessible_type (previousFactory); + if (objectParentType == 0) objectParentType = DefaultParentType; +- int /*long*/ factoryParentType = OS.g_type_from_name (FACTORY_PARENTTYPENAME); ++ long /*int*/ factoryParentType = OS.g_type_from_name (FACTORY_PARENTTYPENAME); + gTypeInfo_base_init_factory = new Callback (this, "gTypeInfo_base_init_factory", 1); //$NON-NLS-1$ +- int /*long*/ address = gTypeInfo_base_init_factory.getAddress (); ++ long /*int*/ address = gTypeInfo_base_init_factory.getAddress (); + if (address == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); + GTypeInfo typeInfo = new GTypeInfo (); + typeInfo.base_init = address; + typeInfo.class_size = (short)ATK.AtkObjectFactoryClass_sizeof (); + typeInfo.instance_size = (short)ATK.AtkObjectFactory_sizeof (); +- int /*long*/ info = OS.g_malloc (GTypeInfo.sizeof); ++ long /*int*/ info = OS.g_malloc (GTypeInfo.sizeof); + OS.memmove (info, typeInfo, GTypeInfo.sizeof); +- int /*long*/ swtFactoryType = OS.g_type_register_static (factoryParentType, factoryName, info, 0); ++ long /*int*/ swtFactoryType = OS.g_type_register_static (factoryParentType, factoryName, info, 0); + ATK.atk_registry_set_factory_type (registry, widgetType, swtFactoryType); + handle = ATK.atk_registry_get_factory (registry, widgetType); + } + } + + void addAccessible (Accessible accessible) { +- int /*long*/ controlHandle = accessible.getControlHandle (); ++ long /*int*/ controlHandle = accessible.getControlHandle (); + accessibles.put (new LONG (controlHandle), accessible); + ATK.atk_object_factory_create_accessible (handle, controlHandle); + } + +- int /*long*/ atkObjectFactory_create_accessible (int /*long*/ widget) { ++ long /*int*/ atkObjectFactory_create_accessible (long /*int*/ widget) { + Accessible accessible = (Accessible) accessibles.get (new LONG (widget)); + if (accessible == null) { + /* + * we don't care about this control, so create it with the parent's + * type so that its accessibility callbacks will not pass though here + */ +- int /*long*/ result = OS.g_object_new (objectParentType, 0); ++ long /*int*/ result = OS.g_object_new (objectParentType, 0); + ATK.atk_object_initialize (result, widget); + return result; + } +@@ -213,21 +213,21 @@ + int typeNameLength = OS.strlen (widgetTypeName); + byte[] buffer = new byte [typeNameLength]; + OS.memmove (buffer, widgetTypeName, typeNameLength); +- int /*long*/ type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF); ++ long /*int*/ type = getType (buffer, accessible, objectParentType, ACC.CHILDID_SELF); + AccessibleObject object = new AccessibleObject (type, widget, accessible, objectParentType, false); + accessible.accessibleObject = object; + return object.handle; + } + +- static int /*long*/ getChildType (Accessible accessible, int childIndex) { ++ static long /*int*/ getChildType (Accessible accessible, int childIndex) { + return getType (CHILD_TYPENAME, accessible, DefaultParentType, childIndex); + } + +- static int /*long*/ getDefaultParentType () { ++ static long /*int*/ getDefaultParentType () { + return DefaultParentType; + } + +- static int /*long*/ getType (byte[] widgetTypeName, Accessible accessible, int /*long*/ parentType, int childId) { ++ static long /*int*/ getType (byte[] widgetTypeName, Accessible accessible, long /*int*/ parentType, int childId) { + AccessibleControlEvent event = new AccessibleControlEvent (accessible); + event.childID = childId; + AccessibleControlListener[] listeners = accessible.getControlListeners (); +@@ -270,13 +270,13 @@ + if (selection) swtTypeName += "Selection"; //$NON-NLS-1$ + if (text) swtTypeName += "Text"; //$NON-NLS-1$ + +- int /*long*/ type = 0; ++ long /*int*/ type = 0; + LONG typeInt = (LONG)Types.get (swtTypeName); + if (typeInt != null) { + type = typeInt.value; + } else { + /* define the type */ +- int /*long*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof); ++ long /*int*/ queryPtr = OS.g_malloc (GTypeQuery.sizeof); + OS.g_type_query (parentType, queryPtr); + GTypeQuery query = new GTypeQuery (); + OS.memmove (query, queryPtr, GTypeQuery.sizeof); +@@ -299,19 +299,19 @@ + return type; + } + +- int /*long*/ gTypeInfo_base_init_factory (int /*long*/ klass) { +- int /*long*/ atkObjectFactoryClass = ATK.ATK_OBJECT_FACTORY_CLASS (klass); ++ long /*int*/ gTypeInfo_base_init_factory (long /*int*/ klass) { ++ long /*int*/ atkObjectFactoryClass = ATK.ATK_OBJECT_FACTORY_CLASS (klass); + AtkObjectFactoryClass objectFactoryClassStruct = new AtkObjectFactoryClass (); + ATK.memmove (objectFactoryClassStruct, atkObjectFactoryClass); + atkObjectFactoryCB_create_accessible = new Callback (this, "atkObjectFactory_create_accessible", 1); //$NON-NLS-1$ +- int /*long*/ address = atkObjectFactoryCB_create_accessible.getAddress (); ++ long /*int*/ address = atkObjectFactoryCB_create_accessible.getAddress (); + if (address == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); + objectFactoryClassStruct.create_accessible = address; + ATK.memmove (atkObjectFactoryClass, objectFactoryClassStruct); + return 0; + } + +- static int /*long*/ gTypeInfo_base_init_type (int /*long*/ klass) { ++ static long /*int*/ gTypeInfo_base_init_type (long /*int*/ klass) { + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, klass); + objectClass.get_name = AtkObjectCB_get_name.getAddress (); +@@ -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 (); +- int /*long*/ gObjectClass = OS.G_OBJECT_CLASS (klass); ++ long /*int*/ gObjectClass = OS.G_OBJECT_CLASS (klass); + GObjectClass objectClassStruct = new GObjectClass (); + OS.memmove (objectClassStruct, gObjectClass); + objectClassStruct.finalize = GObjectClass_finalize.getAddress (); +@@ -331,7 +331,7 @@ + return 0; + } + +- static int /*long*/ initActionIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initActionIfaceCB (long /*int*/ iface) { + AtkActionIface actionIface = new AtkActionIface (); + ATK.memmove (actionIface, iface); + actionIface.get_keybinding = AtkActionCB_get_keybinding.getAddress (); +@@ -340,7 +340,7 @@ + return 0; + } + +- static int /*long*/ initComponentIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initComponentIfaceCB (long /*int*/ iface) { + AtkComponentIface componentIface = new AtkComponentIface (); + ATK.memmove (componentIface, iface); + componentIface.get_extents = AtkComponentCB_get_extents.getAddress (); +@@ -351,7 +351,7 @@ + return 0; + } + +- static int /*long*/ initHypertextIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initHypertextIfaceCB (long /*int*/ iface) { + AtkHypertextIface hypertextIface = new AtkHypertextIface (); + ATK.memmove (hypertextIface, iface); + hypertextIface.get_link = AtkHypertextCB_get_link.getAddress (); +@@ -361,7 +361,7 @@ + return 0; + } + +- static int /*long*/ initSelectionIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initSelectionIfaceCB (long /*int*/ iface) { + AtkSelectionIface selectionIface = new AtkSelectionIface (); + ATK.memmove (selectionIface, iface); + selectionIface.is_child_selected = AtkSelectionCB_is_child_selected.getAddress (); +@@ -370,7 +370,7 @@ + return 0; + } + +- static int /*long*/ initTextIfaceCB (int /*long*/ iface) { ++ static long /*int*/ initTextIfaceCB (long /*int*/ iface) { + AtkTextIface textInterface = new AtkTextIface (); + ATK.memmove (textInterface, iface); + textInterface.get_caret_offset = AtkTextCB_get_caret_offset.getAddress (); +@@ -389,8 +389,8 @@ + static void registerAccessible (Accessible accessible) { + /* If DefaultParentType is 0 then OS accessibility is not active */ + if (DefaultParentType == 0) return; +- int /*long*/ controlHandle = accessible.getControlHandle (); +- int /*long*/ widgetType = OS.G_OBJECT_TYPE (controlHandle); ++ long /*int*/ controlHandle = accessible.getControlHandle (); ++ long /*int*/ widgetType = OS.G_OBJECT_TYPE (controlHandle); + AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType)); + if (factory == null) { + factory = new AccessibleFactory (widgetType); +@@ -404,8 +404,8 @@ + } + + static void unregisterAccessible (Accessible accessible) { +- int /*long*/ controlHandle = accessible.getControlHandle (); +- int /*long*/ widgetType = OS.G_OBJECT_TYPE (controlHandle); ++ long /*int*/ controlHandle = accessible.getControlHandle (); ++ long /*int*/ widgetType = OS.G_OBJECT_TYPE (controlHandle); + AccessibleFactory factory = (AccessibleFactory) Factories.get (new LONG (widgetType)); + if (factory != null) { + factory.removeAccessible (accessible); +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; + } + +- int /*long*/ getControlHandle () { ++ long /*int*/ getControlHandle () { + return control.handle; + } + +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.*; + + class AccessibleObject { +- int /*long*/ handle; +- int /*long*/ parentType; ++ long /*int*/ handle; ++ long /*int*/ parentType; + int index = -1, id = ACC.CHILDID_SELF; + Accessible accessible; + AccessibleObject parent; +@@ -30,19 +30,19 @@ + */ + boolean isLightweight = false; + +- static int /*long*/ actionNamePtr = -1; +- static int /*long*/ descriptionPtr = -1; +- static int /*long*/ keybindingPtr = -1; +- static int /*long*/ namePtr = -1; ++ static long /*int*/ actionNamePtr = -1; ++ static long /*int*/ descriptionPtr = -1; ++ static long /*int*/ keybindingPtr = -1; ++ static long /*int*/ namePtr = -1; + static final Hashtable AccessibleObjects = new Hashtable (9); +- static final int /*long*/ ATK_ACTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkAction", true)); +- static final int /*long*/ ATK_COMPONENT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkComponent", true)); +- static final int /*long*/ ATK_HYPERTEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkHypertext", true)); +- static final int /*long*/ ATK_SELECTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkSelection", true)); +- static final int /*long*/ ATK_TEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkText", true)); ++ static final long /*int*/ ATK_ACTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkAction", true)); ++ static final long /*int*/ ATK_COMPONENT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkComponent", true)); ++ static final long /*int*/ ATK_HYPERTEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkHypertext", true)); ++ static final long /*int*/ ATK_SELECTION_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkSelection", true)); ++ static final long /*int*/ ATK_TEXT_TYPE = ATK.g_type_from_name (Converter.wcsToMbcs (null, "AtkText", true)); + static final boolean DEBUG = Display.DEBUG; + +- AccessibleObject (int /*long*/ type, int /*long*/ widget, Accessible accessible, int /*long*/ parentType, boolean isLightweight) { ++ AccessibleObject (long /*int*/ type, long /*int*/ widget, Accessible accessible, long /*int*/ parentType, boolean isLightweight) { + super (); + handle = ATK.g_object_new (type, 0); + this.parentType = parentType; +@@ -58,13 +58,13 @@ + child.setParent (this); + } + +- static int /*long*/ atkAction_get_keybinding (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkAction_get_keybinding (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) System.out.println ("-->atkAction_get_keybinding"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_ACTION_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle)); + AtkActionIface actionIface = new AtkActionIface (); + ATK.memmove (actionIface, superType); + if (actionIface.get_keybinding != 0) { +@@ -93,13 +93,13 @@ + return keybindingPtr; + } + +- static int /*long*/ atkAction_get_name (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkAction_get_name (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) System.out.println ("-->atkAction_get_name"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_ACTION_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_ACTION_GET_IFACE (object.handle)); + AtkActionIface actionIface = new AtkActionIface (); + ATK.memmove (actionIface, superType); + if (actionIface.get_name != 0) { +@@ -128,7 +128,7 @@ + return actionNamePtr; + } + +- static int /*long*/ atkComponent_get_extents (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) { ++ static long /*int*/ atkComponent_get_extents (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) { + if (DEBUG) System.out.println ("-->atkComponent_get_extents"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +@@ -137,7 +137,7 @@ + OS.memmove (width, new int[] {0}, 4); + OS.memmove (height, new int[] {0}, 4); + if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); + AtkComponentIface componentIface = new AtkComponentIface (); + ATK.memmove (componentIface, superType); + if (componentIface.get_extents != 0) { +@@ -159,11 +159,11 @@ + event.width = parentWidth [0]; event.height = parentHeight [0]; + if (coord_type == ATK.ATK_XY_WINDOW) { + /* translate control -> display, for filling in event to be dispatched */ +- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); ++ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); + GtkAccessible gtkAccessible = new GtkAccessible (); + ATK.memmove (gtkAccessible, gtkAccessibleHandle); +- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel); ++ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel); + int[] topWindowX = new int [1], topWindowY = new int [1]; + OS.gdk_window_get_origin (window, topWindowX, topWindowY); + event.x += topWindowX [0]; +@@ -174,11 +174,11 @@ + } + if (coord_type == ATK.ATK_XY_WINDOW) { + /* translate display -> control, for answering to the OS */ +- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); ++ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); + GtkAccessible gtkAccessible = new GtkAccessible (); + ATK.memmove (gtkAccessible, gtkAccessibleHandle); +- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel); ++ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel); + int[] topWindowX = new int [1], topWindowY = new int [1]; + OS.gdk_window_get_origin (window, topWindowX, topWindowY); + event.x -= topWindowX [0]; +@@ -191,14 +191,14 @@ + return 0; + } + +- static int /*long*/ atkComponent_get_position (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) { ++ static long /*int*/ atkComponent_get_position (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) { + if (DEBUG) System.out.println ("-->atkComponent_get_position, object: " + atkObject + " x: " + x + " y: " + y + " coord: " + coord_type); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + OS.memmove (x, new int[] {0}, 4); + OS.memmove (y, new int[] {0}, 4); + if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); + AtkComponentIface componentIface = new AtkComponentIface (); + ATK.memmove (componentIface, superType); + if (componentIface.get_extents != 0) { +@@ -216,11 +216,11 @@ + event.x = parentX [0]; event.y = parentY [0]; + if (coord_type == ATK.ATK_XY_WINDOW) { + /* translate control -> display, for filling in event to be dispatched */ +- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); ++ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); + GtkAccessible gtkAccessible = new GtkAccessible (); + ATK.memmove (gtkAccessible, gtkAccessibleHandle); +- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel); ++ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel); + int[] topWindowX = new int [1], topWindowY = new int [1]; + OS.gdk_window_get_origin (window, topWindowX, topWindowY); + event.x += topWindowX [0]; +@@ -231,11 +231,11 @@ + } + if (coord_type == ATK.ATK_XY_WINDOW) { + /* translate display -> control, for answering to the OS */ +- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); ++ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); + GtkAccessible gtkAccessible = new GtkAccessible (); + ATK.memmove (gtkAccessible, gtkAccessibleHandle); +- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel); ++ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel); + int[] topWindowX = new int [1], topWindowY = new int [1]; + OS.gdk_window_get_origin (window, topWindowX, topWindowY); + event.x -= topWindowX [0]; +@@ -246,14 +246,14 @@ + return 0; + } + +- static int /*long*/ atkComponent_get_size (int /*long*/ atkObject, int /*long*/ width, int /*long*/ height, int /*long*/ coord_type) { ++ static long /*int*/ atkComponent_get_size (long /*int*/ atkObject, long /*int*/ width, long /*int*/ height, long /*int*/ coord_type) { + if (DEBUG) System.out.println ("-->atkComponent_get_size"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + OS.memmove (width, new int[] {0}, 4); + OS.memmove (height, new int[] {0}, 4); + if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); + AtkComponentIface componentIface = new AtkComponentIface (); + ATK.memmove (componentIface, superType); + if (componentIface.get_extents != 0) { +@@ -277,13 +277,13 @@ + return 0; + } + +- static int /*long*/ atkComponent_ref_accessible_at_point (int /*long*/ atkObject, int /*long*/ x, int /*long*/ y, int /*long*/ coord_type) { ++ static long /*int*/ atkComponent_ref_accessible_at_point (long /*int*/ atkObject, long /*int*/ x, long /*int*/ y, long /*int*/ coord_type) { + if (DEBUG) System.out.println ("-->atkComponent_ref_accessible_at_point"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_COMPONENT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_COMPONENT_GET_IFACE (object.handle)); + AtkComponentIface componentIface = new AtkComponentIface (); + ATK.memmove (componentIface, superType); + if (componentIface.ref_accessible_at_point != 0) { +@@ -298,11 +298,11 @@ + event.x = (int)/*64*/x; event.y = (int)/*64*/y; + if (coord_type == ATK.ATK_XY_WINDOW) { + /* translate control -> display, for filling in the event to be dispatched */ +- int /*long*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); ++ long /*int*/ gtkAccessibleHandle = ATK.GTK_ACCESSIBLE (object.handle); + GtkAccessible gtkAccessible = new GtkAccessible (); + ATK.memmove (gtkAccessible, gtkAccessibleHandle); +- int /*long*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); +- int /*long*/ window = OS.GTK_WIDGET_WINDOW (topLevel); ++ long /*int*/ topLevel = ATK.gtk_widget_get_toplevel (gtkAccessible.widget); ++ long /*int*/ window = OS.GTK_WIDGET_WINDOW (topLevel); + int[] topWindowX = new int [1], topWindowY = new int [1]; + OS.gdk_window_get_origin (window, topWindowX, topWindowY); + event.x += topWindowX [0]; +@@ -321,27 +321,27 @@ + return parentResult; + } + +- static int /*long*/ atkHypertext_get_link (int /*long*/ atkObject, int /*long*/ link_index) { ++ static long /*int*/ atkHypertext_get_link (long /*int*/ atkObject, long /*int*/ link_index) { + if (DEBUG) System.out.println ("-->atkHypertext_get_link"); + return 0; + } + +- static int /*long*/ atkHypertext_get_n_links (int /*long*/ atkObject) { ++ static long /*int*/ atkHypertext_get_n_links (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkHypertext_get_n_links"); + return 0; /* read hyperlink's name */ + } + +- static int /*long*/ atkHypertext_get_link_index (int /*long*/ atkObject, int /*long*/ char_index) { ++ static long /*int*/ atkHypertext_get_link_index (long /*int*/ atkObject, long /*int*/ char_index) { + if (DEBUG) System.out.println ("-->atkHypertext_get_link_index"); + return 0; + } + +- static int /*long*/ atkObject_get_description (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_description (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObject_get_description"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ parentResult = 0; ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.get_description != 0) { +@@ -369,12 +369,12 @@ + return descriptionPtr; + } + +- static int /*long*/ atkObject_get_name (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_name (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObject_get_name: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ parentResult = 0; ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.get_name != 0) { +@@ -402,12 +402,12 @@ + return namePtr; + } + +- static int /*long*/ atkObject_get_n_children (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_n_children (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObject_get_n_children: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ parentResult = 0; ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.get_n_children != 0) { +@@ -425,31 +425,31 @@ + return event.detail; + } + +- static int /*long*/ atkObject_get_index_in_parent (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_index_in_parent (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObjectCB_get_index_in_parent. "); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + if (object.index != -1) return object.index; +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.get_index_in_parent == 0) return 0; + return ATK.call (objectClass.get_index_in_parent,object. handle); + } + +- static int /*long*/ atkObject_get_parent (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_parent (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObject_get_parent: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + if (object.parent != null) return object.parent.handle; +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.get_parent == 0) return 0; + return ATK.call (objectClass.get_parent, object.handle); + } + +- static int /*long*/ atkObject_get_role (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_get_role (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObject_get_role: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +@@ -497,14 +497,14 @@ + } + } + } +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.get_role == 0) return 0; + return ATK.call (objectClass.get_role, object.handle); + } + +- static int /*long*/ atkObject_ref_child (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkObject_ref_child (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) System.out.println ("-->atkObject_ref_child: " + index + " of: " + atkObject); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +@@ -514,19 +514,19 @@ + OS.g_object_ref (accObject.handle); + return accObject.handle; + } +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.ref_child == 0) return 0; + return ATK.call (objectClass.ref_child, object.handle, index); + } + +- static int /*long*/ atkObject_ref_state_set (int /*long*/ atkObject) { ++ static long /*int*/ atkObject_ref_state_set (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkObject_ref_state_set"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ parentResult = 0; ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkObjectClass objectClass = new AtkObjectClass (); + ATK.memmove (objectClass, superType); + if (objectClass.ref_state_set != 0) { +@@ -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.accessible); + event.childID = object.id; + event.detail = -1; +@@ -564,13 +564,13 @@ + return set; + } + +- static int /*long*/ atkSelection_is_child_selected (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkSelection_is_child_selected (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) System.out.println ("-->atkSelection_is_child_selected"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_SELECTION_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle)); + AtkSelectionIface selectionIface = new AtkSelectionIface (); + ATK.memmove (selectionIface, superType); + if (selectionIface.is_child_selected != 0) { +@@ -592,13 +592,13 @@ + return parentResult; + } + +- static int /*long*/ atkSelection_ref_selection (int /*long*/ atkObject, int /*long*/ index) { ++ static long /*int*/ atkSelection_ref_selection (long /*int*/ atkObject, long /*int*/ index) { + if (DEBUG) System.out.println ("-->atkSelection_ref_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_SELECTION_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_SELECTION_GET_IFACE (object.handle)); + AtkSelectionIface selectionIface = new AtkSelectionIface (); + ATK.memmove (selectionIface, superType); + if (selectionIface.ref_selection != 0) { +@@ -622,13 +622,13 @@ + return parentResult; + } + +- static int /*long*/ atkText_get_caret_offset (int /*long*/ atkObject) { ++ static long /*int*/ atkText_get_caret_offset (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkText_get_caret_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle)); + AtkTextIface textIface = new AtkTextIface (); + ATK.memmove (textIface, superType); + if (textIface.get_caret_offset != 0) { +@@ -647,14 +647,14 @@ + return event.offset; + } + +- static int /*long*/ atkText_get_character_at_offset (int /*long*/ atkObject, int /*long*/ offset) { ++ static long /*int*/ atkText_get_character_at_offset (long /*int*/ atkObject, long /*int*/ offset) { + if (DEBUG) System.out.println ("-->atkText_get_character_at_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + String text = object.getText (); + if (text != null) return text.charAt ((int)/*64*/offset); // TODO + if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) { +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkTextIface textIface = new AtkTextIface (); + ATK.memmove (textIface, superType); + if (textIface.get_character_at_offset != 0) { +@@ -664,14 +664,14 @@ + return 0; + } + +- static int /*long*/ atkText_get_character_count (int /*long*/ atkObject) { ++ static long /*int*/ atkText_get_character_count (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkText_get_character_count"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + String text = object.getText (); + if (text != null) return text.length (); + if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) { +- int /*long*/ superType = ATK.g_type_class_peek (object.parentType); ++ long /*int*/ superType = ATK.g_type_class_peek (object.parentType); + AtkTextIface textIface = new AtkTextIface (); + ATK.memmove (textIface, superType); + if (textIface.get_character_count != 0) { +@@ -681,13 +681,13 @@ + return 0; + } + +- static int /*long*/ atkText_get_n_selections (int /*long*/ atkObject) { ++ static long /*int*/ atkText_get_n_selections (long /*int*/ atkObject) { + if (DEBUG) System.out.println ("-->atkText_get_n_selections"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle)); + AtkTextIface textIface = new AtkTextIface (); + ATK.memmove (textIface, superType); + if (textIface.get_n_selections != 0) { +@@ -705,14 +705,14 @@ + return event.length == 0 ? parentResult : 1; + } + +- static int /*long*/ atkText_get_selection (int /*long*/ atkObject, int /*long*/ selection_num, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_get_selection (long /*int*/ atkObject, long /*int*/ selection_num, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) System.out.println ("-->atkText_get_selection"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; + OS.memmove (start_offset, new int[] {0}, 4); + OS.memmove (end_offset, new int[] {0}, 4); + if (ATK.g_type_is_a (object.parentType, ATK_TEXT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (object.handle)); + AtkTextIface textIface = new AtkTextIface (); + ATK.memmove (textIface, superType); + if (textIface.get_selection != 0) { +@@ -738,7 +738,7 @@ + return 0; + } + +- static int /*long*/ atkText_get_text (int /*long*/ atkObject, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_get_text (long /*int*/ atkObject, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) System.out.println ("-->atkText_get_text: " + start_offset + "," + end_offset); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +@@ -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); +- int /*long*/ result = OS.g_malloc (bytes.length); ++ long /*int*/ result = OS.g_malloc (bytes.length); + OS.memmove (result, bytes, bytes.length); + return result; + } + return 0; + } + +- static int /*long*/ atkText_get_text_after_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_get_text_after_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) System.out.println ("-->atkText_get_text_after_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +@@ -925,14 +925,14 @@ + OS.memmove (end_offset, new int[] {endBounds}, 4); + text = text.substring (startBounds, endBounds); + byte[] bytes = Converter.wcsToMbcs (null, text, true); +- int /*long*/ result = OS.g_malloc (bytes.length); ++ long /*int*/ result = OS.g_malloc (bytes.length); + OS.memmove (result, bytes, bytes.length); + return result; + } + return 0; + } + +- static int /*long*/ atkText_get_text_at_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_get_text_at_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { + 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; +@@ -1041,14 +1041,14 @@ + OS.memmove (end_offset, new int[] {endBounds}, 4); + text = text.substring (startBounds, endBounds); + byte[] bytes = Converter.wcsToMbcs (null, text, true); +- int /*long*/ result = OS.g_malloc (bytes.length); ++ long /*int*/ result = OS.g_malloc (bytes.length); + OS.memmove (result, bytes, bytes.length); + return result; + } + return 0; + } + +- static int /*long*/ atkText_get_text_before_offset (int /*long*/ atkObject, int /*long*/ offset_value, int /*long*/ boundary_type, int /*long*/ start_offset, int /*long*/ end_offset) { ++ static long /*int*/ atkText_get_text_before_offset (long /*int*/ atkObject, long /*int*/ offset_value, long /*int*/ boundary_type, long /*int*/ start_offset, long /*int*/ end_offset) { + if (DEBUG) System.out.println ("-->atkText_get_text_before_offset"); + AccessibleObject object = getAccessibleObject (atkObject); + if (object == null) return 0; +@@ -1162,7 +1162,7 @@ + OS.memmove (end_offset, new int[] {endBounds}, 4); + text = text.substring (startBounds, endBounds); + byte[] bytes = Converter.wcsToMbcs (null, text, true); +- int /*long*/ result = OS.g_malloc (bytes.length); ++ long /*int*/ result = OS.g_malloc (bytes.length); + OS.memmove (result, bytes, bytes.length); + return result; + } +@@ -1175,11 +1175,11 @@ + return result != null ? result : new AccessibleListener [0]; + } + +- static AccessibleObject getAccessibleObject (int /*long*/ atkObject) { ++ static AccessibleObject getAccessibleObject (long /*int*/ atkObject) { + return (AccessibleObject)AccessibleObjects.get (new LONG (atkObject)); + } + +- AccessibleObject getChildByHandle (int /*long*/ handle) { ++ AccessibleObject getChildByHandle (long /*int*/ handle) { + return (AccessibleObject) children.get (new LONG (handle)); + } + +@@ -1209,13 +1209,13 @@ + } + + String getText () { +- int /*long*/ parentResult = 0; ++ long /*int*/ parentResult = 0; + String parentText = ""; //$NON-NLS-1$ + if (ATK.g_type_is_a (parentType, ATK_TEXT_TYPE)) { +- int /*long*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (handle)); ++ long /*int*/ superType = ATK.g_type_interface_peek_parent (ATK.ATK_TEXT_GET_IFACE (handle)); + AtkTextIface textIface = new AtkTextIface (); + ATK.memmove (textIface, superType); +- int /*long*/ characterCount = 0; ++ long /*int*/ characterCount = 0; + if (textIface.get_character_count != 0) { + characterCount = ATK.call (textIface.get_character_count, handle); + } +@@ -1246,9 +1246,9 @@ + return result != null ? result : new AccessibleTextListener [0]; + } + +- static int /*long*/ gObjectClass_finalize (int /*long*/ atkObject) { +- int /*long*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject)); +- int /*long*/ gObjectClass = ATK.G_OBJECT_CLASS (superType); ++ static long /*int*/ gObjectClass_finalize (long /*int*/ atkObject) { ++ long /*int*/ superType = ATK.g_type_class_peek_parent (ATK.G_OBJECT_GET_CLASS (atkObject)); ++ long /*int*/ gObjectClass = ATK.G_OBJECT_CLASS (superType); + GObjectClass objectClassStruct = new GObjectClass (); + ATK.memmove (objectClassStruct, gObjectClass); + ATK.call (objectClassStruct.finalize, atkObject); +@@ -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 */ +- int /*long*/ parentType = AccessibleFactory.getDefaultParentType (); ++ long /*int*/ parentType = AccessibleFactory.getDefaultParentType (); + for (int i = 0; i < event.children.length; i++) { + AccessibleObject object = getChildByIndex (i); + if (object == null) { +- int /*long*/ childType = AccessibleFactory.getChildType (accessible, i); ++ long /*int*/ childType = AccessibleFactory.getChildType (accessible, i); + object = new AccessibleObject (childType, 0, accessible, parentType, true); + AccessibleObjects.put (new LONG (object.handle), object); + addChild (object); +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; + +-static native final int /*long*/ getAWTHandle (Object canvas); ++static native final long /*int*/ getAWTHandle (Object canvas); + static native final void setDebug (Frame canvas, boolean debug); + + static synchronized void loadLibrary () { +@@ -152,7 +152,7 @@ + if ((parent.getStyle () & SWT.EMBEDDED) == 0) { + SWT.error (SWT.ERROR_INVALID_ARGUMENT); + } +- int /*long*/ handle = parent.embeddedHandle; ++ long /*int*/ handle = parent.embeddedHandle; + /* + * Some JREs have implemented the embedded frame constructor to take an integer + * and other JREs take a long. To handle this binary incompatibility, use +@@ -200,9 +200,9 @@ + if (parent.isDisposed()) return; + Shell shell = parent.getShell(); + loadLibrary(); +- int /*long*/ awtHandle = getAWTHandle(window); ++ long /*int*/ awtHandle = getAWTHandle(window); + if (awtHandle == 0) return; +- int /*long*/ xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(OS.gtk_widget_get_toplevel(shell.handle))); ++ long /*int*/ xWindow = OS.gdk_x11_drawable_get_xid(OS.GTK_WIDGET_WINDOW(OS.gtk_widget_get_toplevel(shell.handle))); + OS.XSetTransientForHint(OS.GDK_DISPLAY(), awtHandle, xWindow); + } + }); +@@ -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); +- int /*long*/ handle = 0; ++ long /*int*/ handle = 0; + try { + loadLibrary (); + handle = getAWTHandle (parent); +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}) { +- 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 ();} + }; + + directoryServiceProvider = 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 getFile (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 getFile (args[0], args[1], args[2]);} + }; + + directoryServiceProvider2 = new XPCOMObject (new int[] {2, 0, 0, 3, 2}) { +- 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 getFile (args[0], args[1], args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return getFiles (args[0], args[1]);} ++ 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 getFile (args[0], args[1], args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return getFiles (args[0], args[1]);} + }; + } + +@@ -90,32 +90,32 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return directoryServiceProvider.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 (nsIDirectoryServiceProvider.NS_IDIRECTORYSERVICEPROVIDER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIDirectoryServiceProvider2.NS_IDIRECTORYSERVICEPROVIDER2_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {directoryServiceProvider2.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {directoryServiceProvider2.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; + } + +@@ -132,7 +132,7 @@ + void setProfilePath (String path) { + profilePath = path; + if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$ +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + nsEmbedString pathString = new nsEmbedString (path); + int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); +@@ -148,7 +148,7 @@ + + /* nsIDirectoryServiceProvider2 */ + +-int getFiles (int /*long*/ prop, int /*long*/ _retval) { ++int getFiles (long /*int*/ prop, long /*int*/ _retval) { + int size = XPCOM.strlen (prop); + byte[] bytes = new byte[size]; + XPCOM.memmove (bytes, prop, size); +@@ -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 */ +- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true)); ++ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_PLUGIN_PATH, true)); + if (ptr != 0) { + int length = C.strlen (ptr); + byte[] buffer = new byte[length]; +@@ -210,9 +210,9 @@ + propertyValues = pluginDirs; + } + +- XPCOM.memmove(_retval, new int /*long*/[] {0}, C.PTR_SIZEOF); ++ XPCOM.memmove(_retval, new long /*int*/[] {0}, C.PTR_SIZEOF); + if (propertyValues != null) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + nsISupports[] files = new nsISupports [propertyValues.length]; + int index = 0; + for (int i = 0; i < propertyValues.length; i++) { +@@ -246,7 +246,7 @@ + + SimpleEnumerator enumerator = new SimpleEnumerator (files); + enumerator.AddRef (); +- XPCOM.memmove (_retval, new int /*long*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (_retval, new long /*int*/[] {enumerator.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +@@ -255,7 +255,7 @@ + + /* nsIDirectoryServiceProvider implementation */ + +-int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) { ++int getFile(long /*int*/ prop, long /*int*/ persistent, long /*int*/ _retval) { + int size = XPCOM.strlen (prop); + byte[] bytes = new byte[size]; + XPCOM.memmove (bytes, prop, size); +@@ -309,9 +309,9 @@ + } + + XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */ +- XPCOM.memmove (_retval, new int /*long*/[] {0}, C.PTR_SIZEOF); ++ XPCOM.memmove (_retval, new long /*int*/[] {0}, C.PTR_SIZEOF); + if (propertyValue != null && propertyValue.length () > 0) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + nsEmbedString pathString = new nsEmbedString (propertyValue); + int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), 1, result); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); +@@ -324,7 +324,7 @@ + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); + +- XPCOM.memmove (_retval, new int /*long*/[] {result[0]}, C.PTR_SIZEOF); ++ XPCOM.memmove (_retval, new long /*int*/[] {result[0]}, C.PTR_SIZEOF); + localFile.Release (); + return XPCOM.NS_OK; + } +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}) { +- 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 ();} + }; + + download = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} +- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} +- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} +- public int /*long*/ method8 (int /*long*/[] args) { ++ 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} ++ public long /*int*/ method8 (long /*int*/[] args) { + if (args.length == 10) { + return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]); + } else { + return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]); + } + } +- public int /*long*/ method9 (int /*long*/[] args) { ++ public long /*int*/ method9 (long /*int*/[] args) { + if (args.length == 8) { + return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]); + } else { + return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]); + } + } +- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);} +- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);} +- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);} +- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);} +- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);} +- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);} +- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);} +- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);} +- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);} ++ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);} ++ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);} ++ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);} ++ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);} ++ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);} ++ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);} + }; + + progressDialog = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 3, is32 ? 10 : 6, is32 ? 8 : 7, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} +- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} +- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} +- public int /*long*/ method8 (int /*long*/[] args) { ++ 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} ++ public long /*int*/ method8 (long /*int*/[] args) { + if (args.length == 10) { + return OnProgressChange64_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]); + } else { + return OnProgressChange64 (args[0], args[1], args[2], args[3], args[4], args[5]); + } + } +- public int /*long*/ method9 (int /*long*/[] args) { ++ public long /*int*/ method9 (long /*int*/[] args) { + if (args.length == 8) { + return Init_32 (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]); + } else { + return Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]); + } + } +- public int /*long*/ method10 (int /*long*/[] args) {return GetTargetFile (args[0]);} +- public int /*long*/ method11 (int /*long*/[] args) {return GetPercentComplete (args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return GetAmountTransferred (args[0]);} +- public int /*long*/ method13 (int /*long*/[] args) {return GetSize (args[0]);} +- public int /*long*/ method14 (int /*long*/[] args) {return GetSource (args[0]);} +- public int /*long*/ method15 (int /*long*/[] args) {return GetTarget (args[0]);} +- public int /*long*/ method16 (int /*long*/[] args) {return GetCancelable (args[0]);} +- public int /*long*/ method17 (int /*long*/[] args) {return GetDisplayName (args[0]);} +- public int /*long*/ method18 (int /*long*/[] args) {return GetStartTime (args[0]);} +- public int /*long*/ method19 (int /*long*/[] args) {return GetMIMEInfo (args[0]);} +- public int /*long*/ method20 (int /*long*/[] args) {return Open (args[0]);} +- public int /*long*/ method21 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);} +- public int /*long*/ method22 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);} +- public int /*long*/ method23 (int /*long*/[] args) {return GetObserver (args[0]);} +- public int /*long*/ method24 (int /*long*/[] args) {return SetObserver (args[0]);} +- public int /*long*/ method25 (int /*long*/[] args) {return GetDialog (args[0]);} +- public int /*long*/ method26 (int /*long*/[] args) {return SetDialog (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetTargetFile (args[0]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return GetPercentComplete (args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return GetAmountTransferred (args[0]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return GetSize (args[0]);} ++ public long /*int*/ method14 (long /*int*/[] args) {return GetSource (args[0]);} ++ public long /*int*/ method15 (long /*int*/[] args) {return GetTarget (args[0]);} ++ public long /*int*/ method16 (long /*int*/[] args) {return GetCancelable (args[0]);} ++ public long /*int*/ method17 (long /*int*/[] args) {return GetDisplayName (args[0]);} ++ public long /*int*/ method18 (long /*int*/[] args) {return GetStartTime (args[0]);} ++ public long /*int*/ method19 (long /*int*/[] args) {return GetMIMEInfo (args[0]);} ++ public long /*int*/ method20 (long /*int*/[] args) {return Open (args[0]);} ++ public long /*int*/ method21 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);} ++ public long /*int*/ method22 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);} ++ public long /*int*/ method23 (long /*int*/[] args) {return GetObserver (args[0]);} ++ public long /*int*/ method24 (long /*int*/[] args) {return SetObserver (args[0]);} ++ public long /*int*/ method25 (long /*int*/[] args) {return GetDialog (args[0]);} ++ public long /*int*/ method26 (long /*int*/[] args) {return SetDialog (args[0]);} + }; + + webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} +- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} +- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} + }; + } + +@@ -161,36 +161,36 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return progressDialog.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 (nsIDownload_1_8.NS_IDOWNLOAD_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF); + AddRef(); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIProgressDialog_1_8.NS_IPROGRESSDIALOG_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF); + AddRef(); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.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; + } + +@@ -203,26 +203,26 @@ + /* nsIDownload */ + + /* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */ +-int Init_32 (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aTempFile, int /*long*/ aCancelable) { ++int Init_32 (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aTempFile, long /*int*/ aCancelable) { + long startTime = (startTime2 << 32) + startTime1; + return Init (aSource, aTarget, aDisplayName, aMIMEInfo, startTime, aTempFile, aCancelable); + } + +-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, long startTime, int /*long*/ aTempFile, int /*long*/ aCancelable) { ++int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long startTime, long /*int*/ aTempFile, long /*int*/ aCancelable) { + cancelable = new nsICancelable (aCancelable); + nsIURI source = new nsIURI (aSource); +- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (); + int rc = source.GetHost (aSpec); + if (rc != XPCOM.NS_OK) Mozilla.error(rc); + int length = XPCOM.nsEmbedCString_Length (aSpec); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec); + byte[] dest = new byte[length]; + XPCOM.memmove (dest, buffer, length); + XPCOM.nsEmbedCString_delete (aSpec); + String url = new String (dest); + + nsIURI target = new nsIURI (aTarget); +- int /*long*/ aPath = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aPath = XPCOM.nsEmbedCString_new (); + rc = target.GetPath (aPath); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + length = XPCOM.nsEmbedCString_Length (aPath); +@@ -277,60 +277,60 @@ + return XPCOM.NS_OK; + } + +-int GetAmountTransferred (int /*long*/ arg0) { ++int GetAmountTransferred (long /*int*/ arg0) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetCancelable (int /*long*/ arg0) { ++int GetCancelable (long /*int*/ arg0) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetDisplayName (int /*long*/ aDisplayName) { ++int GetDisplayName (long /*int*/ aDisplayName) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetMIMEInfo (int /*long*/ aMIMEInfo) { ++int GetMIMEInfo (long /*int*/ aMIMEInfo) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetPercentComplete (int /*long*/ aPercentComplete) { ++int GetPercentComplete (long /*int*/ aPercentComplete) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetSize (int /*long*/ arg0) { ++int GetSize (long /*int*/ arg0) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetSource (int /*long*/ aSource) { ++int GetSource (long /*int*/ aSource) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetStartTime (int /*long*/ aStartTime) { ++int GetStartTime (long /*int*/ aStartTime) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetTarget (int /*long*/ aTarget) { ++int GetTarget (long /*int*/ aTarget) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetTargetFile (int /*long*/ arg0) { ++int GetTargetFile (long /*int*/ arg0) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + + /* nsIProgressDialog */ +-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) { ++int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetDialog (int /*long*/ aDialog) { ++int GetDialog (long /*int*/ aDialog) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetObserver (int /*long*/ aObserver) { ++int GetObserver (long /*int*/ aObserver) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int Open (int /*long*/ aParent) { ++int Open (long /*int*/ aParent) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +@@ -338,26 +338,26 @@ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetDialog (int /*long*/ aDialog) { ++int SetDialog (long /*int*/ aDialog) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetObserver (int /*long*/ aObserver) { ++int SetObserver (long /*int*/ aObserver) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + + /* nsIWebProgressListener */ + +-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) { ++int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) { + 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) { + return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress); + } + + /* Note. The last 4 args in the original interface are defined as PRInt64. These each translate into two java ints. */ +-int OnProgressChange64_32 (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aCurSelfProgress1, int /*long*/ aCurSelfProgress2, int /*long*/ aMaxSelfProgress1, int /*long*/ aMaxSelfProgress2, int /*long*/ aCurTotalProgress1, int /*long*/ aCurTotalProgress2, int /*long*/ aMaxTotalProgress1, int /*long*/ aMaxTotalProgress2) { ++int OnProgressChange64_32 (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aCurSelfProgress1, long /*int*/ aCurSelfProgress2, long /*int*/ aMaxSelfProgress1, long /*int*/ aMaxSelfProgress2, long /*int*/ aCurTotalProgress1, long /*int*/ aCurTotalProgress2, long /*int*/ aMaxTotalProgress1, long /*int*/ aMaxTotalProgress2) { + long aCurSelfProgress = (aCurSelfProgress2 << 32) + aCurSelfProgress1; + long aMaxSelfProgress = (aMaxSelfProgress2 << 32) + aMaxSelfProgress1; + long aCurTotalProgress = (aCurTotalProgress2 << 32) + aCurTotalProgress1; +@@ -365,7 +365,7 @@ + return OnProgressChange64 (aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress); + } + +-int OnProgressChange64 (int /*long*/ aWebProgress, int /*long*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) { ++int OnProgressChange64 (long /*int*/ aWebProgress, long /*int*/ aRequest, long aCurSelfProgress, long aMaxSelfProgress, long aCurTotalProgress, long aMaxTotalProgress) { + long currentKBytes = aCurTotalProgress / 1024; + long totalKBytes = aMaxTotalProgress / 1024; + if (shell != null && !shell.isDisposed ()) { +@@ -378,11 +378,11 @@ + return XPCOM.NS_OK; + } + +-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) { ++int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) { + return XPCOM.NS_OK; + } + +-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) { ++int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) { + if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) { + cancelable = null; + if (shell != null && !shell.isDisposed ()) shell.dispose (); +@@ -391,7 +391,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) { + return XPCOM.NS_OK; + } + } +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 */ + 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) { + Download_1_8 download = new Download_1_8 (); + download.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +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 */ + 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) { + Download download = new Download (); + download.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +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}) { +- 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 ();} + }; + + download = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 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 Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);} +- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);} +- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);} +- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);} +- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);} +- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);} +- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);} +- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);} +- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);} +- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (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 Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);} ++ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);} ++ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);} + }; + + progressDialog = new XPCOMObject (new int[] {2, 0, 0, 7, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 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 Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method4 (int /*long*/[] args) {return GetSource (args[0]);} +- public int /*long*/ method5 (int /*long*/[] args) {return GetTarget (args[0]);} +- public int /*long*/ method6 (int /*long*/[] args) {return GetPersist (args[0]);} +- public int /*long*/ method7 (int /*long*/[] args) {return GetPercentComplete (args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return GetDisplayName (args[0]);} +- public int /*long*/ method9 (int /*long*/[] args) {return SetDisplayName (args[0]);} +- public int /*long*/ method10 (int /*long*/[] args) {return GetStartTime (args[0]);} +- public int /*long*/ method11 (int /*long*/[] args) {return GetMIMEInfo (args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return GetListener (args[0]);} +- public int /*long*/ method13 (int /*long*/[] args) {return SetListener (args[0]);} +- public int /*long*/ method14 (int /*long*/[] args) {return GetObserver (args[0]);} +- public int /*long*/ method15 (int /*long*/[] args) {return SetObserver (args[0]);} +- public int /*long*/ method16 (int /*long*/[] args) {return Open (args[0]);} +- public int /*long*/ method17 (int /*long*/[] args) {return GetCancelDownloadOnClose (args[0]);} +- public int /*long*/ method18 (int /*long*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);} +- public int /*long*/ method19 (int /*long*/[] args) {return GetDialog (args[0]);} +- public int /*long*/ method20 (int /*long*/[] args) {return SetDialog (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 Init (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return GetSource (args[0]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return GetTarget (args[0]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return GetPersist (args[0]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return GetPercentComplete (args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return GetDisplayName (args[0]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return SetDisplayName (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetStartTime (args[0]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return GetMIMEInfo (args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return GetListener (args[0]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return SetListener (args[0]);} ++ public long /*int*/ method14 (long /*int*/[] args) {return GetObserver (args[0]);} ++ public long /*int*/ method15 (long /*int*/[] args) {return SetObserver (args[0]);} ++ public long /*int*/ method16 (long /*int*/[] args) {return Open (args[0]);} ++ public long /*int*/ method17 (long /*int*/[] args) {return GetCancelDownloadOnClose (args[0]);} ++ public long /*int*/ method18 (long /*int*/[] args) {return SetCancelDownloadOnClose ((int)/*64*/args[0]);} ++ public long /*int*/ method19 (long /*int*/[] args) {return GetDialog (args[0]);} ++ public long /*int*/ method20 (long /*int*/[] args) {return SetDialog (args[0]);} + }; + + webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} +- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} +- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} + }; + } + +@@ -125,36 +125,36 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return progressDialog.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 (nsIDownload.NS_IDOWNLOAD_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {download.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {download.getAddress ()}, C.PTR_SIZEOF); + AddRef(); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIProgressDialog.NS_IPROGRESSDIALOG_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {progressDialog.getAddress ()}, C.PTR_SIZEOF); + AddRef(); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.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; + } + +@@ -167,13 +167,13 @@ + /* nsIDownload */ + + /* Note. The argument startTime is defined as a PRInt64. This translates into two java ints. */ +-int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName, int /*long*/ aMIMEInfo, int /*long*/ startTime1, int /*long*/ startTime2, int /*long*/ aPersist) { ++int Init (long /*int*/ aSource, long /*int*/ aTarget, long /*int*/ aDisplayName, long /*int*/ aMIMEInfo, long /*int*/ startTime1, long /*int*/ startTime2, long /*int*/ aPersist) { + nsIURI source = new nsIURI (aSource); +- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (); + int rc = source.GetHost (aSpec); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + int length = XPCOM.nsEmbedCString_Length (aSpec); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec); + byte[] dest = new byte[length]; + XPCOM.memmove (dest, buffer, length); + XPCOM.nsEmbedCString_delete (aSpec); +@@ -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 == XPCOM.NS_OK) { /* >= 1.7 */ + nsIURI target = new nsIURI (result[0]); + result[0] = 0; +- int /*long*/ aPath = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aPath = XPCOM.nsEmbedCString_new (); + rc = target.GetPath (aPath); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + length = XPCOM.nsEmbedCString_Length (aPath); +@@ -205,7 +205,7 @@ + target.Release (); + } else { /* < 1.7 */ + nsILocalFile target = new nsILocalFile (aTarget); +- int /*long*/ aNativeTarget = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aNativeTarget = XPCOM.nsEmbedCString_new (); + rc = target.GetNativeLeafName (aNativeTarget); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + length = XPCOM.nsEmbedCString_Length (aNativeTarget); +@@ -259,54 +259,54 @@ + return XPCOM.NS_OK; + } + +-int GetSource (int /*long*/ aSource) { ++int GetSource (long /*int*/ aSource) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetTarget (int /*long*/ aTarget) { ++int GetTarget (long /*int*/ aTarget) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetPersist (int /*long*/ aPersist) { ++int GetPersist (long /*int*/ aPersist) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetPercentComplete (int /*long*/ aPercentComplete) { ++int GetPercentComplete (long /*int*/ aPercentComplete) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetDisplayName (int /*long*/ aDisplayName) { ++int GetDisplayName (long /*int*/ aDisplayName) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetDisplayName (int /*long*/ aDisplayName) { ++int SetDisplayName (long /*int*/ aDisplayName) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetStartTime (int /*long*/ aStartTime) { ++int GetStartTime (long /*int*/ aStartTime) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetMIMEInfo (int /*long*/ aMIMEInfo) { ++int GetMIMEInfo (long /*int*/ aMIMEInfo) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetListener (int /*long*/ aListener) { ++int GetListener (long /*int*/ aListener) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetListener (int /*long*/ aListener) { ++int SetListener (long /*int*/ aListener) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetObserver (int /*long*/ aObserver) { ++int GetObserver (long /*int*/ aObserver) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetObserver (int /*long*/ aObserver) { ++int SetObserver (long /*int*/ aObserver) { + if (aObserver != 0) { + nsISupports supports = new nsISupports (aObserver); +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + 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); +@@ -316,11 +316,11 @@ + } + + /* nsIProgressDialog */ +-int Open (int /*long*/ aParent) { ++int Open (long /*int*/ aParent) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetCancelDownloadOnClose (int /*long*/ aCancelDownloadOnClose) { ++int GetCancelDownloadOnClose (long /*int*/ aCancelDownloadOnClose) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +@@ -328,17 +328,17 @@ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetDialog (int /*long*/ aDialog) { ++int GetDialog (long /*int*/ aDialog) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetDialog (int /*long*/ aDialog) { ++int SetDialog (long /*int*/ aDialog) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + + /* nsIWebProgressListener */ + +-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) { ++int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateFlags, int aStatus) { + if ((aStateFlags & nsIWebProgressListener.STATE_STOP) != 0) { + if (helperAppLauncher != null) helperAppLauncher.Release (); + helperAppLauncher = null; +@@ -348,7 +348,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) { + int currentKBytes = aCurTotalProgress / 1024; + int totalKBytes = aMaxTotalProgress / 1024; + if (shell != null && !shell.isDisposed ()) { +@@ -361,15 +361,15 @@ + return XPCOM.NS_OK; + } + +-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) { ++int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) { + 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) { + return XPCOM.NS_OK; + } + +-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) { ++int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) { + return XPCOM.NS_OK; + } + } +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 */ + 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 ();} + }; + + filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 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 Init (args[0], args[1], (short)args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);} +- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);} +- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);} +- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);} +- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);} +- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);} +- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);} +- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);} +- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);} +- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);} +- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);} +- public int /*long*/ method17 (int /*long*/[] args) {return Show (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 Init (args[0], args[1], (short)args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);} ++ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);} ++ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);} ++ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);} ++ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);} + }; + } + +@@ -49,10 +49,10 @@ + * answers a java string based on the type of string that is appropriate for the Mozilla + * version being used. + */ +-String parseAString (int /*long*/ string) { ++String parseAString (long /*int*/ string) { + if (string == 0) return null; + int length = XPCOM.nsEmbedString_Length (string); +- int /*long*/ buffer = XPCOM.nsEmbedString_get (string); ++ long /*int*/ buffer = XPCOM.nsEmbedString_get (string); + char[] chars = new char[length]; + XPCOM.memmove (chars, buffer, length * 2); + return new String (chars); +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 */ + 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]);} + }; + } + + /* nsIFactory */ + +-int CreateInstance (int /*long*/ aOuter, int /*long*/ iid, int /*long*/ result) { ++int CreateInstance (long /*int*/ aOuter, long /*int*/ iid, long /*int*/ result) { + FilePicker_1_8 picker = new FilePicker_1_8 (); + picker.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +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 */ + 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) { + FilePicker picker = new FilePicker (); + picker.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {picker.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {picker.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +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; + short mode; +- int /*long*/ parentHandle; ++ long /*int*/ parentHandle; + String[] files, masks; + String defaultFilename, directory, title; + +@@ -39,30 +39,30 @@ + 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 ();} + }; + + filePicker = new XPCOMObject (new int[] {2, 0, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 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 Init (args[0], args[1], (short)args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return AppendFilters ((int)/*64*/args[0]);} +- public int /*long*/ method5 (int /*long*/[] args) {return AppendFilter (args[0], args[1]);} +- public int /*long*/ method6 (int /*long*/[] args) {return GetDefaultString (args[0]);} +- public int /*long*/ method7 (int /*long*/[] args) {return SetDefaultString (args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return GetDefaultExtension (args[0]);} +- public int /*long*/ method9 (int /*long*/[] args) {return SetDefaultExtension (args[0]);} +- public int /*long*/ method10 (int /*long*/[] args) {return GetFilterIndex (args[0]);} +- public int /*long*/ method11 (int /*long*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return GetDisplayDirectory (args[0]);} +- public int /*long*/ method13 (int /*long*/[] args) {return SetDisplayDirectory (args[0]);} +- public int /*long*/ method14 (int /*long*/[] args) {return GetFile (args[0]);} +- public int /*long*/ method15 (int /*long*/[] args) {return GetFileURL (args[0]);} +- public int /*long*/ method16 (int /*long*/[] args) {return GetFiles (args[0]);} +- public int /*long*/ method17 (int /*long*/[] args) {return Show (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 Init (args[0], args[1], (short)args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return AppendFilters ((int)/*64*/args[0]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return AppendFilter (args[0], args[1]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return GetDefaultString (args[0]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return SetDefaultString (args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return GetDefaultExtension (args[0]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return SetDefaultExtension (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetFilterIndex (args[0]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return SetFilterIndex ((int)/*64*/args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return GetDisplayDirectory (args[0]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return SetDisplayDirectory (args[0]);} ++ public long /*int*/ method14 (long /*int*/[] args) {return GetFile (args[0]);} ++ public long /*int*/ method15 (long /*int*/[] args) {return GetFileURL (args[0]);} ++ public long /*int*/ method16 (long /*int*/[] args) {return GetFiles (args[0]);} ++ public long /*int*/ method17 (long /*int*/[] args) {return Show (args[0]);} + }; + } + +@@ -77,32 +77,32 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return filePicker.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 (nsIFilePicker.NS_IFILEPICKER_IID)) { +- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_IID)) { +- XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.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; + } + +@@ -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. + */ +-String parseAString (int /*long*/ string) { ++String parseAString (long /*int*/ string) { + return null; + } + + /* nsIFilePicker */ + +-int Init (int /*long*/ parent, int /*long*/ title, short mode) { ++int Init (long /*int*/ parent, long /*int*/ title, short mode) { + parentHandle = parent; + this.mode = mode; + this.title = parseAString (title); + return XPCOM.NS_OK; + } + +-int Show (int /*long*/ _retval) { ++int Show (long /*int*/ _retval) { + if (mode == nsIFilePicker.modeGetFolder) { + /* picking a directory */ + int result = showDirectoryPicker (); +@@ -186,20 +186,20 @@ + return directory == null ? nsIFilePicker.returnCancel : nsIFilePicker.returnOK; + } + +-int GetFiles (int /*long*/ aFiles) { ++int GetFiles (long /*int*/ aFiles) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetFileURL (int /*long*/ aFileURL) { ++int GetFileURL (long /*int*/ aFileURL) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetFile (int /*long*/ aFile) { ++int GetFile (long /*int*/ aFile) { + String filename = ""; //$NON-NLS-1$ + if (directory != null) filename += directory + SEPARATOR; + if (files != null && files.length > 0) filename += files[0]; + nsEmbedString path = new nsEmbedString (filename); +- int /*long*/[] file = new int /*long*/[1]; ++ long /*int*/[] file = new long /*int*/[1]; + int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file); + path.dispose (); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); +@@ -208,13 +208,13 @@ + return XPCOM.NS_OK; + } + +-int SetDisplayDirectory (int /*long*/ aDisplayDirectory) { ++int SetDisplayDirectory (long /*int*/ aDisplayDirectory) { + if (aDisplayDirectory == 0) return XPCOM.NS_OK; + nsILocalFile file = new nsILocalFile (aDisplayDirectory); +- int /*long*/ pathname = XPCOM.nsEmbedCString_new (); ++ long /*int*/ pathname = XPCOM.nsEmbedCString_new (); + file.GetNativePath (pathname); + int length = XPCOM.nsEmbedCString_Length (pathname); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (pathname); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (pathname); + byte[] bytes = new byte[length]; + XPCOM.memmove (bytes, buffer, length); + XPCOM.nsEmbedCString_delete (pathname); +@@ -223,10 +223,10 @@ + return XPCOM.NS_OK; + } + +-int GetDisplayDirectory (int /*long*/ aDisplayDirectory) { ++int GetDisplayDirectory (long /*int*/ aDisplayDirectory) { + String directoryName = directory != null ? directory : ""; //$NON-NLS-1$ + nsEmbedString path = new nsEmbedString (directoryName); +- int /*long*/[] file = new int /*long*/[1]; ++ long /*int*/[] file = new long /*int*/[1]; + int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, file); + path.dispose (); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); +@@ -239,31 +239,31 @@ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetFilterIndex (int /*long*/ aFilterIndex) { ++int GetFilterIndex (long /*int*/ aFilterIndex) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetDefaultExtension (int /*long*/ aDefaultExtension) { ++int SetDefaultExtension (long /*int*/ aDefaultExtension) { + /* note that the type of argument 1 changed as of Mozilla 1.8 */ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetDefaultExtension (int /*long*/ aDefaultExtension) { ++int GetDefaultExtension (long /*int*/ aDefaultExtension) { + /* note that the type of argument 1 changed as of Mozilla 1.8 */ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetDefaultString (int /*long*/ aDefaultString) { ++int SetDefaultString (long /*int*/ aDefaultString) { + defaultFilename = parseAString (aDefaultString); + return XPCOM.NS_OK; + } + +-int GetDefaultString (int /*long*/ aDefaultString) { ++int GetDefaultString (long /*int*/ aDefaultString) { + /* note that the type of argument 1 changed as of Mozilla 1.8 */ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int AppendFilter (int /*long*/ title, int /*long*/ filter) { ++int AppendFilter (long /*int*/ title, long /*int*/ filter) { + /* note that the type of arguments 1 and 2 changed as of Mozilla 1.8 */ + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } +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}) { +- 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 ();} + }; + + helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) { +- 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 Show (args[0], args[1], (int)/*64*/args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);} ++ 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 Show (args[0], args[1], (int)/*64*/args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5]);} + }; + } + +@@ -63,27 +63,27 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return helperAppLauncherDialog.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 (nsIHelperAppLauncherDialog_1_9.NS_IHELPERAPPLAUNCHERDIALOG_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.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; + } + +@@ -102,12 +102,12 @@ + + /* nsIHelperAppLauncherDialog */ + +-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) { ++int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) { + nsIHelperAppLauncher_1_9 helperAppLauncher = new nsIHelperAppLauncher_1_9 (aLauncher); + return helperAppLauncher.SaveToDisk (0, 0); + } + +-int PromptForSaveToFile (int /*long*/ aLauncher, int /*long*/ aWindowContext, int /*long*/ aDefaultFileName, int /*long*/ aSuggestedFileExtension, int aForcePrompt, int /*long*/ _retval) { ++int PromptForSaveToFile (long /*int*/ aLauncher, long /*int*/ aWindowContext, long /*int*/ aDefaultFileName, long /*int*/ aSuggestedFileExtension, int aForcePrompt, long /*int*/ _retval) { + int length = XPCOM.strlen_PRUnichar (aDefaultFileName); + char[] dest = new char[length]; + XPCOM.memmove (dest, aDefaultFileName, length * 2); +@@ -131,7 +131,7 @@ + return XPCOM.NS_ERROR_FAILURE; + } + nsEmbedString path = new nsEmbedString (name); +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + int rc = XPCOM.NS_NewLocalFile (path.getAddress (), 1, result); + path.dispose (); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); +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}) { +- 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,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 (Mozilla.IsPre_1_9) { + HelperAppLauncherDialog helperAppLauncherDialog = new HelperAppLauncherDialog (); + helperAppLauncherDialog.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); + } else { + HelperAppLauncherDialog_1_9 helperAppLauncherDialog = new HelperAppLauncherDialog_1_9 (); + helperAppLauncherDialog.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); + } + return XPCOM.NS_OK; + } +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 */ + 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 ();} + }; + + helperAppLauncherDialog = new XPCOMObject (new int[] {2, 0, 0, 3, 5}) { +- 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 Show (args[0], args[1], (int)/*64*/args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);} ++ 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 Show (args[0], args[1], (int)/*64*/args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return PromptForSaveToFile (args[0], args[1], args[2], args[3], args[4]);} + }; + } + +@@ -63,27 +63,27 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return helperAppLauncherDialog.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 (nsIHelperAppLauncherDialog.NS_IHELPERAPPLAUNCHERDIALOG_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {helperAppLauncherDialog.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {helperAppLauncherDialog.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; + } + +@@ -102,14 +102,14 @@ + + /* nsIHelperAppLauncherDialog */ + +-int Show (int /*long*/ aLauncher, int /*long*/ aContext, int aReason) { ++int Show (long /*int*/ aLauncher, long /*int*/ aContext, int aReason) { + /* + * The interface for nsIHelperAppLauncher changed as of mozilla 1.8. Query the received + * nsIHelperAppLauncher for the new interface, and if it is not found then fall back to + * the old interface. + */ + nsISupports supports = new nsISupports (aLauncher); +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + int rc = supports.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result); + if (rc == XPCOM.NS_OK) { /* >= 1.8 */ + nsIHelperAppLauncher_1_8 helperAppLauncher = new nsIHelperAppLauncher_1_8 (aLauncher); +@@ -121,8 +121,8 @@ + return helperAppLauncher.SaveToDisk (0, 0); + } + +-int PromptForSaveToFile (int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) { +- int /*long*/ aDefaultFile, aSuggestedFileExtension, _retval; ++int PromptForSaveToFile (long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) { ++ long /*int*/ aDefaultFile, aSuggestedFileExtension, _retval; + boolean hasLauncher = false; + + /* +@@ -140,7 +140,7 @@ + */ + boolean using_1_8 = false; + nsISupports support = new nsISupports (arg0); +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + int rc = support.QueryInterface (nsIHelperAppLauncher_1_8.NS_IHELPERAPPLAUNCHER_IID, result); + if (rc == XPCOM.NS_OK) { + using_1_8 = true; +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 */ + inputStream = new XPCOMObject (new int[] {2, 0, 0, 0, 1, 3, 4, 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 Close ();} +- public int /*long*/ method4 (int /*long*/[] args) {return Available (args[0]);} +- public int /*long*/ method5 (int /*long*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return IsNonBlocking (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 Close ();} ++ public long /*int*/ method4 (long /*int*/[] args) {return Available (args[0]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return Read (args[0], (int)/*64*/args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return ReadSegments (args[0], args[1], (int)/*64*/args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return IsNonBlocking (args[0]);} + }; + } + +@@ -52,26 +52,26 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return inputStream.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*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.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; + } + +@@ -89,13 +89,13 @@ + return XPCOM.NS_OK; + } + +-int Available (int /*long*/ _retval) { ++int Available (long /*int*/ _retval) { + int available = buffer == null ? 0 : buffer.length - index; + XPCOM.memmove (_retval, new int[] {available}, 4); + return XPCOM.NS_OK; + } + +-int Read(int /*long*/ aBuf, int aCount, int /*long*/ _retval) { ++int Read(long /*int*/ aBuf, int aCount, long /*int*/ _retval) { + int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index); + if (max > 0) { + byte[] src = new byte[max]; +@@ -107,12 +107,12 @@ + return XPCOM.NS_OK; + } + +-int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /*long*/ _retval) { ++int ReadSegments (long /*int*/ aWriter, long /*int*/ aClosure, int aCount, long /*int*/ _retval) { + int max = Math.min (aCount, buffer == null ? 0 : buffer.length - index); + int cnt = max; + while (cnt > 0) { + int[] aWriteCount = new int[1]; +- int /*long*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount); ++ long /*int*/ rc = XPCOM.Call (aWriter, getAddress (), aClosure, buffer, index, cnt, aWriteCount); + if (rc != XPCOM.NS_OK) break; + index += aWriteCount[0]; + cnt -= aWriteCount[0]; +@@ -121,7 +121,7 @@ + return XPCOM.NS_OK; + } + +-int IsNonBlocking (int /*long*/ _retval) { ++int IsNonBlocking (long /*int*/ _retval) { + /* blocking */ + XPCOM.memmove (_retval, new int[] {0}, 4); + return XPCOM.NS_OK; +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; +- int /*long*/ mozillaHandle, embedHandle; ++ long /*int*/ mozillaHandle, embedHandle; + boolean hasFocus; + Listener listener; + static Callback eventCallback; +- static int /*long*/ eventProc; ++ static long /*int*/ eventProc; + static final int STOP_PROPOGATE = 1; + + static boolean IsSparc; +@@ -47,8 +47,8 @@ + this.browser = browser; + } + +-static int /*long*/ eventProc (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) { +- int /*long*/ parent = OS.gtk_widget_get_parent (handle); ++static long /*int*/ eventProc (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) { ++ long /*int*/ parent = OS.gtk_widget_get_parent (handle); + parent = OS.gtk_widget_get_parent (parent); + if (parent == 0) return 0; + Widget widget = Display.getCurrent ().findWidget (parent); +@@ -58,12 +58,12 @@ + return 0; + } + +-static Browser findBrowser (int /*long*/ handle) { ++static Browser findBrowser (long /*int*/ handle) { + /* + * Note. On GTK, Mozilla is embedded into a GtkHBox handle + * and not directly into the parent Composite handle. + */ +- int /*long*/ parent = OS.gtk_widget_get_parent (handle); ++ long /*int*/ parent = OS.gtk_widget_get_parent (handle); + Display display = Display.getCurrent (); + return (Browser)display.findWidget (parent); + } +@@ -83,7 +83,7 @@ + return baseWindow.Create (); + } + +-int /*long*/ getHandle () { ++long /*int*/ getHandle () { + /* + * Bug in Mozilla Linux GTK. Embedding Mozilla into a GtkFixed + * handle causes problems with some Mozilla plug-ins. For some +@@ -112,7 +112,7 @@ + return "swt-xpcominit"; //$NON-NLS-1$ + } + +-int /*long*/ gtk_event (int /*long*/ handle, int /*long*/ gdkEvent, int /*long*/ pointer) { ++long /*int*/ gtk_event (long /*int*/ handle, long /*int*/ gdkEvent, long /*int*/ pointer) { + GdkEvent event = new GdkEvent (); + OS.memmove (event, gdkEvent, GdkEvent.sizeof); + if (event.type == OS.GDK_BUTTON_PRESS) { +@@ -178,7 +178,7 @@ + * forward the event to the parent embedder before Mozilla received and consumed + * them. + */ +- int /*long*/ list = OS.gtk_container_get_children (embedHandle); ++ long /*int*/ list = OS.gtk_container_get_children (embedHandle); + if (list != 0) { + mozillaHandle = OS.g_list_data (list); + OS.g_list_free (list); +@@ -204,7 +204,7 @@ + return true; + } + +-void onDispose (int /*long*/ embedHandle) { ++void onDispose (long /*int*/ embedHandle) { + if (listener != null) { + browser.getDisplay ().removeFilter (SWT.FocusIn, listener); + browser.getShell ().removeListener (SWT.Deactivate, listener); +@@ -216,7 +216,7 @@ + void removeWindowSubclass () { + } + +-void setSize (int /*long*/ embedHandle, int width, int height) { ++void setSize (long /*int*/ embedHandle, int width, int height) { + OS.gtk_widget_set_size_request (embedHandle, width, height); + } + +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 { +- int /*long*/ embedHandle; ++ long /*int*/ embedHandle; + nsIWebBrowser webBrowser; + Object webBrowserObject; + MozillaDelegate delegate; +@@ -44,7 +44,7 @@ + XPCOMObject badCertListener; + int chromeFlags = nsIWebBrowserChrome.CHROME_DEFAULT; + int refCount, lastKeyCode, lastCharCode, authCount; +- int /*long*/ request; ++ long /*int*/ request; + Point location, size; + boolean visible, isChild, ignoreDispose, isRetrievingBadCert, isViewingErrorPage; + Shell tip = null; +@@ -103,7 +103,7 @@ + MozillaClearSessions = new Runnable () { + 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); +@@ -133,9 +133,9 @@ + rc = cookie.GetExpires (expires); + if (expires[0] == 0) { + /* indicates a session cookie */ +- int /*long*/ domain = XPCOM.nsEmbedCString_new (); +- int /*long*/ name = XPCOM.nsEmbedCString_new (); +- int /*long*/ path = XPCOM.nsEmbedCString_new (); ++ long /*int*/ domain = XPCOM.nsEmbedCString_new (); ++ long /*int*/ name = XPCOM.nsEmbedCString_new (); ++ long /*int*/ path = XPCOM.nsEmbedCString_new (); + cookie.GetHost (domain); + cookie.GetName (name); + cookie.GetPath (path); +@@ -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 (); + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + if (!Initialized) { + boolean initLoaded = false; + boolean IsXULRunner = false; +@@ -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); +- int /*long*/ lower = C.malloc (bytes.length); ++ long /*int*/ lower = C.malloc (bytes.length); + C.memmove (lower, bytes, bytes.length); + range.lower = lower; + range.lowerInclusive = LowerRangeInclusive; + + bytes = MozillaDelegate.wcsToMbcs (null, GRERANGE_UPPER, true); +- int /*long*/ upper = C.malloc (bytes.length); ++ long /*int*/ upper = C.malloc (bytes.length); + C.memmove (upper, bytes, bytes.length); + range.upper = upper; + range.upperInclusive = UpperRangeInclusive; + + int length = XPCOMInit.PATH_MAX; +- int /*long*/ greBuffer = C.malloc (length); +- int /*long*/ propertiesPtr = C.malloc (2 * C.PTR_SIZEOF); ++ long /*int*/ greBuffer = C.malloc (length); ++ long /*int*/ propertiesPtr = C.malloc (2 * C.PTR_SIZEOF); + int rc = XPCOMInit.GRE_GetGREPathWithProperties (range, 1, propertiesPtr, 0, greBuffer, length); + + /* +@@ -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 */ +- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true)); ++ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true)); + if (ptr == 0) { + IsXULRunner = false; + } else { +@@ -473,7 +473,7 @@ + } + + /* attempt to use the GRE pointed at by MOZILLA_FIVE_HOME */ +- int /*long*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true)); ++ long /*int*/ ptr = C.getenv (MozillaDelegate.wcsToMbcs (null, XPCOM.MOZILLA_FIVE_HOME, true)); + if (ptr != 0) { + int length = C.strlen (ptr); + byte[] buffer = new byte[length]; +@@ -547,7 +547,7 @@ + LocationProvider.setComponentsPath (componentsDir.getAbsolutePath ()); + } + +- 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 (); +@@ -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; +- int /*long*/ path = XPCOM.nsEmbedCString_new (); ++ long /*int*/ path = XPCOM.nsEmbedCString_new (); + rc = profileDir.GetNativePath (path); + if (rc != XPCOM.NS_OK) { + browser.dispose (); + error (rc); + } + int length = XPCOM.nsEmbedCString_Length (path); +- int /*long*/ ptr = XPCOM.nsEmbedCString_get (path); ++ long /*int*/ ptr = XPCOM.nsEmbedCString_get (path); + buffer = new byte [length]; + XPCOM.memmove (buffer, ptr, length); + String profilePath = new String (MozillaDelegate.mbcsToWcs (null, buffer)) + PROFILE_DIR; +@@ -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 */ + +- 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); +@@ -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 () { + 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); +@@ -1544,122 +1544,122 @@ + 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 ();} + }; + + weakReference = new XPCOMObject (new int[] {2, 0, 0, 2}) { +- 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 QueryReferent (args[0], args[1]);} ++ 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 QueryReferent (args[0], args[1]);} + }; + + webProgressListener = new XPCOMObject (new int[] {2, 0, 0, 4, 6, 3, 4, 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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} +- public int /*long*/ method4 (int /*long*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} +- public int /*long*/ method5 (int /*long*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/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 OnStateChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return OnProgressChange (args[0], args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4], (int)/*64*/args[5]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return OnLocationChange (args[0], args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return OnStatusChange (args[0], args[1], (int)/*64*/args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return OnSecurityChange (args[0], args[1], (int)/*64*/args[2]);} + }; + + webBrowserChrome = new XPCOMObject (new int[] {2, 0, 0, 2, 1, 1, 1, 1, 0, 2, 0, 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 SetStatus ((int)/*64*/args[0], args[1]);} +- public int /*long*/ method4 (int /*long*/[] args) {return GetWebBrowser (args[0]);} +- public int /*long*/ method5 (int /*long*/[] args) {return SetWebBrowser (args[0]);} +- public int /*long*/ method6 (int /*long*/[] args) {return GetChromeFlags (args[0]);} +- public int /*long*/ method7 (int /*long*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return DestroyBrowserWindow ();} +- public int /*long*/ method9 (int /*long*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);} +- public int /*long*/ method10 (int /*long*/[] args) {return ShowAsModal ();} +- public int /*long*/ method11 (int /*long*/[] args) {return IsWindowModal (args[0]);} +- public int /*long*/ method12 (int /*long*/[] args) {return ExitModalEventLoop ((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 SetStatus ((int)/*64*/args[0], args[1]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return GetWebBrowser (args[0]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return SetWebBrowser (args[0]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return GetChromeFlags (args[0]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return SetChromeFlags ((int)/*64*/args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return DestroyBrowserWindow ();} ++ public long /*int*/ method9 (long /*int*/[] args) {return SizeBrowserTo ((int)/*64*/args[0], (int)/*64*/args[1]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return ShowAsModal ();} ++ public long /*int*/ method11 (long /*int*/[] args) {return IsWindowModal (args[0]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return ExitModalEventLoop ((int)/*64*/args[0]);} + }; + + webBrowserChromeFocus = new XPCOMObject (new int[] {2, 0, 0, 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 int /*long*/ method3 (int /*long*/[] args) {return FocusNextElement ();} +- public int /*long*/ method4 (int /*long*/[] args) {return FocusPrevElement ();} ++ 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 FocusNextElement ();} ++ public long /*int*/ method4 (long /*int*/[] args) {return FocusPrevElement ();} + }; + + embeddingSiteWindow = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 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 SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} +- public int /*long*/ method4 (int /*long*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);} +- public int /*long*/ method5 (int /*long*/[] args) {return SetFocus ();} +- public int /*long*/ method6 (int /*long*/[] args) {return GetVisibility (args[0]);} +- public int /*long*/ method7 (int /*long*/[] args) {return SetVisibility ((int)/*64*/args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return GetTitle (args[0]);} +- public int /*long*/ method9 (int /*long*/[] args) {return SetTitle (args[0]);} +- public int /*long*/ method10 (int /*long*/[] args) {return GetSiteWindow (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 SetDimensions ((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], (int)/*64*/args[4]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return GetDimensions ((int)/*64*/args[0], args[1], args[2], args[3], args[4]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return SetFocus ();} ++ public long /*int*/ method6 (long /*int*/[] args) {return GetVisibility (args[0]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return SetVisibility ((int)/*64*/args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);} + }; + + interfaceRequestor = new XPCOMObject (new int[] {2, 0, 0, 2} ){ +- 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 GetInterface (args[0], args[1]);} ++ 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 GetInterface (args[0], args[1]);} + }; + + supportsWeakReference = new XPCOMObject (new int[] {2, 0, 0, 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 GetWeakReference (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 GetWeakReference (args[0]);} + }; + + contextMenuListener = 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 OnShowContextMenu ((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 OnShowContextMenu ((int)/*64*/args[0], args[1], args[2]);} + }; + + uriContentListener = new XPCOMObject (new int[] {2, 0, 0, 2, 5, 3, 4, 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 OnStartURIOpen (args[0], args[1]);} +- public int /*long*/ method4 (int /*long*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} +- public int /*long*/ method5 (int /*long*/[] args) {return IsPreferred (args[0], args[1], args[2]);} +- public int /*long*/ method6 (int /*long*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);} +- public int /*long*/ method7 (int /*long*/[] args) {return GetLoadCookie (args[0]);} +- public int /*long*/ method8 (int /*long*/[] args) {return SetLoadCookie (args[0]);} +- public int /*long*/ method9 (int /*long*/[] args) {return GetParentContentListener (args[0]);} +- public int /*long*/ method10 (int /*long*/[] args) {return SetParentContentListener (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 OnStartURIOpen (args[0], args[1]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return DoContent (args[0], (int)/*64*/args[1], args[2], args[3], args[4]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return IsPreferred (args[0], args[1], args[2]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return CanHandleContent (args[0], (int)/*64*/args[1], args[2], args[3]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return GetLoadCookie (args[0]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return SetLoadCookie (args[0]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return GetParentContentListener (args[0]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return SetParentContentListener (args[0]);} + }; + + tooltipListener = new XPCOMObject (new int[] {2, 0, 0, 3, 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 int /*long*/ method3 (int /*long*/[] args) {return OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return OnHideTooltip ();} ++ 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 OnShowTooltip ((int)/*64*/args[0], (int)/*64*/args[1], args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return OnHideTooltip ();} + }; + + domEventListener = new XPCOMObject (new int[] {2, 0, 0, 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 HandleEvent (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 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]);} ++ 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]);} + }; + } + +@@ -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]; + 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; + } + +-static Browser findBrowser (int /*long*/ handle) { ++static Browser findBrowser (long /*int*/ handle) { + 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 () { + 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); +@@ -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); +@@ -1931,7 +1931,7 @@ + if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); + window.Release (); + +- int /*long*/ document = result[0]; ++ long /*int*/ document = result[0]; + result[0] = 0; + rc = XPCOM.NS_GetComponentManager (result); + if (rc != XPCOM.NS_OK) error (rc); +@@ -1948,12 +1948,12 @@ + + nsIDOMSerializer_1_7 serializer = new nsIDOMSerializer_1_7 (result[0]); + result[0] = 0; +- int /*long*/ string = XPCOM.nsEmbedString_new (); ++ long /*int*/ string = XPCOM.nsEmbedString_new (); + rc = serializer.SerializeToString (document, string); + serializer.Release (); + + int length = XPCOM.nsEmbedString_Length (string); +- int /*long*/ buffer = XPCOM.nsEmbedString_get (string); ++ long /*int*/ buffer = XPCOM.nsEmbedString_get (string); + chars = new char[length]; + XPCOM.memmove (chars, buffer, length * 2); + XPCOM.nsEmbedString_delete (string); +@@ -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); + if (rc != XPCOM.NS_OK) error (rc); + if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); + + nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]); +- int /*long*/[] aCurrentURI = new int /*long*/[1]; ++ long /*int*/[] aCurrentURI = new long /*int*/[1]; + rc = webNavigation.GetCurrentURI (aCurrentURI); + if (rc != XPCOM.NS_OK) error (rc); + webNavigation.Release (); +@@ -1992,11 +1992,11 @@ + byte[] dest = null; + if (aCurrentURI[0] != 0) { + nsIURI uri = new nsIURI (aCurrentURI[0]); +- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (); + rc = uri.GetSpec (aSpec); + if (rc != XPCOM.NS_OK) error (rc); + int length = XPCOM.nsEmbedCString_Length (aSpec); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec); + dest = new byte[length]; + XPCOM.memmove (dest, buffer, length); + XPCOM.nsEmbedCString_delete (aSpec); +@@ -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); +@@ -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); +@@ -2095,7 +2095,7 @@ + listener = null; + } + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + 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); +@@ -2139,7 +2139,7 @@ + } + + void Activate () { +- 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); +@@ -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); +@@ -2167,7 +2167,7 @@ + int width = Math.max (1, rect.width); + int height = Math.max (1, rect.height); + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + 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); +@@ -2182,7 +2182,7 @@ + public void refresh () { + 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); +@@ -2244,7 +2244,7 @@ + */ + delegate.removeWindowSubclass (); + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + 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) { + 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); +@@ -2368,7 +2368,7 @@ + public void stop () { + 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); +@@ -2427,7 +2427,7 @@ + } + + void unhookDOMListeners () { +- 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_ERROR_NO_INTERFACE); +@@ -2518,73 +2518,73 @@ + + /* nsISupports */ + +-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 (nsIWeakReference.NS_IWEAKREFERENCE_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIWebBrowserChromeFocus.NS_IWEBBROWSERCHROMEFOCUS_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChromeFocus.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {interfaceRequestor.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsISupportsWeakReference.NS_ISUPPORTSWEAKREFERENCE_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {supportsWeakReference.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIContextMenuListener.NS_ICONTEXTMENULISTENER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {contextMenuListener.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIURIContentListener.NS_IURICONTENTLISTENER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {uriContentListener.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsITooltipListener.NS_ITOOLTIPLISTENER_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {tooltipListener.getAddress ()}, C.PTR_SIZEOF); + 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; + } + +@@ -2601,18 +2601,18 @@ + + /* nsIWeakReference */ + +-int QueryReferent (int /*long*/ riid, int /*long*/ ppvObject) { ++int QueryReferent (long /*int*/ riid, long /*int*/ ppvObject) { + return QueryInterface (riid, ppvObject); + } + + /* nsIInterfaceRequestor */ + +-int GetInterface (int /*long*/ riid, int /*long*/ ppvObject) { ++int GetInterface (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 (nsIDOMWindow.NS_IDOMWINDOW_IID)) { +- int /*long*/[] aContentDOMWindow = new int /*long*/[1]; ++ long /*int*/[] aContentDOMWindow = new long /*int*/[1]; + int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow); + if (rc != XPCOM.NS_OK) error (rc); + if (aContentDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); +@@ -2622,18 +2622,18 @@ + return QueryInterface (riid, ppvObject); + } + +-int GetWeakReference (int /*long*/ ppvObject) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF); ++int GetWeakReference (long /*int*/ ppvObject) { ++ XPCOM.memmove (ppvObject, new long /*int*/[] {weakReference.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + + /* nsIWebProgressListener */ + +-int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateFlags, int aStatus) { ++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) { +- 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. + */ +- 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); +@@ -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. + */ +- 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); +@@ -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 (progressListeners.length == 0) return XPCOM.NS_OK; + ProgressEvent event = new ProgressEvent (browser); + event.display = browser.getDisplay (); +@@ -2924,7 +2924,7 @@ + return XPCOM.NS_OK; + } + +-int OnLocationChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int /*long*/ aLocation) { ++int OnLocationChange (long /*int*/ aWebProgress, long /*int*/ aRequest, long /*int*/ aLocation) { + /* + * 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 +@@ -2939,13 +2939,13 @@ + if (locationListeners.length == 0) return XPCOM.NS_OK; + + nsIWebProgress webProgress = new nsIWebProgress (aWebProgress); +- int /*long*/[] aDOMWindow = new int /*long*/[1]; ++ long /*int*/[] aDOMWindow = new long /*int*/[1]; + int rc = webProgress.GetDOMWindow (aDOMWindow); + if (rc != XPCOM.NS_OK) error (rc); + if (aDOMWindow[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); + + nsIDOMWindow domWindow = new nsIDOMWindow (aDOMWindow[0]); +- int /*long*/[] aTop = new int /*long*/[1]; ++ long /*int*/[] aTop = new long /*int*/[1]; + rc = domWindow.GetTop (aTop); + if (rc != XPCOM.NS_OK) error (rc); + if (aTop[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); +@@ -2955,10 +2955,10 @@ + topWindow.Release (); + + nsIURI location = new nsIURI (aLocation); +- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (); + location.GetSpec (aSpec); + int length = XPCOM.nsEmbedCString_Length (aSpec); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec); + byte[] dest = new byte[length]; + XPCOM.memmove (dest, buffer, length); + XPCOM.nsEmbedCString_delete (aSpec); +@@ -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 (statusTextListeners.length == 0) return XPCOM.NS_OK; + StatusTextEvent event = new StatusTextEvent (browser); + event.display = browser.getDisplay (); +@@ -3003,13 +3003,13 @@ + return XPCOM.NS_OK; + } + +-int OnSecurityChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int state) { ++int OnSecurityChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int state) { + return XPCOM.NS_OK; + } + + /* nsIWebBrowserChrome */ + +-int SetStatus (int statusType, int /*long*/ status) { ++int SetStatus (int statusType, long /*int*/ status) { + if (statusTextListeners.length == 0) return XPCOM.NS_OK; + StatusTextEvent event = new StatusTextEvent (browser); + event.display = browser.getDisplay (); +@@ -3025,8 +3025,8 @@ + return XPCOM.NS_OK; + } + +-int GetWebBrowser (int /*long*/ aWebBrowser) { +- int /*long*/[] ret = new int /*long*/[1]; ++int GetWebBrowser (long /*int*/ aWebBrowser) { ++ long /*int*/[] ret = new long /*int*/[1]; + if (webBrowser != null) { + webBrowser.AddRef (); + ret[0] = webBrowser.getAddress (); +@@ -3035,13 +3035,13 @@ + return XPCOM.NS_OK; + } + +-int SetWebBrowser (int /*long*/ aWebBrowser) { ++int SetWebBrowser (long /*int*/ aWebBrowser) { + if (webBrowser != null) webBrowser.Release (); + webBrowser = aWebBrowser != 0 ? new nsIWebBrowser (aWebBrowser) : null; + return XPCOM.NS_OK; + } + +-int GetChromeFlags (int /*long*/ aChromeFlags) { ++int GetChromeFlags (long /*int*/ aChromeFlags) { + int[] ret = new int[1]; + ret[0] = chromeFlags; + XPCOM.memmove (aChromeFlags, ret, 4); /* PRUint32 */ +@@ -3081,7 +3081,7 @@ + } + + int ShowAsModal () { +- 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); +@@ -3111,7 +3111,7 @@ + return XPCOM.NS_OK; + } + +-int IsWindowModal (int /*long*/ retval) { ++int IsWindowModal (long /*int*/ retval) { + int result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0 ? 1 : 0; + XPCOM.memmove (retval, new int[] {result}, 4); /* PRBool */ + return XPCOM.NS_OK; +@@ -3137,7 +3137,7 @@ + return XPCOM.NS_OK; + } + +-int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, int /*long*/ cy) { ++int GetDimensions (int flags, long /*int*/ x, long /*int*/ y, long /*int*/ cx, long /*int*/ cy) { + if ((flags & nsIEmbeddingSiteWindow.DIM_FLAGS_POSITION) != 0) { + Point location = browser.getShell ().getLocation (); + if (x != 0) C.memmove (x, new int[] {location.x}, 4); /* PRInt32 */ +@@ -3157,7 +3157,7 @@ + } + + int SetFocus () { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + 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); +@@ -3175,7 +3175,7 @@ + return XPCOM.NS_OK; + } + +-int GetVisibility (int /*long*/ aVisibility) { ++int GetVisibility (long /*int*/ aVisibility) { + boolean visible = browser.isVisible () && !browser.getShell ().getMinimized (); + XPCOM.memmove (aVisibility, new int[] {visible ? 1 : 0}, 4); /* PRBool */ + return XPCOM.NS_OK; +@@ -3218,11 +3218,11 @@ + return XPCOM.NS_OK; + } + +-int GetTitle (int /*long*/ aTitle) { ++int GetTitle (long /*int*/ aTitle) { + return XPCOM.NS_OK; + } + +-int SetTitle (int /*long*/ aTitle) { ++int SetTitle (long /*int*/ aTitle) { + if (titleListeners.length == 0) return XPCOM.NS_OK; + TitleEvent event = new TitleEvent (browser); + event.display = browser.getDisplay (); +@@ -3246,7 +3246,7 @@ + return XPCOM.NS_OK; + } + +-int GetSiteWindow (int /*long*/ aSiteWindow) { ++int GetSiteWindow (long /*int*/ aSiteWindow) { + /* + * Note. The handle is expected to be an HWND on Windows and + * a GtkWidget* on GTK. This callback is invoked on Windows +@@ -3254,7 +3254,7 @@ + * dialog comes up. If no handle is returned, the print dialog + * does not come up on this platform. + */ +- XPCOM.memmove (aSiteWindow, new int /*long*/[] {embedHandle}, C.PTR_SIZEOF); ++ XPCOM.memmove (aSiteWindow, new long /*int*/[] {embedHandle}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +@@ -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) { + 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); +@@ -3326,15 +3326,15 @@ + + /* nsIURIContentListener */ + +-int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) { ++int OnStartURIOpen (long /*int*/ aURI, long /*int*/ retval) { + 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 (); + location.GetSpec (aSpec); + int length = XPCOM.nsEmbedCString_Length (aSpec); +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec); + buffer = XPCOM.nsEmbedCString_get (aSpec); + byte[] dest = new byte[length]; + XPCOM.memmove (dest, buffer, length); +@@ -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; + } + +-int DoContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aRequest, int /*long*/ aContentHandler, int /*long*/ retval) { ++int DoContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aRequest, long /*int*/ aContentHandler, long /*int*/ retval) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, int /*long*/ retval) { ++int IsPreferred (long /*int*/ aContentType, long /*int*/ aDesiredContentType, long /*int*/ retval) { + boolean preferred = false; + int size = XPCOM.strlen (aContentType); + if (size > 0) { +@@ -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 */ +- 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); +@@ -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); +- int /*long*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length); ++ long /*int*/ typePtr = XPCOM.nsEmbedCString_new (bytes, bytes.length); + nsIWebNavigationInfo info = new nsIWebNavigationInfo (result[0]); + result[0] = 0; + int[] isSupportedResult = new int[1]; /* PRUint32 */ +@@ -3459,34 +3459,34 @@ + + XPCOM.memmove(retval, new int[] {preferred ? 1 : 0}, 4); /* PRBool */ + if (preferred) { +- XPCOM.memmove (aDesiredContentType, new int /*long*/[] {0}, C.PTR_SIZEOF); ++ XPCOM.memmove (aDesiredContentType, new long /*int*/[] {0}, C.PTR_SIZEOF); + } + return XPCOM.NS_OK; + } + +-int CanHandleContent (int /*long*/ aContentType, int aIsContentPreferred, int /*long*/ aDesiredContentType, int /*long*/ retval) { ++int CanHandleContent (long /*int*/ aContentType, int aIsContentPreferred, long /*int*/ aDesiredContentType, long /*int*/ retval) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetLoadCookie (int /*long*/ aLoadCookie) { ++int GetLoadCookie (long /*int*/ aLoadCookie) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetLoadCookie (int /*long*/ aLoadCookie) { ++int SetLoadCookie (long /*int*/ aLoadCookie) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int GetParentContentListener (int /*long*/ aParentContentListener) { ++int GetParentContentListener (long /*int*/ aParentContentListener) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int SetParentContentListener (int /*long*/ aParentContentListener) { ++int SetParentContentListener (long /*int*/ aParentContentListener) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + + /* nsITooltipListener */ + +-int OnShowTooltip (int aXCoords, int aYCoords, int /*long*/ aTipText) { ++int OnShowTooltip (int aXCoords, int aYCoords, long /*int*/ aTipText) { + int length = XPCOM.strlen_PRUnichar (aTipText); + char[] dest = new char[length]; + XPCOM.memmove (dest, aTipText, length * 2); +@@ -3524,21 +3524,21 @@ + + /* nsIDOMEventListener */ + +-int HandleEvent (int /*long*/ event) { ++int HandleEvent (long /*int*/ event) { + nsIDOMEvent domEvent = new nsIDOMEvent (event); + +- int /*long*/ type = XPCOM.nsEmbedString_new (); ++ long /*int*/ type = XPCOM.nsEmbedString_new (); + int rc = domEvent.GetType (type); + if (rc != XPCOM.NS_OK) error (rc); + int length = XPCOM.nsEmbedString_Length (type); +- int /*long*/ buffer = XPCOM.nsEmbedString_get (type); ++ long /*int*/ buffer = XPCOM.nsEmbedString_get (type); + char[] chars = new char[length]; + XPCOM.memmove (chars, buffer, length * 2); + String typeString = new String (chars); + XPCOM.nsEmbedString_delete (type); + + if (XPCOM.DOMEVENT_UNLOAD.equals (typeString)) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + rc = domEvent.GetCurrentTarget (result); + if (rc != XPCOM.NS_OK) error (rc); + if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); +@@ -3555,7 +3555,7 @@ + } + + if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); + if (rc != XPCOM.NS_OK) error (rc); + if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); +@@ -3663,7 +3663,7 @@ + case SWT.SCROLL_LOCK: return XPCOM.NS_OK; + } + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); + if (rc != XPCOM.NS_OK) error (rc); + if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); +@@ -3713,7 +3713,7 @@ + } + + if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) { +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + rc = domEvent.QueryInterface (nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); + if (rc != XPCOM.NS_OK) error (rc); + if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); +@@ -3770,7 +3770,7 @@ + + /* mouse event */ + +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + rc = domEvent.QueryInterface (nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); + if (rc != XPCOM.NS_OK) error (rc); + if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); +@@ -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 */ + 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) { + PromptService2 promptService = new PromptService2 (); + promptService.AddRef (); +- XPCOM.memmove (result, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (result, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + +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 */ + 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 ();} + }; + + promptService = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7}) { +- 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 Alert (args[0], args[1], args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} +- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} +- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} +- public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} +- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} +- public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} ++ 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 Alert (args[0], args[1], args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} + }; + + promptService2 = new XPCOMObject (new int[] {2, 0, 0, 3, 5, 4, 6, 10, 7, 8, 7, 7, 7, 9}) { +- 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 Alert (args[0], args[1], args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} +- public int /*long*/ method5 (int /*long*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} +- public int /*long*/ method6 (int /*long*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} +- public int /*long*/ method7 (int /*long*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} +- public int /*long*/ method8 (int /*long*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method9 (int /*long*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} +- public int /*long*/ method10 (int /*long*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method11 (int /*long*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} +- public int /*long*/ method12 (int /*long*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);} +- public int /*long*/ method13 (int /*long*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);} ++ 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 Alert (args[0], args[1], args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return AlertCheck (args[0], args[1], args[2], args[3], args[4]);} ++ public long /*int*/ method5 (long /*int*/[] args) {return Confirm (args[0], args[1], args[2], args[3]);} ++ public long /*int*/ method6 (long /*int*/[] args) {return ConfirmCheck (args[0], args[1], args[2], args[3], args[4], args[5]);} ++ public long /*int*/ method7 (long /*int*/[] args) {return ConfirmEx (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6], args[7], args[8], args[9]);} ++ public long /*int*/ method8 (long /*int*/[] args) {return Prompt (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method9 (long /*int*/[] args) {return PromptUsernameAndPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);} ++ public long /*int*/ method10 (long /*int*/[] args) {return PromptPassword (args[0], args[1], args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method11 (long /*int*/[] args) {return Select (args[0], args[1], args[2], (int)/*64*/args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method12 (long /*int*/[] args) {return PromptAuth (args[0], args[1], (int)/*64*/args[2], args[3], args[4], args[5], args[6]);} ++ public long /*int*/ method13 (long /*int*/[] args) {return AsyncPromptAuth (args[0], args[1], args[2], args[3], (int)/*64*/args[4], args[5], args[6], args[7], args[8]);} + }; + } + +@@ -86,32 +86,32 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return promptService2.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 (nsIPromptService.NS_IPROMPTSERVICE_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {promptService.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIPromptService2.NS_IPROMPTSERVICE2_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {promptService2.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {promptService2.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; + } + +@@ -121,13 +121,13 @@ + 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); + } + +-String getLabel (int buttonFlag, int index, int /*long*/ buttonTitle) { ++String getLabel (int buttonFlag, int index, long /*int*/ buttonTitle) { + String label = null; + int flag = (buttonFlag & (0xff * index)) / index; + switch (flag) { +@@ -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) { + final Browser browser = getBrowser (aParent); + + int length = XPCOM.strlen_PRUnichar (aDialogTitle); +@@ -188,7 +188,7 @@ + return XPCOM.NS_OK; + } + +-int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState) { ++int AlertCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState) { + Browser browser = getBrowser (aParent); + + int length = XPCOM.strlen_PRUnichar (aDialogTitle); +@@ -215,11 +215,11 @@ + return XPCOM.NS_OK; + } + +-int AsyncPromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int /*long*/ aCallback, int /*long*/ aContext, int level, int /*long*/ authInfo, int /*long*/ checkboxLabel, int /*long*/ checkValue, int /*long*/ _retval) { ++int AsyncPromptAuth(long /*int*/ aParent, long /*int*/ aChannel, long /*int*/ aCallback, long /*int*/ aContext, int level, long /*int*/ authInfo, long /*int*/ checkboxLabel, long /*int*/ checkValue, long /*int*/ _retval) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval) { ++int Confirm (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ _retval) { + Browser browser = getBrowser (aParent); + + int length = XPCOM.strlen_PRUnichar (aDialogTitle); +@@ -242,11 +242,11 @@ + return XPCOM.NS_OK; + } + +-int ConfirmCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { ++int ConfirmCheck (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags, int /*long*/ aButton0Title, int /*long*/ aButton1Title, int /*long*/ aButton2Title, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { ++int ConfirmEx (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aButtonFlags, long /*int*/ aButton0Title, long /*int*/ aButton1Title, long /*int*/ aButton2Title, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) { + Browser browser = getBrowser (aParent); + + int length = XPCOM.strlen_PRUnichar (aDialogTitle); +@@ -288,7 +288,7 @@ + return XPCOM.NS_OK; + } + +-int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { ++int Prompt (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aValue, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) { + Browser browser = getBrowser (aParent); + String titleLabel = null, textLabel, checkLabel = null; + String[] valueLabel = new String[1]; +@@ -306,7 +306,7 @@ + XPCOM.memmove (dest, aText, length * 2); + textLabel = new String (dest); + +- int /*long*/[] valueAddr = new int /*long*/[1]; ++ long /*int*/[] valueAddr = new long /*int*/[1]; + XPCOM.memmove (valueAddr, aValue, C.PTR_SIZEOF); + if (valueAddr[0] != 0) { + length = XPCOM.strlen_PRUnichar (valueAddr[0]); +@@ -337,7 +337,7 @@ + * value that we override must be freed using the nsIMemory service. + */ + if (valueLabel[0] != null) { +- 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) { + 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); +@@ -425,11 +425,11 @@ + + /* get initial username and password values */ + +- int /*long*/ ptr = XPCOM.nsEmbedString_new (); ++ long /*int*/ ptr = XPCOM.nsEmbedString_new (); + int rc = auth.GetUsername (ptr); + if (rc != XPCOM.NS_OK) SWT.error (rc); + int length = XPCOM.nsEmbedString_Length (ptr); +- int /*long*/ buffer = XPCOM.nsEmbedString_get (ptr); ++ long /*int*/ buffer = XPCOM.nsEmbedString_get (ptr); + char[] chars = new char[length]; + XPCOM.memmove (chars, buffer, length * 2); + userLabel[0] = new String (chars); +@@ -458,13 +458,13 @@ + XPCOM.nsEmbedString_delete (ptr); + + nsIChannel channel = new nsIChannel (aChannel); +- int /*long*/[] uri = new int /*long*/[1]; ++ long /*int*/[] uri = new long /*int*/[1]; + rc = channel.GetURI (uri); + if (rc != XPCOM.NS_OK) SWT.error (rc); + if (uri[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE); + + nsIURI nsURI = new nsIURI (uri[0]); +- 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 (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 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 /*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; + } + +-int PromptPassword (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aPassword, int /*long*/ aCheckMsg, int /*long*/ aCheckState, int /*long*/ _retval) { ++int PromptPassword (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, long /*int*/ aPassword, long /*int*/ aCheckMsg, long /*int*/ aCheckState, long /*int*/ _retval) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +-int Select (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText, int aCount, int /*long*/ aSelectList, int /*long*/ aOutSelection, int /*long*/ _retval) { ++int Select (long /*int*/ aParent, long /*int*/ aDialogTitle, long /*int*/ aText, int aCount, long /*int*/ aSelectList, long /*int*/ aOutSelection, long /*int*/ _retval) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + +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 */ + 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 ();} + }; + + simpleEnumerator = new XPCOMObject (new int[] {2, 0, 0, 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 HasMoreElements (args[0]);} +- public int /*long*/ method4 (int /*long*/[] args) {return GetNext (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 HasMoreElements (args[0]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return GetNext (args[0]);} + }; + } + +@@ -67,27 +67,27 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return simpleEnumerator.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 (nsISimpleEnumerator.NS_ISIMPLEENUMERATOR_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {simpleEnumerator.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {simpleEnumerator.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; + } + +@@ -97,17 +97,17 @@ + return refCount; + } + +-int HasMoreElements (int /*long*/ _retval) { ++int HasMoreElements (long /*int*/ _retval) { + boolean more = values != null && index < values.length; + XPCOM.memmove (_retval, new int[] {more ? 1 : 0}, 4); /*PRBool */ + return XPCOM.NS_OK; + } + +-int GetNext (int /*long*/ _retval) { ++int GetNext (long /*int*/ _retval) { + if (values == null || index == values.length) return XPCOM.NS_ERROR_UNEXPECTED; + nsISupports value = values[index++]; + value.AddRef (); +- XPCOM.memmove (_retval, new int /*long*/[] {value.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (_retval, new long /*int*/[] {value.getAddress ()}, C.PTR_SIZEOF); + return XPCOM.NS_OK; + } + } +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 */ + 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 ();} + }; + + windowCreator = 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 CreateChromeWindow (args[0], (int)/*64*/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 CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);} + }; + + windowCreator2 = new XPCOMObject (new int[] {2, 0, 0, 3, 6}) { +- 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 CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);} +- public int /*long*/ method4 (int /*long*/[] args) {return CreateChromeWindow2 (args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4], args[5]);} ++ 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 CreateChromeWindow (args[0], (int)/*64*/args[1], args[2]);} ++ public long /*int*/ method4 (long /*int*/[] args) {return CreateChromeWindow2 (args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3], args[4], args[5]);} + }; + } + +@@ -72,32 +72,32 @@ + } + } + +-int /*long*/ getAddress () { ++long /*int*/ getAddress () { + return windowCreator.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 (nsIWindowCreator.NS_IWINDOWCREATOR_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } + if (guid.Equals (nsIWindowCreator2.NS_IWINDOWCREATOR2_IID)) { +- XPCOM.memmove (ppvObject, new int /*long*/[] {windowCreator2.getAddress ()}, C.PTR_SIZEOF); ++ XPCOM.memmove (ppvObject, new long /*int*/[] {windowCreator2.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; + } + +@@ -109,26 +109,26 @@ + + /* nsIWindowCreator */ + +-int CreateChromeWindow (int /*long*/ parent, int chromeFlags, int /*long*/ _retval) { ++int CreateChromeWindow (long /*int*/ parent, int chromeFlags, long /*int*/ _retval) { + return CreateChromeWindow2 (parent, chromeFlags, 0, 0, 0, _retval); + } + + /* nsIWindowCreator2 */ + +-int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags, int /*long*/ uri, int /*long*/ cancel, int /*long*/ _retval) { ++int CreateChromeWindow2 (long /*int*/ parent, int chromeFlags, int contextFlags, long /*int*/ uri, long /*int*/ cancel, long /*int*/ _retval) { + if (parent == 0 && (chromeFlags & nsIWebBrowserChrome.CHROME_OPENAS_CHROME) == 0) { + return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + } + Browser src = null; + if (parent != 0) { + nsIWebBrowserChrome browserChromeParent = new nsIWebBrowserChrome (parent); +- int /*long*/[] aWebBrowser = new int /*long*/[1]; ++ long /*int*/[] aWebBrowser = new long /*int*/[1]; + int rc = browserChromeParent.GetWebBrowser (aWebBrowser); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + if (aWebBrowser[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); + + nsIWebBrowser webBrowser = new nsIWebBrowser (aWebBrowser[0]); +- int /*long*/[] result = new int /*long*/[1]; ++ long /*int*/[] result = new long /*int*/[1]; + rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); +@@ -136,7 +136,7 @@ + + nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]); + result[0] = 0; +- int /*long*/[] aParentNativeWindow = new int /*long*/[1]; ++ long /*int*/[] aParentNativeWindow = new long /*int*/[1]; + rc = baseWindow.GetParentNativeWindow (aParentNativeWindow); + if (rc != XPCOM.NS_OK) Mozilla.error (rc); + if (aParentNativeWindow[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); +@@ -178,11 +178,11 @@ + }); + if (uri != 0) { + nsIURI location = new nsIURI (uri); +- int /*long*/ aSpec = XPCOM.nsEmbedCString_new (); ++ long /*int*/ aSpec = XPCOM.nsEmbedCString_new (); + if (location.GetSpec (aSpec) == XPCOM.NS_OK) { + int length = XPCOM.nsEmbedCString_Length (aSpec); + if (length > 0) { +- int /*long*/ buffer = XPCOM.nsEmbedCString_get (aSpec); ++ long /*int*/ buffer = XPCOM.nsEmbedCString_get (aSpec); + byte[] dest = new byte[length]; + XPCOM.memmove (dest, buffer, length); + browser.setUrl (new String (dest)); +@@ -211,11 +211,11 @@ + if (doit) { + Mozilla mozilla = (Mozilla)browser.webBrowser; + mozilla.isChild = true; +- int /*long*/ chromePtr = mozilla.webBrowserChrome.getAddress (); ++ long /*int*/ chromePtr = mozilla.webBrowserChrome.getAddress (); + nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (chromePtr); + webBrowserChrome.SetChromeFlags (chromeFlags); + webBrowserChrome.AddRef (); +- XPCOM.memmove (_retval, new int /*long*/[] {chromePtr}, C.PTR_SIZEOF); ++ XPCOM.memmove (_retval, new long /*int*/[] {chromePtr}, C.PTR_SIZEOF); + } else { + if (cancel != 0) { + C.memmove (cancel, new int[] {1}, 4); /* PRBool */ +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; + if (buffer.length == 0) return; +- int /*long*/ pValue = OS.g_malloc(buffer.length); ++ long /*int*/ pValue = OS.g_malloc(buffer.length); + if (pValue == 0) return; + OS.memmove(pValue, buffer, buffer.length); + transferData.length = buffer.length; +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; + +- static int /*long*/ GTKCLIPBOARD; +- static int /*long*/ GTKPRIMARYCLIPBOARD; +- private static int /*long*/ TARGET; ++ static long /*int*/ GTKCLIPBOARD; ++ static long /*int*/ GTKPRIMARYCLIPBOARD; ++ private static long /*int*/ TARGET; + + static { + GTKCLIPBOARD = OS.gtk_clipboard_get(OS.GDK_NONE); + byte[] buffer = Converter.wcsToMbcs(null, "PRIMARY", true); +- int /*long*/ primary = OS.gdk_atom_intern(buffer, false); ++ long /*int*/ primary = OS.gdk_atom_intern(buffer, false); + GTKPRIMARYCLIPBOARD = OS.gtk_clipboard_get(primary); + buffer = Converter.wcsToMbcs(null, "TARGETS", true); + TARGET = OS.gdk_atom_intern(buffer, false); +@@ -287,7 +287,7 @@ + public Object getContents(Transfer transfer, int clipboards) { + checkWidget(); + if (transfer == null) DND.error(SWT.ERROR_NULL_ARGUMENT); +- int /*long*/ selection_data = 0; ++ long /*int*/ selection_data = 0; + int[] typeIds = transfer.getTypeIds(); + for (int i = 0; i < typeIds.length; i++) { + if ((clipboards & DND.CLIPBOARD) != 0) { +@@ -549,7 +549,7 @@ + String[] result = new String[types1.length + types2.length]; + int count = 0; + for (int i = 0; i < types1.length; i++) { +- int /*long*/ pName = OS.gdk_atom_name(types1[i]); ++ long /*int*/ pName = OS.gdk_atom_name(types1[i]); + if (pName == 0) { + continue; + } +@@ -559,7 +559,7 @@ + result[count++] = "GTKCLIPBOARD "+new String (Converter.mbcsToWcs (null, buffer)); + } + for (int i = 0; i < types2.length; i++) { +- int /*long*/ pName = OS.gdk_atom_name(types2[i]); ++ long /*int*/ pName = OS.gdk_atom_name(types2[i]); + if (pName == 0) { + continue; + } +@@ -578,7 +578,7 @@ + + private int[] getAvailablePrimaryTypes() { + int[] types = new int[0]; +- int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET); ++ long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKPRIMARYCLIPBOARD, TARGET); + if (selection_data != 0) { + try { + GtkSelectionData gtkSelectionData = new GtkSelectionData(); +@@ -595,7 +595,7 @@ + } + private int[] getAvailableClipboardTypes () { + int[] types = new int[0]; +- int /*long*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET); ++ long /*int*/ selection_data = gtk_clipboard_wait_for_contents(GTKCLIPBOARD, TARGET); + if (selection_data != 0) { + try { + GtkSelectionData gtkSelectionData = new GtkSelectionData(); +@@ -611,11 +611,11 @@ + return types; + } + +-int /*long*/ gtk_clipboard_wait_for_contents(int /*long*/ clipboard, int /*long*/ target) { ++long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) { + String key = "org.eclipse.swt.internal.gtk.dispatchEvent"; + Display display = this.display; + display.setData(key, new int[]{OS.GDK_PROPERTY_NOTIFY, OS.GDK_SELECTION_CLEAR, OS.GDK_SELECTION_REQUEST, OS.GDK_SELECTION_NOTIFY}); +- int /*long*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target); ++ long /*int*/ selection_data = OS.gtk_clipboard_wait_for_contents(clipboard, target); + display.setData(key, null); + return selection_data; + } +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 @@ + } + } + +-int /*long*/ clearFunc(int /*long*/ clipboard,int /*long*/ user_data_or_owner){ ++long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){ + if (clipboard == Clipboard.GTKCLIPBOARD) { + activeClipboard = null; + clipboardData = null; +@@ -104,7 +104,7 @@ + * This function provides the data to the clipboard on request. + * When this clipboard is disposed, the data will no longer be available. + */ +-int /*long*/ getFunc(int /*long*/ clipboard, int /*long*/ selection_data, int /*long*/ info, int /*long*/ user_data_or_owner){ ++long /*int*/ getFunc(long /*int*/ clipboard, long /*int*/ selection_data, long /*int*/ info, long /*int*/ user_data_or_owner){ + if (selection_data == 0) return 0; + GtkSelectionData selectionData = new GtkSelectionData(); + OS.memmove(selectionData, selection_data, GtkSelectionData.sizeof); +@@ -131,7 +131,7 @@ + + boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipboards) { + GtkTargetEntry[] entries = new GtkTargetEntry [0]; +- int /*long*/ pTargetsList = 0; ++ long /*int*/ pTargetsList = 0; + try { + for (int i = 0; i < dataTypes.length; i++) { + Transfer transfer = dataTypes[i]; +@@ -141,7 +141,7 @@ + GtkTargetEntry entry = new GtkTargetEntry(); + entry.info = typeIds[j]; + byte[] buffer = Converter.wcsToMbcs(null, typeNames[j], true); +- int /*long*/ pName = OS.g_malloc(buffer.length); ++ long /*int*/ pName = OS.g_malloc(buffer.length); + OS.memmove(pName, buffer, buffer.length); + entry.target = pName; + GtkTargetEntry[] tmp = new GtkTargetEntry [entries.length + 1]; +@@ -161,8 +161,8 @@ + if (activeClipboard != null) OS.gtk_clipboard_clear(Clipboard.GTKCLIPBOARD); + clipboardData = data; + clipboardDataTypes = dataTypes; +- int /*long*/ getFuncProc = getFunc.getAddress(); +- int /*long*/ clearFuncProc = clearFunc.getAddress(); ++ long /*int*/ getFuncProc = getFunc.getAddress(); ++ long /*int*/ clearFuncProc = clearFunc.getAddress(); + if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) { + return false; + } +@@ -172,8 +172,8 @@ + if (activePrimaryClipboard != null) OS.gtk_clipboard_clear(Clipboard.GTKPRIMARYCLIPBOARD); + primaryClipboardData = data; + primaryClipboardDataTypes = dataTypes; +- int /*long*/ getFuncProc = getFunc.getAddress(); +- int /*long*/ clearFuncProc = clearFunc.getAddress(); ++ long /*int*/ getFuncProc = getFunc.getAddress(); ++ long /*int*/ clearFuncProc = clearFunc.getAddress(); + if (!OS.gtk_clipboard_set_with_data(Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, 0)) { + return false; + } +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; + +- int /*long*/ targetList; ++ long /*int*/ targetList; + + //workaround - remember action performed for DragEnd + boolean moveData = false; +@@ -207,28 +207,28 @@ + return style; + } + +-static int /*long*/ DragDataDelete(int /*long*/ widget, int /*long*/ context){ ++static long /*int*/ DragDataDelete(long /*int*/ widget, long /*int*/ context){ + DragSource source = FindDragSource(widget); + if (source == null) return 0; + source.dragDataDelete(widget, context); + return 0; + } + +-static int /*long*/ DragEnd(int /*long*/ widget, int /*long*/ context){ ++static long /*int*/ DragEnd(long /*int*/ widget, long /*int*/ context){ + DragSource source = FindDragSource(widget); + if (source == null) return 0; + source.dragEnd(widget, context); + return 0; + } + +-static int /*long*/ DragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int /*long*/ info, int /*long*/ time){ ++static long /*int*/ DragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, long /*int*/ info, long /*int*/ time){ + DragSource source = FindDragSource(widget); + if (source == null) return 0; + source.dragGetData(widget, context, selection_data, (int)/*64*/info, (int)/*64*/time); + return 0; + } + +-static DragSource FindDragSource(int /*long*/ handle) { ++static DragSource FindDragSource(long /*int*/ handle) { + Display display = Display.findDisplay(Thread.currentThread()); + if (display == null || display.isDisposed()) return null; + Widget widget = display.findWidget(handle); +@@ -297,15 +297,15 @@ + + int actions = opToOsOp(getStyle()); + Image image = event.image; +- int /*long*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0); ++ long /*int*/ context = OS.gtk_drag_begin(control.handle, targetList, actions, 1, 0); + if (context != 0 && image != null) { +- int /*long*/ pixbuf = createPixbuf(image); ++ long /*int*/ pixbuf = createPixbuf(image); + OS.gtk_drag_set_icon_pixbuf(context, pixbuf, 0, 0); + OS.g_object_unref(pixbuf); + } + } + +-void dragEnd(int /*long*/ widget, int /*long*/ context){ ++void dragEnd(long /*int*/ widget, long /*int*/ context){ + /* + * Bug in GTK. If a drag is initiated using gtk_drag_begin and the + * mouse is released immediately, the mouse and keyboard remain +@@ -341,7 +341,7 @@ + moveData = false; + } + +-void dragGetData(int /*long*/ widget, int /*long*/ context, int /*long*/ selection_data, int info, int time){ ++void dragGetData(long /*int*/ widget, long /*int*/ context, long /*int*/ selection_data, int info, int time){ + if (selection_data == 0) return; + GtkSelectionData gtkSelectionData = new GtkSelectionData(); + OS.memmove(gtkSelectionData, selection_data, GtkSelectionData.sizeof); +@@ -376,7 +376,7 @@ + return; + } + +-void dragDataDelete(int /*long*/ widget, int /*long*/ context){ ++void dragDataDelete(long /*int*/ widget, long /*int*/ context){ + moveData = true; + } + +@@ -564,7 +564,7 @@ + } + } + +- int /*long*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); ++ long /*int*/ pTargets = OS.g_malloc(targets.length * GtkTargetEntry.sizeof); + for (int i = 0; i < targets.length; i++) { + OS.memmove(pTargets + i*GtkTargetEntry.sizeof, targets[i], GtkTargetEntry.sizeof); + } +@@ -575,29 +575,29 @@ + } + } + +-static int /*long*/ createPixbuf(Image image) { ++static long /*int*/ createPixbuf(Image image) { + int [] w = new int [1], h = new int [1]; + OS.gdk_drawable_get_size (image.pixmap, w, h); +- int /*long*/ colormap = OS.gdk_colormap_get_system (); +- int /*long*/ pixbuf; ++ long /*int*/ colormap = OS.gdk_colormap_get_system (); ++ long /*int*/ pixbuf; + boolean hasMask = image.mask != 0 && OS.gdk_drawable_get_depth (image.mask) == 1; + if (hasMask) { + pixbuf = OS.gdk_pixbuf_new (OS.GDK_COLORSPACE_RGB, true, 8, w [0], h [0]); + if (pixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES); + OS.gdk_pixbuf_get_from_drawable (pixbuf, image.pixmap, colormap, 0, 0, 0, 0, w [0], h [0]); +- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]); ++ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, w [0], h [0]); + if (maskPixbuf == 0) SWT.error (SWT.ERROR_NO_HANDLES); + OS.gdk_pixbuf_get_from_drawable(maskPixbuf, image.mask, 0, 0, 0, 0, 0, w [0], h [0]); + int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + byte[] line = new byte[stride]; + int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf); +- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); ++ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); + byte[] maskLine = new byte[maskStride]; + for (int y=0; y 0) + { +- int /*long*/ loader = OS.gdk_pixbuf_loader_new(); ++ long /*int*/ loader = OS.gdk_pixbuf_loader_new(); + OS.gdk_pixbuf_loader_write(loader, transferData.pValue, transferData.length, null); + OS.gdk_pixbuf_loader_close(loader, null); +- int /*long*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_loader_get_pixbuf(loader); + if (pixbuf != 0) { + OS.g_object_ref(pixbuf); +- int /*long*/ [] pixmap_return = new int /*long*/ [1]; ++ long /*int*/ [] pixmap_return = new long /*int*/ [1]; + OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0); +- int /*long*/ handle = pixmap_return[0]; ++ long /*int*/ handle = pixmap_return[0]; + 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 -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; + byte [] buffer = Converter.wcsToMbcs (null, string, true); +- int /*long*/ pValue = OS.g_malloc(buffer.length); ++ long /*int*/ pValue = OS.g_malloc(buffer.length); + if (pValue == 0) return; + OS.memmove(pValue, buffer, buffer.length); + transferData.length = buffer.length - 1; +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. + */ +- int /*long*/ handle = table.handle; +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); +- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null; +- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); ++ long /*int*/ handle = table.handle; ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null; ++ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); + if (list == 0) return null; + int count = Math.min(10, OS.g_list_length (list)); + + Display display = table.getDisplay(); + if (count == 1) { +- int /*long*/ path = OS.g_list_nth_data (list, 0); +- int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); ++ long /*int*/ path = OS.g_list_nth_data (list, 0); ++ long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); + dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0); + } else { + int width = 0, height = 0; + int[] w = new int[1], h = new int[1]; + int[] yy = new int[count], hh = new int[count]; +- int /*long*/ [] pixmaps = new int /*long*/ [count]; ++ long /*int*/ [] pixmaps = new long /*int*/ [count]; + GdkRectangle rect = new GdkRectangle (); + for (int i=0; i + */ +- public int /*long*/ type; ++ public long /*int*/ type; + + /** + * Specifies the number of units in pValue. +@@ -78,7 +78,7 @@ + * platforms and should never be accessed from application code. + *

+ */ +- public int /*long*/ pValue; ++ public long /*int*/ pValue; + + /** + * The result field contains the result of converting a +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. + */ +- int /*long*/ handle = tree.handle; +- int /*long*/ selection = OS.gtk_tree_view_get_selection (handle); +- int /*long*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new int /*long*/ [1] : null; +- int /*long*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); ++ long /*int*/ handle = tree.handle; ++ long /*int*/ selection = OS.gtk_tree_view_get_selection (handle); ++ long /*int*/ [] model = OS.GTK_VERSION < OS.VERSION (2, 2, 4) ? new long /*int*/ [1] : null; ++ long /*int*/ list = OS.gtk_tree_selection_get_selected_rows (selection, model); + if (list == 0) return null; + int count = Math.min(10, OS.g_list_length (list)); + + Display display = tree.getDisplay(); + if (count == 1) { +- int /*long*/ path = OS.g_list_nth_data (list, 0); +- int /*long*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); ++ long /*int*/ path = OS.g_list_nth_data (list, 0); ++ long /*int*/ pixmap = OS.gtk_tree_view_create_row_drag_icon(handle, path); + dragSourceImage = Image.gtk_new(display, SWT.ICON, pixmap, 0); + } else { + int width = 0, height = 0; + int[] w = new int[1], h = new int[1]; + int[] yy = new int[count], hh = new int[count]; +- int /*long*/ [] pixmaps = new int /*long*/ [count]; ++ long /*int*/ [] pixmaps = new long /*int*/ [count]; + GdkRectangle rect = new GdkRectangle (); + for (int i=0; i + */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + static final byte[] APPSTARTING_SRC = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, +@@ -284,15 +284,15 @@ + hotspotY >= source.height || hotspotY < 0) { + SWT.error(SWT.ERROR_INVALID_ARGUMENT); + } +- int /*long*/ display = 0; ++ long /*int*/ display = 0; + if (OS.GTK_VERSION >= OS.VERSION(2, 4, 0) && OS.gdk_display_supports_cursor_color(display = OS.gdk_display_get_default ())) { + int width = source.width; + int height = source.height; + PaletteData palette = source.palette; +- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height); + if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); + int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); +- int /*long*/ data = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ data = OS.gdk_pixbuf_get_pixels(pixbuf); + byte[] buffer = source.data; + if (!palette.isDirect || source.depth != 24 || stride != source.bytesPerLine || palette.redMask != 0xFF000000 || palette.greenMask != 0xFF0000 || palette.blueMask != 0xFF00) { + buffer = new byte[source.width * source.height * 4]; +@@ -426,10 +426,10 @@ + init(); + } + +-int /*long*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) { +- int /*long*/ sourcePixmap = OS.gdk_bitmap_create_from_data(0, sourceData, width, height); +- int /*long*/ maskPixmap = OS.gdk_bitmap_create_from_data(0, maskData, width, height); +- int /*long*/ cursor = 0; ++long /*int*/ createCursor(byte[] sourceData, byte[] maskData, int width, int height, int hotspotX, int hotspotY, boolean reverse) { ++ long /*int*/ sourcePixmap = OS.gdk_bitmap_create_from_data(0, sourceData, width, height); ++ long /*int*/ maskPixmap = OS.gdk_bitmap_create_from_data(0, maskData, width, height); ++ long /*int*/ cursor = 0; + if (sourcePixmap != 0 && maskPixmap != 0) { + GdkColor foreground = new GdkColor(); + if (!reverse) foreground.red = foreground.green = foreground.blue = (short)0xFFFF; +@@ -479,7 +479,7 @@ + * + * @private + */ +-public static Cursor gtk_new(Device device, int /*long*/ handle) { ++public static Cursor gtk_new(Device device, long /*int*/ handle) { + Cursor cursor = new Cursor(device); + cursor.handle = handle; + return cursor; +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. + *

+ */ +- protected int /*long*/ xDisplay; +- int /*long*/ shellHandle; ++ protected long /*int*/ xDisplay; ++ long /*int*/ shellHandle; + + /* Debugging */ + public static boolean DEBUG; +@@ -53,7 +53,7 @@ + boolean disposed; + + /* Warning and Error Handlers */ +- int /*long*/ logProc; ++ long /*int*/ logProc; + Callback logCallback; + //NOT DONE - get list of valid names + String [] log_domains = {"GLib-GObject", "GLib", "GObject", "Pango", "ATK", "GdkPixbuf", "Gdk", "Gtk", "GnomeVFS"}; +@@ -62,7 +62,7 @@ + + /* X Warning and Error Handlers */ + static Callback XErrorCallback, XIOErrorCallback; +- static int /*long*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc; ++ static long /*int*/ XErrorProc, XIOErrorProc, XNullErrorProc, XNullIOErrorProc; + static Device[] Devices = new Device[4]; + + /* +@@ -77,7 +77,7 @@ + /* System Font */ + Font systemFont; + +- int /*long*/ emptyTab; ++ long /*int*/ emptyTab; + + boolean useXRender; + +@@ -160,7 +160,7 @@ + try { + /* Check if cairo is available on the system */ + byte[] buffer = Converter.wcsToMbcs(null, "libcairo.so.2", true); +- int /*long*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY); ++ long /*int*/ libcairo = OS.dlopen(buffer, OS.RTLD_LAZY); + if (libcairo != 0) { + OS.dlclose(libcairo); + } else { +@@ -259,7 +259,7 @@ + } + } + +-static synchronized Device findDevice (int /*long*/ xDisplay) { ++static synchronized Device findDevice (long /*int*/ xDisplay) { + for (int i=0; itrue if the device has been disposed, +@@ -706,7 +706,7 @@ + return OS.FcConfigAppFontAddFile (0, buffer); + } + +-int /*long*/ logProc (int /*long*/ log_domain, int /*long*/ log_level, int /*long*/ message, int /*long*/ user_data) { ++long /*int*/ logProc (long /*int*/ log_domain, long /*int*/ log_level, long /*int*/ message, long /*int*/ user_data) { + if (warningLevel == 0) { + if (DEBUG || debug) { + new Error ().printStackTrace (); +@@ -777,7 +777,7 @@ + shellHandle = 0; + + if (gdkColors != null) { +- int /*long*/ colormap = OS.gdk_colormap_get_system(); ++ long /*int*/ colormap = OS.gdk_colormap_get_system(); + for (int i = 0; i < gdkColors.length; i++) { + GdkColor color = gdkColors [i]; + if (color != null) { +@@ -870,7 +870,7 @@ + } + } + +-static int /*long*/ XErrorProc (int /*long*/ xDisplay, int /*long*/ xErrorEvent) { ++static long /*int*/ XErrorProc (long /*int*/ xDisplay, long /*int*/ xErrorEvent) { + Device device = findDevice (xDisplay); + if (device != null) { + if (device.warningLevel == 0) { +@@ -886,7 +886,7 @@ + return 0; + } + +-static int /*long*/ XIOErrorProc (int /*long*/ xDisplay) { ++static long /*int*/ XIOErrorProc (long /*int*/ xDisplay) { + Device device = findDevice (xDisplay); + if (device != null) { + if (DEBUG || device.debug) { +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 + */ + +-public int /*long*/ internal_new_GC (GCData data); ++public long /*int*/ internal_new_GC (GCData data); + + /** + * Invokes platform specific functionality to dispose a GC handle. +@@ -58,6 +58,6 @@ + * @param handle the platform specific GC handle + * @param data the platform specific GC data + */ +-public void internal_dispose_GC (int /*long*/ handle, GCData data); ++public void internal_dispose_GC (long /*int*/ handle, GCData data); + + } +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. + *

+ */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + Font(Device device) { + super(device); +@@ -178,7 +178,7 @@ + public FontData[] getFontData() { + if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); + +- int /*long*/ family = OS.pango_font_description_get_family(handle); ++ long /*int*/ family = OS.pango_font_description_get_family(handle); + int length = OS.strlen(family); + byte[] buffer = new byte[length]; + OS.memmove(buffer, family, length); +@@ -190,7 +190,7 @@ + if (pangoStyle == OS.PANGO_STYLE_ITALIC) style |= SWT.ITALIC; + if (pangoStyle == OS.PANGO_STYLE_OBLIQUE) style |= SWT.ROMAN; + if (pangoWeight >= OS.PANGO_WEIGHT_BOLD) style |= SWT.BOLD; +- int /*long*/ fontString = OS.pango_font_description_to_string (handle); ++ long /*int*/ fontString = OS.pango_font_description_to_string (handle); + length = OS.strlen (fontString); + buffer = new byte [length + 1]; + OS.memmove (buffer, fontString, length); +@@ -215,7 +215,7 @@ + * + * @private + */ +-public static Font gtk_new(Device device, int /*long*/ handle) { ++public static Font gtk_new(Device device, long /*int*/ handle) { + Font font = new Font(device); + font.handle = handle; + return font; +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; +- public int /*long*/ clipRgn; ++ public long /*int*/ clipRgn; + public float lineWidth; + public int lineStyle = SWT.LINE_SOLID; + public float[] lineDashes; +@@ -46,12 +46,12 @@ + public int alpha = 0xFF; + public int interpolation = SWT.DEFAULT; + +- public int /*long*/ context; +- public int /*long*/ layout; +- public int /*long*/ damageRgn; ++ public long /*int*/ context; ++ public long /*int*/ layout; ++ public long /*int*/ damageRgn; + public Image image; +- public int /*long*/ drawable; +- public int /*long*/ cairo; ++ public long /*int*/ drawable; ++ public long /*int*/ cairo; + public double cairoXoffset, cairoYoffset; + public boolean disposeCairo; + public double[] clippingTransform; +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. + *

+ */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + Drawable drawable; + GCData data; +@@ -154,7 +154,7 @@ + if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + GCData data = new GCData(); + data.style = checkStyle(style); +- int /*long*/ gdkGC = drawable.internal_new_GC(data); ++ long /*int*/ gdkGC = drawable.internal_new_GC(data); + Device device = data.device; + if (device == null) device = Device.getDevice(); + if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); +@@ -163,10 +163,10 @@ + init(); + } + +-static void addCairoString(int /*long*/ cairo, String string, float x, float y, Font font) { ++static void addCairoString(long /*int*/ cairo, String string, float x, float y, Font font) { + byte[] buffer = Converter.wcsToMbcs(null, string, true); + if (OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) { +- int /*long*/ layout = OS.pango_cairo_create_layout(cairo); ++ long /*int*/ layout = OS.pango_cairo_create_layout(cairo); + if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES); + OS.pango_layout_set_text(layout, buffer, -1); + OS.pango_layout_set_font_description(layout, font.handle); +@@ -192,7 +192,7 @@ + return style & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT); + } + +-public static GC gtk_new(int /*long*/ handle, GCData data) { ++public static GC gtk_new(long /*int*/ handle, GCData data) { + GC gc = new GC(); + gc.device = data.device; + gc.init(null, data, handle); +@@ -201,7 +201,7 @@ + + public static GC gtk_new(Drawable drawable, GCData data) { + GC gc = new GC(); +- int /*long*/ gdkGC = drawable.internal_new_GC(data); ++ long /*int*/ gdkGC = drawable.internal_new_GC(data); + gc.device = data.device; + gc.init(drawable, data, gdkGC); + return gc; +@@ -212,7 +212,7 @@ + if ((state & mask) == mask) return; + state = (state ^ mask) & mask; + data.state |= mask; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + if ((state & (BACKGROUND | FOREGROUND)) != 0) { + GdkColor color; +@@ -228,7 +228,7 @@ + } + if (pattern != null) { + if ((data.style & SWT.MIRRORED) != 0 && pattern.surface != 0) { +- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface); ++ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(pattern.surface); + if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_pattern_set_extend(newPattern, Cairo.CAIRO_EXTEND_REPEAT); + double[] matrix = {-1, 0, 0, 1, 0, 0}; +@@ -388,10 +388,10 @@ + } + } + +-int /*long*/ convertRgn(int /*long*/ rgn, double[] matrix) { +- int /*long*/ newRgn = OS.gdk_region_new(); ++long /*int*/ convertRgn(long /*int*/ rgn, double[] matrix) { ++ long /*int*/ newRgn = OS.gdk_region_new(); + int[] nRects = new int[1]; +- int /*long*/[] rects = new int /*long*/[1]; ++ long /*int*/[] rects = new long /*int*/[1]; + OS.gdk_region_get_rectangles(rgn, rects, nRects); + GdkRectangle rect = new GdkRectangle(); + int[] pointArray = new int[8]; +@@ -418,7 +418,7 @@ + Cairo.cairo_matrix_transform_point(matrix, x, y); + pointArray[6] = (int)x[0]; + pointArray[7] = (int)Math.round(y[0]); +- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); ++ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); + OS.gdk_region_union(newRgn, polyRgn); + OS.gdk_region_destroy(polyRgn); + } +@@ -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(); +- int /*long*/ gdkGC = OS.gdk_gc_new(image.pixmap); ++ long /*int*/ gdkGC = OS.gdk_gc_new(image.pixmap); + 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); +@@ -495,7 +495,7 @@ + if (width <= 0 || height <= 0) return; + int deltaX = destX - srcX, deltaY = destY - srcY; + if (deltaX == 0 && deltaY == 0) return; +- int /*long*/ drawable = data.drawable; ++ long /*int*/ drawable = data.drawable; + 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) { +@@ -535,10 +535,10 @@ + } + + void createLayout() { +- int /*long*/ context = OS.gdk_pango_context_get(); ++ long /*int*/ context = OS.gdk_pango_context_get(); + if (context == 0) SWT.error(SWT.ERROR_NO_HANDLES); + data.context = context; +- int /*long*/ layout = OS.pango_layout_new(context); ++ long /*int*/ layout = OS.pango_layout_new(context); + if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES); + data.layout = layout; + OS.pango_context_set_language(context, OS.gtk_get_default_language()); +@@ -558,13 +558,13 @@ + + void destroy() { + if (data.disposeCairo) { +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) Cairo.cairo_destroy(cairo); + data.cairo = 0; + } + + /* Free resources */ +- int /*long*/ clipRgn = data.clipRgn; ++ long /*int*/ clipRgn = data.clipRgn; + if (clipRgn != 0) OS.gdk_region_destroy(clipRgn); + Image image = data.image; + if (image != null) { +@@ -627,7 +627,7 @@ + height = -height; + } + if (width == 0 || height == 0 || arcAngle == 0) return; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + double xOffset = data.cairoXoffset, yOffset = data.cairoYoffset; + if (width == height) { +@@ -678,8 +678,8 @@ + * are not valid in the default style. The fix is to use a style + * from a widget. + */ +- int /*long*/ style = OS.gtk_widget_get_style(data.device.shellHandle); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ style = OS.gtk_widget_get_style(data.device.shellHandle); ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + checkGC(FOREGROUND); + int[] lineWidth = new int[1]; +@@ -784,7 +784,7 @@ + SWT.error(SWT.ERROR_INVALID_ARGUMENT); + } + } +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + if (data.alpha != 0) { + srcImage.createSurface(); +@@ -806,7 +806,7 @@ + case SWT.LOW: filter = Cairo.CAIRO_FILTER_FAST; break; + case SWT.HIGH: filter = Cairo.CAIRO_FILTER_BEST; break; + } +- int /*long*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface); ++ long /*int*/ pattern = Cairo.cairo_pattern_create_for_surface(srcImage.surface); + if (pattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); + if (srcWidth != destWidth || srcHeight != destHeight) { + /* +@@ -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)) { +- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3); +- int /*long*/ cr = Cairo.cairo_create(surface); ++ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, imgWidth * 3, imgHeight * 3); ++ long /*int*/ cr = Cairo.cairo_create(surface); + Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, imgHeight); + Cairo.cairo_paint(cr); + Cairo.cairo_scale(cr, -1, -1); +@@ -849,7 +849,7 @@ + Cairo.cairo_set_source_surface(cr, srcImage.surface, imgWidth, -imgHeight * 3); + Cairo.cairo_paint(cr); + Cairo.cairo_destroy(cr); +- int /*long*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface); ++ long /*int*/ newPattern = Cairo.cairo_pattern_create_for_surface(surface); + Cairo.cairo_surface_destroy(surface); + if (newPattern == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_pattern_destroy(pattern); +@@ -889,7 +889,7 @@ + drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, 0, -1); + return; + } +- int /*long*/ pixbuf = scale(srcImage.pixmap, srcX, srcY, srcWidth, srcHeight, destWidth, destHeight); ++ long /*int*/ pixbuf = scale(srcImage.pixmap, srcX, srcY, srcWidth, srcHeight, destWidth, destHeight); + 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); +@@ -906,12 +906,12 @@ + drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, srcImage.mask, OS.PictStandardA8); + return; + } +- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight); + if (pixbuf == 0) return; +- int /*long*/ colormap = OS.gdk_colormap_get_system(); ++ long /*int*/ colormap = OS.gdk_colormap_get_system(); + OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight); + int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + byte[] line = new byte[stride]; + byte alpha = (byte)srcImage.alpha; + byte[] alphaData = srcImage.alphaData; +@@ -924,7 +924,7 @@ + OS.memmove(pixels + (y * stride), line, stride); + } + if (srcWidth != destWidth || srcHeight != destHeight) { +- int /*long*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR); ++ long /*int*/ scaledPixbuf = OS.gdk_pixbuf_scale_simple(pixbuf, destWidth, destHeight, OS.GDK_INTERP_BILINEAR); + OS.g_object_unref(pixbuf); + if (scaledPixbuf == 0) return; + pixbuf = scaledPixbuf; +@@ -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) { +- int /*long*/ drawable = data.drawable; +- int /*long*/ colorPixmap = srcImage.pixmap; ++ long /*int*/ drawable = data.drawable; ++ long /*int*/ colorPixmap = srcImage.pixmap; + /* Generate the mask if necessary. */ + if (srcImage.transparentPixel != -1) srcImage.createMask(); +- int /*long*/ maskPixmap = srcImage.mask; ++ long /*int*/ maskPixmap = srcImage.mask; + + if (device.useXRender) { + drawImageXRender(srcImage, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, simple, imgWidth, imgHeight, maskPixmap, OS.PictStandardA1); + } else { + if (srcWidth != destWidth || srcHeight != destHeight) { +- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, srcWidth, srcHeight); + if (pixbuf != 0) { +- int /*long*/ colormap = OS.gdk_colormap_get_system(); ++ long /*int*/ colormap = OS.gdk_colormap_get_system(); + OS.gdk_pixbuf_get_from_drawable(pixbuf, colorPixmap, colormap, srcX, srcY, 0, 0, srcWidth, srcHeight); +- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight); ++ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, srcWidth, srcHeight); + if (maskPixbuf != 0) { + OS.gdk_pixbuf_get_from_drawable(maskPixbuf, maskPixmap, 0, srcX, srcY, 0, 0, srcWidth, srcHeight); + int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + byte[] line = new byte[stride]; + int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf); +- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); ++ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); + byte[] maskLine = new byte[maskStride]; + for (int y=0; y naw) { + if (nh > nah) { + OS.gdk_draw_arc(drawable, handle, 0, nx, ny, naw, nah, 5760, 5760); +@@ -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; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + if (OS.GTK_VERSION < OS.VERSION(2, 8, 0)) { + //TODO - honor flags +@@ -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; + 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); +@@ -1743,7 +1743,7 @@ + height = -height; + } + if (width == 0 || height == 0 || arcAngle == 0) return; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + if (width == height) { + if (arcAngle >= 0) { +@@ -1820,9 +1820,9 @@ + fillRectangle(x, y, width, height); + return; + } +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { +- int /*long*/ pattern; ++ long /*int*/ pattern; + if (vertical) { + pattern = Cairo.cairo_pattern_create_linear (0.0, 0.0, 0.0, 1.0); + } else { +@@ -1872,7 +1872,7 @@ + y = y + height; + height = -height; + } +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + if (width == height) { + Cairo.cairo_arc_negative(cairo, x + width / 2f, y + height / 2f, width / 2f, 0, 2 * (float)Compatibility.PI); +@@ -1918,8 +1918,8 @@ + if (path.handle == 0) SWT.error(SWT.ERROR_INVALID_ARGUMENT); + initCairo(); + checkGC(FILL); +- int /*long*/ cairo = data.cairo; +- int /*long*/ copy = Cairo.cairo_copy_path(path.handle); ++ long /*int*/ cairo = data.cairo; ++ long /*int*/ copy = Cairo.cairo_copy_path(path.handle); + if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_append_path(cairo, copy); + Cairo.cairo_path_destroy(copy); +@@ -1949,7 +1949,7 @@ + if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); + if (pointArray == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + checkGC(FILL); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + drawPolyline(cairo, pointArray, true); + Cairo.cairo_fill(cairo); +@@ -1984,7 +1984,7 @@ + y = y + height; + height = -height; + } +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + Cairo.cairo_rectangle(cairo, x, y, width, height); + Cairo.cairo_fill(cairo); +@@ -2050,7 +2050,7 @@ + } + if (naw < 0) naw = 0 - naw; + if (nah < 0) nah = 0 - nah; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + if (naw == 0 || nah == 0) { + Cairo.cairo_rectangle(cairo, x, y, width, height); +@@ -2075,7 +2075,7 @@ + } + int naw2 = naw / 2; + int nah2 = nah / 2; +- int /*long*/ drawable = data.drawable; ++ long /*int*/ drawable = data.drawable; + if (nw > naw) { + if (nh > nah) { + OS.gdk_draw_arc(drawable, handle, 1, nx, ny, naw, nah, 5760, 5760); +@@ -2294,11 +2294,11 @@ + height = h[0]; + } + /* Intersect visible bounds with clipping in device space and then convert then to user space */ +- int /*long*/ cairo = data.cairo; +- int /*long*/ clipRgn = data.clipRgn; +- int /*long*/ damageRgn = data.damageRgn; ++ long /*int*/ cairo = data.cairo; ++ long /*int*/ clipRgn = data.clipRgn; ++ long /*int*/ damageRgn = data.damageRgn; + if (clipRgn != 0 || damageRgn != 0 || cairo != 0) { +- int /*long*/ rgn = OS.gdk_region_new(); ++ long /*int*/ rgn = OS.gdk_region_new(); + GdkRectangle rect = new GdkRectangle(); + rect.width = width; + rect.height = height; +@@ -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); +- int /*long*/ clipping = region.handle; ++ long /*int*/ clipping = region.handle; + OS.gdk_region_subtract(clipping, clipping); +- int /*long*/ cairo = data.cairo; +- int /*long*/ clipRgn = data.clipRgn; ++ long /*int*/ cairo = data.cairo; ++ long /*int*/ clipRgn = data.clipRgn; + if (clipRgn == 0) { + GdkRectangle rect = new GdkRectangle(); + if (data.width != -1 && data.height != -1) { +@@ -2373,7 +2373,7 @@ + } else { + /* Convert clipping to device space if needed */ + if (data.clippingTransform != null) { +- int /*long*/ rgn = convertRgn(clipRgn, data.clippingTransform); ++ long /*int*/ rgn = convertRgn(clipRgn, data.clippingTransform); + OS.gdk_region_union(clipping, rgn); + OS.gdk_region_destroy(rgn); + } else { +@@ -2388,7 +2388,7 @@ + double[] matrix = new double[6]; + Cairo.cairo_get_matrix(cairo, matrix); + Cairo.cairo_matrix_invert(matrix); +- int /*long*/ rgn = convertRgn(clipping, matrix); ++ long /*int*/ rgn = convertRgn(clipping, matrix); + OS.gdk_region_subtract(clipping, clipping); + OS.gdk_region_union(clipping, rgn); + OS.gdk_region_destroy(rgn); +@@ -2409,7 +2409,7 @@ + */ + public int getFillRule() { + if (handle == 0) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo == 0) return SWT.FILL_EVEN_ODD; + return Cairo.cairo_get_fill_rule(cairo) == Cairo.CAIRO_FILL_RULE_WINDING ? SWT.FILL_WINDING : SWT.FILL_EVEN_ODD; + } +@@ -2445,9 +2445,9 @@ + if (data.context == 0) createLayout(); + checkGC(FONT); + Font font = data.font; +- int /*long*/ context = data.context; +- int /*long*/ lang = OS.pango_context_get_language(context); +- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); ++ long /*int*/ context = data.context; ++ long /*int*/ lang = OS.pango_context_get_language(context); ++ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); + 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)); +@@ -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)) { +- int /*long*/ options = Cairo.cairo_font_options_create(); ++ long /*int*/ options = Cairo.cairo_font_options_create(); + Cairo.cairo_get_font_options(data.cairo, options); + antialias = Cairo.cairo_font_options_get_antialias(options); + Cairo.cairo_font_options_destroy(options); + } else { + if (data.context != 0) { +- int /*long*/ options = OS.pango_cairo_context_get_font_options(data.context); ++ long /*int*/ options = OS.pango_cairo_context_get_font_options(data.context); + if (options != 0) antialias = Cairo.cairo_font_options_get_antialias(options); + } + } +@@ -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); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) { + Cairo.cairo_get_matrix(cairo, transform.handle); + double[] identity = identity(); +@@ -2792,7 +2792,7 @@ + return identity; + } + +-void init(Drawable drawable, GCData data, int /*long*/ gdkGC) { ++void init(Drawable drawable, GCData data, long /*int*/ gdkGC) { + if (data.foreground != null) data.state &= ~FOREGROUND; + if (data.background != null) data.state &= ~(BACKGROUND | BACKGROUND_BG); + if (data.font != null) data.state &= ~FONT; +@@ -2812,26 +2812,26 @@ + handle = gdkGC; + if ((data.style & SWT.MIRRORED) != 0) { + initCairo(); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + Cairo.cairo_set_matrix(cairo, identity()); + } + } + + void initCairo() { + data.device.checkCairo(); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) return; +- int /*long*/ xDisplay = OS.GDK_DISPLAY(); +- int /*long*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); +- int /*long*/ xDrawable = 0; ++ long /*int*/ xDisplay = OS.GDK_DISPLAY(); ++ long /*int*/ xVisual = OS.gdk_x11_visual_get_xvisual(OS.gdk_visual_get_system()); ++ long /*int*/ xDrawable = 0; + int translateX = 0, translateY = 0; +- int /*long*/ drawable = data.drawable; ++ long /*int*/ drawable = data.drawable; + if (data.image != null) { + xDrawable = OS.GDK_PIXMAP_XID(drawable); + } else { + if (!data.realDrawable) { + int[] x = new int[1], y = new int[1]; +- int /*long*/ [] real_drawable = new int /*long*/ [1]; ++ long /*int*/ [] real_drawable = new long /*int*/ [1]; + 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]; +@@ -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]; +- int /*long*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height); ++ long /*int*/ surface = Cairo.cairo_xlib_surface_create(xDisplay, xDrawable, xVisual, width, height); + 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); +@@ -2962,7 +2962,7 @@ + } catch (SWTException e) {} + } else { + if (!data.disposeCairo) return; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (cairo != 0) Cairo.cairo_destroy(cairo); + data.cairo = 0; + data.interpolation = SWT.DEFAULT; +@@ -3042,7 +3042,7 @@ + SWT.error(SWT.ERROR_INVALID_ARGUMENT); + } + initCairo(); +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + Cairo.cairo_set_antialias(cairo, mode); + } + +@@ -3104,12 +3104,12 @@ + data.state &= ~BACKGROUND; + } + +-static void setCairoFont(int /*long*/ cairo, Font font) { ++static void setCairoFont(long /*int*/ cairo, Font font) { + setCairoFont(cairo, font.handle); + } + +-static void setCairoFont(int /*long*/ cairo, int /*long*/ font) { +- int /*long*/ family = OS.pango_font_description_get_family(font); ++static void setCairoFont(long /*int*/ cairo, long /*int*/ font) { ++ long /*int*/ family = OS.pango_font_description_get_family(font); + int length = OS.strlen(family); + byte[] buffer = new byte[length + 1]; + OS.memmove(buffer, family, length); +@@ -3126,12 +3126,12 @@ + Cairo.cairo_set_font_size(cairo, height); + } + +-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, 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(rgn, rects, nRects); + GdkRectangle rect = new GdkRectangle(); + for (int i=0; i + */ +- public int /*long*/ pixmap; ++ public long /*int*/ pixmap; + + /** + * The handle to the OS mask resource. +@@ -104,9 +104,9 @@ + * platforms and should never be accessed from application code. + *

+ */ +- public int /*long*/ mask; ++ public long /*int*/ mask; + +- int /*long*/ surface, surfaceData; ++ long /*int*/ surface, surfaceData; + + /** + * specifies the transparent pixel +@@ -239,9 +239,9 @@ + if ((srcImage.type == SWT.ICON && srcImage.mask != 0) || srcImage.transparentPixel != -1) { + /* Generate the mask if necessary. */ + if (srcImage.transparentPixel != -1) srcImage.createMask(); +- int /*long*/ mask = OS.gdk_pixmap_new(0, width, height, 1); ++ long /*int*/ mask = OS.gdk_pixmap_new(0, width, height, 1); + if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES); +- int /*long*/ gdkGC = OS.gdk_gc_new(mask); ++ long /*int*/ gdkGC = OS.gdk_gc_new(mask); + if (gdkGC == 0) SWT.error(SWT.ERROR_NO_HANDLES); + OS.gdk_draw_drawable(mask, gdkGC, srcImage.mask, 0, 0, 0, 0, width, height); + OS.g_object_unref(gdkGC); +@@ -260,9 +260,9 @@ + createAlphaMask(width, height); + + /* Create the new pixmap */ +- 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 (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); + this.pixmap = pixmap; + +@@ -272,12 +272,12 @@ + } else { + + /* Retrieve the source pixmap data */ +- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); + if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); +- int /*long*/ colormap = OS.gdk_colormap_get_system(); ++ long /*int*/ colormap = OS.gdk_colormap_get_system(); + OS.gdk_pixbuf_get_from_drawable(pixbuf, srcImage.pixmap, colormap, 0, 0, 0, 0, width, height); + int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + + /* Apply transformation */ + switch (flag) { +@@ -539,7 +539,7 @@ + char [] chars = new char [length]; + filename.getChars (0, length, chars, 0); + byte [] buffer = Converter.wcsToMbcs(null, chars, true); +- int /*long*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_new_from_file(buffer, null); + if (pixbuf != 0) { + boolean hasAlpha = OS.gdk_pixbuf_get_has_alpha(pixbuf); + if (hasAlpha) { +@@ -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); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + byte[] line = new byte[stride]; + alphaData = new byte[width * height]; + for (int y = 0; y < height; y++) { +@@ -566,7 +566,7 @@ + } + createAlphaMask(width, height); + } +- int /*long*/ [] pixmap_return = new int /*long*/ [1]; ++ long /*int*/ [] pixmap_return = new long /*int*/ [1]; + OS.gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, null, 0); + this.type = SWT.BITMAP; + this.pixmap = pixmap_return[0]; +@@ -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); +- int /*long*/ gc = OS.gdk_gc_new(mask); ++ long /*int*/ gc = OS.gdk_gc_new(mask); + if (alpha != -1) { + GdkColor color = new GdkColor(); + color.pixel = (alpha & 0xFF) << 8 | (alpha & 0xFF); + OS.gdk_gc_set_foreground(gc, color); + OS.gdk_draw_rectangle(mask, gc, 1, 0, 0, 1, 1); + } else { +- int /*long*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height); ++ long /*int*/ imagePtr = OS.gdk_drawable_get_image(mask, 0, 0, width, height); + if (imagePtr == 0) SWT.error(SWT.ERROR_NO_HANDLES); + GdkImage gdkImage = new GdkImage(); + OS.memmove(gdkImage, imagePtr); +@@ -616,7 +616,7 @@ + if (mask == 0) SWT.error(SWT.ERROR_NO_HANDLES); + } + +-int /*long*/ createMask(ImageData image, boolean copy) { ++long /*int*/ createMask(ImageData image, boolean copy) { + ImageData mask = image.getTransparencyMask(); + byte[] data = mask.data; + byte[] maskData = copy ? new byte[data.length] : data; +@@ -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) { +- int /*long*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height); ++ long /*int*/ pixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, true, 8, width, height); + if (pixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); +- int /*long*/ colormap = OS.gdk_colormap_get_system(); ++ long /*int*/ colormap = OS.gdk_colormap_get_system(); + OS.gdk_pixbuf_get_from_drawable(pixbuf, pixmap, colormap, 0, 0, 0, 0, width, height); + int stride = OS.gdk_pixbuf_get_rowstride(pixbuf); +- int /*long*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); ++ long /*int*/ pixels = OS.gdk_pixbuf_get_pixels(pixbuf); + byte[] line = new byte[stride]; + if (mask != 0 && OS.gdk_drawable_get_depth(mask) == 1) { +- int /*long*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); ++ long /*int*/ maskPixbuf = OS.gdk_pixbuf_new(OS.GDK_COLORSPACE_RGB, false, 8, width, height); + if (maskPixbuf == 0) SWT.error(SWT.ERROR_NO_HANDLES); + OS.gdk_pixbuf_get_from_drawable(maskPixbuf, mask, 0, 0, 0, 0, 0, width, height); + int maskStride = OS.gdk_pixbuf_get_rowstride(maskPixbuf); +- int /*long*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); ++ long /*int*/ maskPixels = OS.gdk_pixbuf_get_pixels(maskPixbuf); + byte[] maskLine = new byte[maskStride]; +- int /*long*/ offset = pixels, maskOffset = maskPixels; ++ long /*int*/ offset = pixels, maskOffset = maskPixels; + for (int y=0; y + */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + boolean moved, closed = true; + +@@ -76,7 +76,7 @@ + public Path (Device device) { + super(device); + this.device.checkCairo(); +- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); ++ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); + if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); + handle = Cairo.cairo_create(surface); + Cairo.cairo_surface_destroy(surface); +@@ -119,12 +119,12 @@ + super(device); + if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); +- int /*long*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); ++ long /*int*/ surface = Cairo.cairo_image_surface_create(Cairo.CAIRO_FORMAT_ARGB32, 1, 1); + if (surface == 0) SWT.error(SWT.ERROR_NO_HANDLES); + handle = Cairo.cairo_create(surface); + Cairo.cairo_surface_destroy(surface); + if (handle == 0) SWT.error(SWT.ERROR_NO_HANDLES); +- int /*long*/ copy; ++ long /*int*/ copy; + flatness = Math.max(0, flatness); + if (flatness == 0) { + copy = Cairo.cairo_copy_path(path.handle); +@@ -249,7 +249,7 @@ + if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT); + moved = false; +- int /*long*/ copy = Cairo.cairo_copy_path(path.handle); ++ long /*int*/ copy = Cairo.cairo_copy_path(path.handle); + if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_append_path(handle, copy); + Cairo.cairo_path_destroy(copy); +@@ -348,8 +348,8 @@ + gc.initCairo(); + gc.checkGC(GC.LINE_CAP | GC.LINE_JOIN | GC.LINE_STYLE | GC.LINE_WIDTH); + boolean result = false; +- int /*long*/ cairo = gc.data.cairo; +- int /*long*/ copy = Cairo.cairo_copy_path(handle); ++ long /*int*/ cairo = gc.data.cairo; ++ long /*int*/ copy = Cairo.cairo_copy_path(handle); + if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); + Cairo.cairo_append_path(cairo, copy); + Cairo.cairo_path_destroy(copy); +@@ -407,7 +407,7 @@ + if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); + if (bounds == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); + if (bounds.length < 4) SWT.error(SWT.ERROR_INVALID_ARGUMENT); +- int /*long*/ copy = Cairo.cairo_copy_path(handle); ++ long /*int*/ copy = Cairo.cairo_copy_path(handle); + if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); + cairo_path_t path = new cairo_path_t(); + Cairo.memmove(path, copy, cairo_path_t.sizeof); +@@ -419,7 +419,7 @@ + double[] points = new double[6]; + cairo_path_data_t data = new cairo_path_data_t(); + while (i < path.num_data) { +- int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof; ++ long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof; + Cairo.memmove(data, offset, cairo_path_data_t.sizeof); + switch (data.type) { + case Cairo.CAIRO_PATH_MOVE_TO: +@@ -500,7 +500,7 @@ + */ + public PathData getPathData() { + if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED); +- int /*long*/ copy = Cairo.cairo_copy_path(handle); ++ long /*int*/ copy = Cairo.cairo_copy_path(handle); + if (copy == 0) SWT.error(SWT.ERROR_NO_HANDLES); + cairo_path_t path = new cairo_path_t(); + Cairo.memmove(path, copy, cairo_path_t.sizeof); +@@ -512,7 +512,7 @@ + double[] points = new double[6]; + cairo_path_data_t data = new cairo_path_data_t(); + while (i < path.num_data) { +- int /*long*/ offset = path.data + i * cairo_path_data_t.sizeof; ++ long /*int*/ offset = path.data + i * cairo_path_data_t.sizeof; + Cairo.memmove(data, offset, cairo_path_data_t.sizeof); + switch (data.type) { + case Cairo.CAIRO_PATH_MOVE_TO: +diff -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. + *

+ */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + +- int /*long*/ surface; ++ long /*int*/ surface; + + /** + * Constructs a new Pattern given an image. Drawing with the resulting +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. + *

+ */ +- public int /*long*/ handle; ++ public long /*int*/ handle; + + /** + * Constructs a new empty region. +@@ -77,7 +77,7 @@ + init(); + } + +-Region(Device device, int /*long*/ handle) { ++Region(Device device, long /*int*/ handle) { + super(device); + this.handle = handle; + } +@@ -107,7 +107,7 @@ + * with enough points for a polygon. + */ + if (pointArray.length < 6) return; +- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); ++ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); + OS.gdk_region_union(handle, polyRgn); + OS.gdk_region_destroy(polyRgn); + } +@@ -263,7 +263,7 @@ + return new Rectangle(gdkRect.x, gdkRect.y, gdkRect.width, gdkRect.height); + } + +-public static Region gtk_new(Device device, int /*long*/ handle) { ++public static Region gtk_new(Device device, long /*int*/ handle) { + return new Region(device, handle); + } + +@@ -329,7 +329,7 @@ + gdkRect.y = y; + gdkRect.width = width; + gdkRect.height = height; +- int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect); ++ long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect); + OS.gdk_region_intersect(handle, rectRgn); + OS.gdk_region_destroy(rectRgn); + } +@@ -460,7 +460,7 @@ + * with enough points for a polygon. + */ + if (pointArray.length < 6) return; +- int /*long*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); ++ long /*int*/ polyRgn = OS.gdk_region_polygon(pointArray, pointArray.length / 2, OS.GDK_EVEN_ODD_RULE); + OS.gdk_region_subtract(handle, polyRgn); + OS.gdk_region_destroy(polyRgn); + } +@@ -513,7 +513,7 @@ + gdkRect.y = y; + gdkRect.width = width; + gdkRect.height = height; +- int /*long*/ rectRgn = OS.gdk_region_rectangle(gdkRect); ++ long /*int*/ rectRgn = OS.gdk_region_rectangle(gdkRect); + OS.gdk_region_subtract(handle, rectRgn); + OS.gdk_region_destroy(rectRgn); + } +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; + StyleItem[] styles; +- int /*long*/ layout, context, attrList; ++ long /*int*/ layout, context, attrList; + int[] invalidOffsets; + static final char LTR_MARK = '\u200E', RTL_MARK = '\u200F', ZWS = '\u200B', ZWNBS = '\uFEFF'; + +@@ -103,7 +103,7 @@ + byte[] buffer = Converter.wcsToMbcs(null, segmentsText, false); + OS.pango_layout_set_text (layout, buffer, buffer.length); + if (styles.length == 2 && styles[0].style == null && ascent == -1 && descent == -1 && segments == null) return; +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + attrList = OS.pango_attr_list_new(); + PangoAttribute attribute = new PangoAttribute(); + char[] chars = null; +@@ -117,12 +117,12 @@ + int oldPos = 0, lineIndex = 0; + PangoLayoutLine line = new PangoLayoutLine(); + while (lineIndex < lineCount) { +- int /*long*/ linePtr = OS.pango_layout_get_line(layout, lineIndex); ++ long /*int*/ linePtr = OS.pango_layout_get_line(layout, lineIndex); + OS.memmove(line, linePtr, PangoLayoutLine.sizeof); + int bytePos = line.start_index; + /* Note: The length in bytes of ZWS and ZWNBS are both equals to 3 */ + int offset = lineIndex * 6; +- int /*long*/ attr = OS.pango_attr_shape_new (rect, rect); ++ long /*int*/ attr = OS.pango_attr_shape_new (rect, rect); + OS.memmove (attribute, attr, PangoAttribute.sizeof); + attribute.start_index = bytePos + offset; + attribute.end_index = bytePos + offset + 3; +@@ -178,7 +178,7 @@ + byteEnd = Math.min(byteEnd, strlen); + Font font = style.font; + if (font != null && !font.isDisposed() && !defaultFont.equals(font)) { +- int /*long*/ attr = OS.pango_attr_font_desc_new (font.handle); ++ long /*int*/ attr = OS.pango_attr_font_desc_new (font.handle); + OS.memmove (attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + 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); ++ long /*int*/ attr = OS.pango_attr_underline_new(underlineStyle); + OS.memmove(attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + attribute.end_index = byteEnd; +@@ -225,7 +225,7 @@ + } + } + if (style.strikeout && style.strikeoutColor == null) { +- int /*long*/ attr = OS.pango_attr_strikethrough_new(true); ++ long /*int*/ attr = OS.pango_attr_strikethrough_new(true); + OS.memmove(attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + attribute.end_index = byteEnd; +@@ -235,7 +235,7 @@ + Color foreground = style.foreground; + if (foreground != null && !foreground.isDisposed()) { + GdkColor fg = foreground.handle; +- int /*long*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue); ++ long /*int*/ attr = OS.pango_attr_foreground_new(fg.red, fg.green, fg.blue); + OS.memmove (attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + attribute.end_index = byteEnd; +@@ -245,7 +245,7 @@ + Color background = style.background; + if (background != null && !background.isDisposed()) { + GdkColor bg = background.handle; +- int /*long*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue); ++ long /*int*/ attr = OS.pango_attr_background_new(bg.red, bg.green, bg.blue); + OS.memmove (attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + attribute.end_index = byteEnd; +@@ -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; +- int /*long*/ attr = OS.pango_attr_shape_new (rect, rect); ++ long /*int*/ attr = OS.pango_attr_shape_new (rect, rect); + OS.memmove (attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + attribute.end_index = byteEnd; +@@ -267,7 +267,7 @@ + } + int rise = style.rise; + if (rise != 0) { +- int /*long*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE); ++ long /*int*/ attr = OS.pango_attr_rise_new (rise * OS.PANGO_SCALE); + OS.memmove (attribute, attr, PangoAttribute.sizeof); + attribute.start_index = byteStart; + attribute.end_index = byteEnd; +@@ -392,15 +392,15 @@ + int length = text.length(); + boolean hasSelection = selectionStart <= selectionEnd && selectionStart != -1 && selectionEnd != -1; + GCData data = gc.data; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + if (flags != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) { +- int /*long*/[] attrs = new int /*long*/[1]; ++ long /*int*/[] attrs = new long /*int*/[1]; + int[] nAttrs = new int[1]; + PangoLogAttr logAttr = new PangoLogAttr(); + PangoRectangle rect = new PangoRectangle(); + int lineCount = OS.pango_layout_get_line_count(layout); +- int /*long*/ ptr = OS.pango_layout_get_text(layout); +- int /*long*/ iter = OS.pango_layout_get_iter(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ iter = OS.pango_layout_get_iter(layout); + 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); +@@ -487,7 +487,7 @@ + boolean fullSelection = selectionStart == 0 && selectionEnd == length - 1; + if (fullSelection) { + if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) { +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + if ((data.style & SWT.MIRRORED) != 0) { + Cairo.cairo_save(cairo); + Cairo.cairo_scale(cairo, -1, 1); +@@ -502,7 +502,7 @@ + drawBorder(gc, x, y, selectionForeground.handle); + } + } else { +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + 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); +@@ -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}; +- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); ++ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); + if (rgn != 0) { + OS.gdk_gc_set_clip_region(gc.handle, rgn); + OS.gdk_region_destroy(rgn); +@@ -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; +- int /*long*/ cairo = data.cairo; ++ long /*int*/ cairo = data.cairo; + Cairo.cairo_save(cairo); + if (!fullSelection) { + Cairo.cairo_move_to(cairo, x, y); +@@ -548,7 +548,7 @@ + drawBorder(gc, x, y, null); + } + int[] ranges = new int[]{start, end}; +- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); ++ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); + if (rgn != 0) { + OS.gdk_cairo_region(cairo, rgn); + Cairo.cairo_clip(cairo); +@@ -565,9 +565,9 @@ + + void drawBorder(GC gc, int x, int y, GdkColor selectionColor) { + GCData data = gc.data; +- int /*long*/ cairo = data.cairo; +- int /*long*/ gdkGC = gc.handle; +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ cairo = data.cairo; ++ long /*int*/ gdkGC = gc.handle; ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + GdkGCValues gcValues = null; + if (cairo != 0 && OS.GTK_VERSION >= OS.VERSION(2, 8, 0)) { + Cairo.cairo_save(cairo); +@@ -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}; +- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); ++ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); + if (rgn != 0) { + int[] nRects = new int[1]; +- int /*long*/[] rects = new int /*long*/[1]; ++ long /*int*/[] rects = new long /*int*/[1]; + OS.gdk_region_get_rectangles(rgn, rects, nRects); + GdkRectangle rect = new GdkRectangle(); + GdkColor color = null; +@@ -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}; +- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); ++ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); + if (rgn != 0) { + int[] nRects = new int[1]; +- int /*long*/[] rects = new int /*long*/[1]; ++ long /*int*/[] rects = new long /*int*/[1]; + OS.gdk_region_get_rectangles(rgn, rects, nRects); + GdkRectangle rect = new GdkRectangle(); + GdkColor color = null; +@@ -691,8 +691,8 @@ + Font font = style.font; + if (font == null) font = this.font; + if (font == null) font = device.systemFont; +- int /*long*/ lang = OS.pango_context_get_language(context); +- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); ++ long /*int*/ lang = OS.pango_context_get_language(context); ++ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); + 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); +@@ -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}; +- int /*long*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); ++ long /*int*/ rgn = OS.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2); + if (rgn != 0) { + int[] nRects = new int[1]; +- int /*long*/[] rects = new int /*long*/[1]; ++ long /*int*/[] rects = new long /*int*/[1]; + OS.gdk_region_get_rectangles(rgn, rects, nRects); + GdkRectangle rect = new GdkRectangle(); + GdkColor color = null; +@@ -790,8 +790,8 @@ + Font font = style.font; + if (font == null) font = this.font; + if (font == null) font = device.systemFont; +- int /*long*/ lang = OS.pango_context_get_language(context); +- int /*long*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); ++ long /*int*/ lang = OS.pango_context_get_language(context); ++ long /*int*/ metrics = OS.pango_context_get_metrics(context, font.handle, lang); + 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); +@@ -930,14 +930,14 @@ + end = Math.min(Math.max(0, end), length - 1); + start = translateOffset(start); + end = translateOffset(end); +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + 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 strlen = OS.strlen(ptr); + byteStart = Math.min(byteStart, strlen); + byteEnd = Math.min(byteEnd, strlen); + int[] ranges = new int[]{byteStart, byteEnd}; +- int /*long*/ clipRegion = OS.gdk_pango_layout_get_clip_region(layout, 0, 0, ranges, 1); ++ long /*int*/ clipRegion = OS.gdk_pango_layout_get_clip_region(layout, 0, 0, ranges, 1); + if (clipRegion == 0) return new Rectangle(0, 0, 0, 0); + GdkRectangle rect = new GdkRectangle(); + +@@ -947,9 +947,9 @@ + * is to subtract these areas from the clip region. + */ + PangoRectangle pangoRect = new PangoRectangle(); +- int /*long*/ iter = OS.pango_layout_get_iter(layout); ++ long /*int*/ iter = OS.pango_layout_get_iter(layout); + if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES); +- int /*long*/ linesRegion = OS.gdk_region_new(); ++ long /*int*/ linesRegion = OS.gdk_region_new(); + if (linesRegion == 0) SWT.error(SWT.ERROR_NO_HANDLES); + int lineEnd = 0; + do { +@@ -1064,17 +1064,17 @@ + int length = text.length(); + if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE); + offset = translateOffset(offset); +- int /*long*/ iter = OS.pango_layout_get_iter(layout); ++ long /*int*/ iter = OS.pango_layout_get_iter(layout); + if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES); + int level = 0; + PangoItem item = new PangoItem(); + PangoLayoutRun run = new PangoLayoutRun(); +- int /*long*/ ptr = OS.pango_layout_get_text(layout); +- int /*long*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr, offset) - ptr; ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr, offset) - ptr; + int strlen = OS.strlen(ptr); + byteOffset = Math.min(byteOffset, strlen); + do { +- int /*long*/ runPtr = OS.pango_layout_iter_get_run(iter); ++ long /*int*/ runPtr = OS.pango_layout_iter_get_run(iter); + if (runPtr != 0) { + OS.memmove(run, runPtr, PangoLayoutRun.sizeof); + OS.memmove(item, run.item, PangoItem.sizeof); +@@ -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); +- int /*long*/ iter = OS.pango_layout_get_iter(layout); ++ long /*int*/ iter = OS.pango_layout_get_iter(layout); + 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(); +@@ -1162,11 +1162,11 @@ + if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_ARGUMENT); + offset = translateOffset(offset); + int line = 0; +- int /*long*/ ptr = OS.pango_layout_get_text(layout); +- int /*long*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr,offset) - ptr; ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ byteOffset = OS.g_utf8_offset_to_pointer(ptr,offset) - ptr; + int strlen = OS.strlen(ptr); + byteOffset = Math.min(byteOffset, strlen); +- int /*long*/ iter = OS.pango_layout_get_iter(layout); ++ long /*int*/ iter = OS.pango_layout_get_iter(layout); + 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; +@@ -1198,9 +1198,9 @@ + PangoLayoutLine line = new PangoLayoutLine(); + OS.memmove(line, OS.pango_layout_get_line(layout, lineIndex), PangoLayoutLine.sizeof); + if (line.runs == 0) { +- int /*long*/ font = this.font != null ? this.font.handle : device.systemFont.handle; +- int /*long*/ lang = OS.pango_context_get_language(context); +- int /*long*/ metrics = OS.pango_context_get_metrics(context, font, lang); ++ long /*int*/ font = this.font != null ? this.font.handle : device.systemFont.handle; ++ long /*int*/ lang = OS.pango_context_get_language(context); ++ long /*int*/ metrics = OS.pango_context_get_metrics(context, font, lang); + ascent = OS.pango_font_metrics_get_ascent(metrics); + descent = OS.pango_font_metrics_get_descent(metrics); + OS.pango_font_metrics_unref(metrics); +@@ -1231,10 +1231,10 @@ + computeRuns(); + int lineCount = OS.pango_layout_get_line_count(layout); + int[] offsets = new int [lineCount + 1]; +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + PangoLayoutLine line = new PangoLayoutLine(); + for (int i = 0; i < lineCount; i++) { +- int /*long*/ linePtr = OS.pango_layout_get_line(layout, i); ++ long /*int*/ linePtr = OS.pango_layout_get_line(layout, i); + 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); +@@ -1265,7 +1265,7 @@ + int length = text.length(); + if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE); + offset = translateOffset(offset); +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + int byteOffset = (int)/*64*/(OS.g_utf8_offset_to_pointer(ptr, offset) - ptr); + int strlen = OS.strlen(ptr); + byteOffset = Math.min(byteOffset, strlen); +@@ -1315,7 +1315,7 @@ + } + int step = forward ? 1 : -1; + if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step; +- int /*long*/[] attrs = new int /*long*/[1]; ++ long /*int*/[] attrs = new long /*int*/[1]; + int[] nAttrs = new int[1]; + OS.pango_layout_get_log_attrs(layout, attrs, nAttrs); + if (attrs[0] == 0) return offset + step; +@@ -1412,7 +1412,7 @@ + * visual offset. The fix is to clamp the coordinates inside the + * line bounds. + */ +- int /*long*/ iter = OS.pango_layout_get_iter(layout); ++ long /*int*/ iter = OS.pango_layout_get_iter(layout); + if (iter == 0) SWT.error(SWT.ERROR_NO_HANDLES); + PangoRectangle rect = new PangoRectangle(); + do { +@@ -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); +- int /*long*/ ptr = OS.pango_layout_get_text(layout); ++ long /*int*/ ptr = OS.pango_layout_get_text(layout); + int offset = (int)/*64*/OS.g_utf8_pointer_to_offset(ptr, ptr + index[0]); + if (trailing != null) trailing[0] = piTrailing[0]; + return untranslateOffset(offset); +@@ -2037,7 +2037,7 @@ + if (tabs == null) { + OS.pango_layout_set_tabs(layout, device.emptyTab); + } else { +- int /*long*/ tabArray = OS.pango_tab_array_new(tabs.length, true); ++ long /*int*/ tabArray = OS.pango_tab_array_new(tabs.length, true); + if (tabArray != 0) { + for (int i = 0; i < tabs.length; i++) { + OS.pango_tab_array_set_tab(tabArray, i, OS.PANGO_TAB_LEFT, tabs[i]); +diff -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 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 -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 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 -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 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 -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 (); + + /** Natives */ +-public static final native int /*long*/ _ATK_ACTION_GET_IFACE (int /*long*/ obj); +-public static final int /*long*/ ATK_ACTION_GET_IFACE (int /*long*/ obj) { ++public static final native long /*int*/ _ATK_ACTION_GET_IFACE (long /*int*/ obj); ++public static final long /*int*/ ATK_ACTION_GET_IFACE (long /*int*/ obj) { + lock.lock(); + try { + return _ATK_ACTION_GET_IFACE(obj); +@@ -99,8 +99,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle); +-public static final int /*long*/ ATK_COMPONENT_GET_IFACE(int /*long*/ atkHandle) { ++public static final native long /*int*/ _ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle); ++public static final long /*int*/ ATK_COMPONENT_GET_IFACE(long /*int*/ atkHandle) { + lock.lock(); + try { + return _ATK_COMPONENT_GET_IFACE(atkHandle); +@@ -108,8 +108,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass); +-public static final int /*long*/ ATK_OBJECT_FACTORY_CLASS (int /*long*/ klass) { ++public static final native long /*int*/ _ATK_OBJECT_FACTORY_CLASS (long /*int*/ klass); ++public static final long /*int*/ ATK_OBJECT_FACTORY_CLASS (long /*int*/ klass) { + lock.lock(); + try { + return _ATK_OBJECT_FACTORY_CLASS(klass); +@@ -117,8 +117,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_SELECTION_GET_IFACE (int /*long*/ obj); +-public static final int /*long*/ ATK_SELECTION_GET_IFACE (int /*long*/ obj) { ++public static final native long /*int*/ _ATK_SELECTION_GET_IFACE (long /*int*/ obj); ++public static final long /*int*/ ATK_SELECTION_GET_IFACE (long /*int*/ obj) { + lock.lock(); + try { + return _ATK_SELECTION_GET_IFACE(obj); +@@ -126,8 +126,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _ATK_TEXT_GET_IFACE (int /*long*/ handle); +-public static final int /*long*/ ATK_TEXT_GET_IFACE (int /*long*/ handle) { ++public static final native long /*int*/ _ATK_TEXT_GET_IFACE (long /*int*/ handle); ++public static final long /*int*/ ATK_TEXT_GET_IFACE (long /*int*/ handle) { + lock.lock(); + try { + return _ATK_TEXT_GET_IFACE(handle); +@@ -135,8 +135,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _GTK_ACCESSIBLE (int /*long*/ handle); +-public static final int /*long*/ GTK_ACCESSIBLE (int /*long*/ handle) { ++public static final native long /*int*/ _GTK_ACCESSIBLE (long /*int*/ handle); ++public static final long /*int*/ GTK_ACCESSIBLE (long /*int*/ handle) { + lock.lock(); + try { + return _GTK_ACCESSIBLE(handle); +@@ -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); ++public static final void atk_focus_tracker_notify (long /*int*/ object) { + lock.lock(); + try { + _atk_focus_tracker_notify(object); +@@ -154,8 +154,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _atk_get_default_registry (); +-public static final int /*long*/ atk_get_default_registry () { ++public static final native long /*int*/ _atk_get_default_registry (); ++public static final long /*int*/ atk_get_default_registry () { + lock.lock(); + try { + return _atk_get_default_registry(); +@@ -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); ++public static final long /*int*/ atk_object_factory_create_accessible (long /*int*/ factory, long /*int*/ obj) { + lock.lock(); + try { + return _atk_object_factory_create_accessible(factory, obj); +@@ -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); ++public static final long /*int*/ atk_object_factory_get_accessible_type (long /*int*/ factory) { + lock.lock(); + try { + return _atk_object_factory_get_accessible_type(factory); +@@ -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); ++public static final void atk_object_initialize (long /*int*/ accessible, long /*int*/ data) { + lock.lock(); + try { + _atk_object_initialize(accessible, data); +@@ -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); ++public static final long /*int*/ atk_object_ref_relation_set (long /*int*/ accessible) { + lock.lock(); + try { + return _atk_object_ref_relation_set(accessible); +@@ -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); ++public static final long /*int*/ atk_registry_get_factory (long /*int*/ registry, long /*int*/ type) { + lock.lock(); + try { + return _atk_registry_get_factory(registry, type); +@@ -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); ++public static final void atk_registry_set_factory_type (long /*int*/ registry, long /*int*/ type, long /*int*/ factory_type) { + lock.lock(); + try { + _atk_registry_set_factory_type(registry, type, factory_type); +@@ -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); ++public static final int atk_relation_set_get_n_relations (long /*int*/ set) { + lock.lock(); + try { + return _atk_relation_set_get_n_relations(set); +@@ -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); ++public static final long /*int*/ atk_relation_set_get_relation (long /*int*/ set, int i) { + lock.lock(); + try { + return _atk_relation_set_get_relation (set, i); +@@ -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); ++public static final void atk_relation_set_remove (long /*int*/ set, long /*int*/ relation) { + lock.lock(); + try { + _atk_relation_set_remove (set, relation); +@@ -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); ++public static final boolean atk_state_set_add_state (long /*int*/ set, int type) { + lock.lock(); + try { + return _atk_state_set_add_state(set, type); +@@ -282,8 +282,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _atk_state_set_new (); +-public static final int /*long*/ atk_state_set_new () { ++public static final native long /*int*/ _atk_state_set_new (); ++public static final long /*int*/ atk_state_set_new () { + lock.lock(); + try { + return _atk_state_set_new(); +@@ -291,8 +291,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0) { + lock.lock(); + try { + return _call(function, arg0); +@@ -300,8 +300,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1) { + lock.lock(); + try { + return _call(function, arg0, arg1); +@@ -309,8 +309,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) { + lock.lock(); + try { + return _call(function, arg0, arg1, arg2); +@@ -318,8 +318,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) { + lock.lock(); + try { + return _call(function, arg0, arg1, arg2, arg3); +@@ -327,8 +327,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) { + lock.lock(); + try { + return _call(function, arg0, arg1, arg2, arg3, arg4); +@@ -336,8 +336,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5) { + lock.lock(); + try { + return _call(function, arg0, arg1, arg2, arg3, arg4, arg5); +@@ -345,19 +345,19 @@ + lock.unlock(); + } + } +-public static final native void memmove (AtkActionIface dest, int /*long*/ src); +-public static final native void memmove (AtkComponentIface dest, int /*long*/ src); +-public static final native void memmove (AtkHypertextIface dest, int /*long*/ src); +-public static final native void memmove (AtkObjectClass dest, int /*long*/ src); +-public static final native void memmove (AtkObjectFactoryClass dest, int /*long*/ src); +-public static final native void memmove (AtkSelectionIface dest, int /*long*/ src); +-public static final native void memmove (AtkTextIface dest, int /*long*/ src); +-public static final native void memmove (GtkAccessible dest, int /*long*/ src); +-public static final native void memmove (int /*long*/ dest, AtkActionIface src); +-public static final native void memmove (int /*long*/ dest, AtkComponentIface src); +-public static final native void memmove (int /*long*/ dest, AtkHypertextIface src); +-public static final native void memmove (int /*long*/ dest, AtkObjectClass src); +-public static final native void memmove (int /*long*/ dest, AtkObjectFactoryClass src); +-public static final native void memmove (int /*long*/ dest, AtkSelectionIface src); +-public static final native void memmove (int /*long*/ dest, AtkTextIface src); ++public static final native void memmove (AtkActionIface dest, long /*int*/ src); ++public static final native void memmove (AtkComponentIface dest, long /*int*/ src); ++public static final native void memmove (AtkHypertextIface dest, long /*int*/ src); ++public static final native void memmove (AtkObjectClass dest, long /*int*/ src); ++public static final native void memmove (AtkObjectFactoryClass dest, long /*int*/ src); ++public static final native void memmove (AtkSelectionIface dest, long /*int*/ src); ++public static final native void memmove (AtkTextIface dest, long /*int*/ src); ++public static final native void memmove (GtkAccessible dest, long /*int*/ src); ++public static final native void memmove (long /*int*/ dest, AtkActionIface src); ++public static final native void memmove (long /*int*/ dest, AtkComponentIface src); ++public static final native void memmove (long /*int*/ dest, AtkHypertextIface src); ++public static final native void memmove (long /*int*/ dest, AtkObjectClass src); ++public static final native void memmove (long /*int*/ dest, AtkObjectFactoryClass src); ++public static final native void memmove (long /*int*/ dest, AtkSelectionIface src); ++public static final native void memmove (long /*int*/ dest, AtkTextIface src); + } +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 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 -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 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 -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 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 -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 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 -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 -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. + */ +-public static void addLanguageListener(int /*long*/ hwnd, Runnable runnable) { ++public static void addLanguageListener(long /*int*/ hwnd, Runnable runnable) { + } + public static void addLanguageListener (Control control, Runnable runnable) { + } +@@ -93,7 +93,7 @@ + /* + * Not implemented. + */ +-public static void removeLanguageListener(int /*long*/ hwnd) { ++public static void removeLanguageListener(long /*int*/ hwnd) { + } + public static void removeLanguageListener (Control control) { + } +@@ -105,7 +105,7 @@ + /* + * Not implemented. + */ +-public static boolean setOrientation(int /*long*/ hwnd, int orientation) { ++public static boolean setOrientation(long /*int*/ hwnd, int orientation) { + return false; + } + public static boolean setOrientation (Control control, int orientation) { +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); ++public static final void cairo_append_path(long /*int*/ cr, long /*int*/ path) { + lock.lock(); + try { + _cairo_append_path(cr, path); +@@ -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); ++public static final void cairo_arc(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) { + lock.lock(); + try { + _cairo_arc(cr, xc, yc, radius, angle1, angle2); +@@ -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); ++public static final void cairo_arc_negative(long /*int*/ cr, double xc, double yc, double radius, double angle1, double angle2) { + lock.lock(); + try { + _cairo_arc_negative(cr, xc, yc, radius, angle1, angle2); +@@ -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); ++public static final void cairo_clip(long /*int*/ cr) { + lock.lock(); + try { + _cairo_clip(cr); +@@ -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); ++public static final void cairo_clip_preserve(long /*int*/ cr) { + lock.lock(); + try { + _cairo_clip_preserve(cr); +@@ -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); ++public static final void cairo_close_path(long /*int*/ cr) { + lock.lock(); + try { + _cairo_close_path(cr); +@@ -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); ++public static final void cairo_copy_page(long /*int*/ cr) { + lock.lock(); + try { + _cairo_copy_page(cr); +@@ -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); ++public static final long /*int*/ cairo_copy_path(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_copy_path(cr); +@@ -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); ++public static final long /*int*/ cairo_copy_path_flat(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_copy_path_flat(cr); +@@ -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); ++public static final long /*int*/ cairo_create(long /*int*/ target) { + lock.lock(); + try { + return _cairo_create(target); +@@ -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); ++public static final void cairo_curve_to(long /*int*/ cr, double x1, double y1, double x2, double y2, double x3, double y3) { + lock.lock(); + try { + _cairo_curve_to(cr, x1, y1, x2, y2, x3, y3); +@@ -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); ++public static final void cairo_destroy(long /*int*/ cr) { + lock.lock(); + try { + _cairo_destroy(cr); +@@ -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); ++public static final void cairo_device_to_user(long /*int*/ cr, double[] x, double[] y) { + lock.lock(); + try { + _cairo_device_to_user(cr, x, y); +@@ -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); ++public static final void cairo_device_to_user_distance(long /*int*/ cr, double[] dx, double[] dy) { + lock.lock(); + try { + _cairo_device_to_user_distance(cr, dx, dy); +@@ -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); ++public static final void cairo_fill(long /*int*/ cr) { + lock.lock(); + try { + _cairo_fill(cr); +@@ -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); ++public static final void cairo_fill_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) { + lock.lock(); + try { + _cairo_fill_extents(cr, x1, y1, x2, y2); +@@ -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); ++public static final void cairo_fill_preserve(long /*int*/ cr) { + lock.lock(); + try { + _cairo_fill_preserve(cr); +@@ -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); ++public static final void cairo_font_extents(long /*int*/ cr, cairo_font_extents_t extents) { + lock.lock(); + try { + _cairo_font_extents(cr, extents); +@@ -288,8 +288,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _cairo_font_options_create(); +-public static final int /*long*/ cairo_font_options_create() { ++public static final native long /*int*/ _cairo_font_options_create(); ++public static final long /*int*/ cairo_font_options_create() { + lock.lock(); + try { + return _cairo_font_options_create(); +@@ -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); ++public static final void cairo_font_options_destroy(long /*int*/ options) { + lock.lock(); + try { + _cairo_font_options_destroy(options); +@@ -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); ++public static final int cairo_font_options_get_antialias(long /*int*/ options) { + lock.lock(); + try { + return _cairo_font_options_get_antialias(options); +@@ -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); ++public static final void cairo_font_options_set_antialias(long /*int*/ options, int antialias) { + lock.lock(); + try { + _cairo_font_options_set_antialias(options, antialias); +@@ -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); ++public static final int cairo_get_antialias(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_antialias(cr); +@@ -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); ++public static final void cairo_get_current_point(long /*int*/ cr, double[] x, double[] y) { + lock.lock(); + try { + _cairo_get_current_point(cr, x, y); +@@ -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); ++public static final int cairo_get_fill_rule(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_fill_rule(cr); +@@ -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); ++public static final long /*int*/ cairo_get_font_face(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_font_face(cr); +@@ -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); ++public static final void cairo_get_font_matrix(long /*int*/ cr, double[] matrix) { + lock.lock(); + try { + _cairo_get_font_matrix(cr, matrix); +@@ -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); ++public static final void cairo_get_font_options(long /*int*/ cr, long /*int*/ options) { + lock.lock(); + try { + _cairo_get_font_options(cr, options); +@@ -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); ++public static final int cairo_get_line_cap(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_line_cap(cr); +@@ -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); ++public static final int cairo_get_line_join(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_line_join(cr); +@@ -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); ++public static final double cairo_get_line_width(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_line_width(cr); +@@ -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); ++public static final void cairo_get_matrix(long /*int*/ cr, double[] matrix) { + lock.lock(); + try { + _cairo_get_matrix(cr, matrix); +@@ -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); ++public static final double cairo_get_miter_limit(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_miter_limit(cr); +@@ -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); ++public static final int cairo_get_operator(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_operator(cr); +@@ -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); ++public static final long /*int*/ cairo_get_source(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_source(cr); +@@ -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); ++public static final long /*int*/ cairo_get_target(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_target(cr); +@@ -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); ++public static final double cairo_get_tolerance(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_get_tolerance(cr); +@@ -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); ++public static final void cairo_glyph_extents(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs, long /*int*/ extents) { + lock.lock(); + try { + _cairo_glyph_extents(cr, glyphs, num_glyphs, extents); +@@ -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); ++public static final void cairo_glyph_path(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs) { + lock.lock(); + try { + _cairo_glyph_path(cr, glyphs, num_glyphs); +@@ -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); ++public static final void cairo_identity_matrix(long /*int*/ cr) { + lock.lock(); + try { + _cairo_identity_matrix(cr); +@@ -523,8 +523,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _cairo_image_surface_create(int format, int width, int height); +-public static final int /*long*/ cairo_image_surface_create(int format, int width, int height) { ++public static final native long /*int*/ _cairo_image_surface_create(int format, int width, int height); ++public static final long /*int*/ cairo_image_surface_create(int format, int width, int height) { + lock.lock(); + try { + return _cairo_image_surface_create(format, width, height); +@@ -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); ++public static final long /*int*/ cairo_image_surface_create_for_data(long /*int*/ data, int format, int width, int height, int stride) { + lock.lock(); + try { + return _cairo_image_surface_create_for_data(data, format, width, height, stride); +@@ -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); ++public static final int cairo_image_surface_get_height(long /*int*/ surface) { + lock.lock(); + try { + return _cairo_image_surface_get_height(surface); +@@ -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); ++public static final int cairo_image_surface_get_width(long /*int*/ surface) { + lock.lock(); + try { + return _cairo_image_surface_get_width(surface); +@@ -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); ++public static final int cairo_in_fill(long /*int*/ cr, double x, double y) { + lock.lock(); + try { + return _cairo_in_fill(cr, x, y); +@@ -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); ++public static final int cairo_in_stroke(long /*int*/ cr, double x, double y) { + lock.lock(); + try { + return _cairo_in_stroke(cr, x, y); +@@ -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); ++public static final void cairo_line_to(long /*int*/ cr, double x, double y) { + lock.lock(); + try { + _cairo_line_to(cr, x, y); +@@ -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); ++public static final void cairo_mask(long /*int*/ cr, long /*int*/ pattern) { + lock.lock(); + try { + _cairo_mask(cr, pattern); +@@ -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); ++public static final void cairo_mask_surface(long /*int*/ cr, long /*int*/ surface, double surface_x, double surface_y) { + lock.lock(); + try { + _cairo_mask_surface(cr, surface, surface_x, surface_y); +@@ -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); ++public static final void cairo_move_to(long /*int*/ cr, double x, double y) { + lock.lock(); + try { + _cairo_move_to(cr, x, y); +@@ -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); ++public static final void cairo_new_path(long /*int*/ cr) { + lock.lock(); + try { + _cairo_new_path(cr); +@@ -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); ++public static final void cairo_paint(long /*int*/ cr) { + lock.lock(); + try { + _cairo_paint(cr); +@@ -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); ++public static final void cairo_paint_with_alpha(long /*int*/ cr, double alpha) { + lock.lock(); + try { + _cairo_paint_with_alpha(cr, alpha); +@@ -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); ++public static final void cairo_path_destroy(long /*int*/ path) { + lock.lock(); + try { + _cairo_path_destroy(path); +@@ -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); ++public static final void cairo_pattern_add_color_stop_rgb(long /*int*/ pattern, double offset, double red, double green, double blue) { + lock.lock(); + try { + _cairo_pattern_add_color_stop_rgb(pattern, offset, red, green, blue); +@@ -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); ++public static final void cairo_pattern_add_color_stop_rgba(long /*int*/ pattern, double offset, double red, double green, double blue, double alpha) { + lock.lock(); + try { + _cairo_pattern_add_color_stop_rgba(pattern, offset, red, green, blue, alpha); +@@ -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); ++public static final long /*int*/ cairo_pattern_create_for_surface(long /*int*/ surface) { + lock.lock(); + try { + return _cairo_pattern_create_for_surface(surface); +@@ -822,8 +822,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1); +-public static final int /*long*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) { ++public static final native long /*int*/ _cairo_pattern_create_linear(double x0, double y0, double x1, double y1); ++public static final long /*int*/ cairo_pattern_create_linear(double x0, double y0, double x1, double y1) { + lock.lock(); + try { + return _cairo_pattern_create_linear(x0, y0, x1, y1); +@@ -831,8 +831,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1); +-public static final int /*long*/ cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) { ++public static final native long /*int*/ _cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1); ++public static final long /*int*/ cairo_pattern_create_radial(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) { + lock.lock(); + try { + return _cairo_pattern_create_radial(cx0, cy0, radius0, cx1, cy1, radius1); +@@ -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); ++public static final void cairo_pattern_destroy(long /*int*/ pattern) { + lock.lock(); + try { + _cairo_pattern_destroy(pattern); +@@ -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); ++public static final int cairo_pattern_get_extend(long /*int*/ pattern) { + lock.lock(); + try { + return _cairo_pattern_get_extend(pattern); +@@ -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); ++public static final int cairo_pattern_get_filter(long /*int*/ pattern) { + lock.lock(); + try { + return _cairo_pattern_get_filter(pattern); +@@ -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); ++public static final void cairo_pattern_get_matrix(long /*int*/ pattern, double[] matrix) { + lock.lock(); + try { + _cairo_pattern_get_matrix(pattern, matrix); +@@ -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); ++public static final void cairo_pattern_reference(long /*int*/ pattern) { + lock.lock(); + try { + _cairo_pattern_reference(pattern); +@@ -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); ++public static final void cairo_pattern_set_extend(long /*int*/ pattern, int extend) { + lock.lock(); + try { + _cairo_pattern_set_extend(pattern, extend); +@@ -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); ++public static final void cairo_pattern_set_filter(long /*int*/ pattern, int filter) { + lock.lock(); + try { + _cairo_pattern_set_filter(pattern, filter); +@@ -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); ++public static final void cairo_pattern_set_matrix(long /*int*/ pattern, double[] matrix) { + lock.lock(); + try { + _cairo_pattern_set_matrix(pattern, matrix); +@@ -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); ++public static final void cairo_pdf_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) { + lock.lock(); + try { + _cairo_pdf_surface_set_size(surface, width_in_points, height_in_points); +@@ -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); ++public static final void cairo_ps_surface_set_size(long /*int*/ surface, double width_in_points, double height_in_points) { + lock.lock(); + try { + _cairo_ps_surface_set_size(surface, width_in_points, height_in_points); +@@ -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); ++public static final void cairo_rectangle(long /*int*/ cr, double x, double y, double width, double height) { + lock.lock(); + try { + _cairo_rectangle(cr, x, y, width, height); +@@ -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); ++public static final long /*int*/ cairo_reference(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_reference(cr); +@@ -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); ++public static final void cairo_rel_curve_to(long /*int*/ cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3) { + lock.lock(); + try { + _cairo_rel_curve_to(cr, dx1, dy1, dx2, dy2, dx3, dy3); +@@ -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); ++public static final void cairo_rel_line_to(long /*int*/ cr, double dx, double dy) { + lock.lock(); + try { + _cairo_rel_line_to(cr, dx, dy); +@@ -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); ++public static final void cairo_rel_move_to(long /*int*/ cr, double dx, double dy) { + lock.lock(); + try { + _cairo_rel_move_to(cr, dx, dy); +@@ -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); ++public static final void cairo_reset_clip(long /*int*/ cr) { + lock.lock(); + try { + _cairo_reset_clip(cr); +@@ -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); ++public static final void cairo_restore(long /*int*/ cr) { + lock.lock(); + try { + _cairo_restore(cr); +@@ -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); ++public static final void cairo_rotate(long /*int*/ cr, double angle) { + lock.lock(); + try { + _cairo_rotate(cr, angle); +@@ -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); ++public static final void cairo_save(long /*int*/ cr) { + lock.lock(); + try { + _cairo_save(cr); +@@ -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); ++public static final void cairo_scale(long /*int*/ cr, double sx, double sy) { + lock.lock(); + try { + _cairo_scale(cr, sx, sy); +@@ -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); ++public static final void cairo_select_font_face(long /*int*/ cr, byte[] family, int slant, int weight) { + lock.lock(); + try { + _cairo_select_font_face(cr, family, slant, weight); +@@ -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); ++public static final void cairo_set_antialias(long /*int*/ cr, int antialias) { + lock.lock(); + try { + _cairo_set_antialias(cr, antialias); +@@ -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); ++public static final void cairo_set_dash(long /*int*/ cr, double[] dashes, int ndash, double offset) { + lock.lock(); + try { + _cairo_set_dash(cr, dashes, ndash, offset); +@@ -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); ++public static final void cairo_set_fill_rule(long /*int*/ cr, int fill_rule) { + lock.lock(); + try { + _cairo_set_fill_rule(cr, fill_rule); +@@ -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); ++public static final void cairo_set_font_face(long /*int*/ cr, long /*int*/ font_face) { + lock.lock(); + try { + _cairo_set_font_face(cr, font_face); +@@ -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); ++public static final void cairo_set_font_matrix(long /*int*/ cr, double[] matrix) { + lock.lock(); + try { + _cairo_set_font_matrix(cr, matrix); +@@ -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); ++public static final void cairo_set_font_options(long /*int*/ cr, long /*int*/ options) { + lock.lock(); + try { + _cairo_set_font_options(cr, options); +@@ -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); ++public static final void cairo_set_font_size(long /*int*/ cr, double size) { + lock.lock(); + try { + _cairo_set_font_size(cr, size); +@@ -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); ++public static final void cairo_set_line_cap(long /*int*/ cr, int line_cap) { + lock.lock(); + try { + _cairo_set_line_cap(cr, line_cap); +@@ -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); ++public static final void cairo_set_line_join(long /*int*/ cr, int line_join) { + lock.lock(); + try { + _cairo_set_line_join(cr, line_join); +@@ -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); ++public static final void cairo_set_line_width(long /*int*/ cr, double width) { + lock.lock(); + try { + _cairo_set_line_width(cr, width); +@@ -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); ++public static final void cairo_set_matrix(long /*int*/ cr, double[] matrix) { + lock.lock(); + try { + _cairo_set_matrix(cr, matrix); +@@ -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); ++public static final void cairo_set_miter_limit(long /*int*/ cr, double limit) { + lock.lock(); + try { + _cairo_set_miter_limit(cr, limit); +@@ -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); ++public static final void cairo_set_operator(long /*int*/ cr, int op) { + lock.lock(); + try { + _cairo_set_operator(cr, op); +@@ -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); ++public static final void cairo_set_source(long /*int*/ cr, long /*int*/ source) { + lock.lock(); + try { + _cairo_set_source(cr, source); +@@ -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); ++public static final void cairo_set_source_rgb(long /*int*/ cr, double red, double green, double blue) { + lock.lock(); + try { + _cairo_set_source_rgb(cr, red, green, blue); +@@ -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); ++public static final void cairo_set_source_rgba(long /*int*/ cr, double red, double green, double blue, double alpha) { + lock.lock(); + try { + _cairo_set_source_rgba(cr, red, green, blue, alpha); +@@ -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); ++public static final void cairo_set_source_surface(long /*int*/ cr, long /*int*/ surface, double x, double y) { + lock.lock(); + try { + _cairo_set_source_surface(cr, surface, x, y); +@@ -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); ++public static final void cairo_set_tolerance(long /*int*/ cr, double tolerance) { + lock.lock(); + try { + _cairo_set_tolerance(cr, tolerance); +@@ -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); ++public static final void cairo_show_glyphs(long /*int*/ cr, long /*int*/ glyphs, int num_glyphs) { + lock.lock(); + try { + _cairo_show_glyphs(cr, glyphs, num_glyphs); +@@ -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); ++public static final void cairo_show_page(long /*int*/ cr) { + lock.lock(); + try { + _cairo_show_page(cr); +@@ -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); ++public static final void cairo_show_text(long /*int*/ cr, byte[] utf8) { + lock.lock(); + try { + _cairo_show_text(cr, utf8); +@@ -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); ++public static final int cairo_status(long /*int*/ cr) { + lock.lock(); + try { + return _cairo_status(cr); +@@ -1309,8 +1309,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _cairo_status_to_string(int status); +-public static final int /*long*/ cairo_status_to_string(int status) { ++public static final native long /*int*/ _cairo_status_to_string(int status); ++public static final long /*int*/ cairo_status_to_string(int status) { + lock.lock(); + try { + return _cairo_status_to_string(status); +@@ -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); ++public static final void cairo_stroke(long /*int*/ cr) { + lock.lock(); + try { + _cairo_stroke(cr); +@@ -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); ++public static final void cairo_stroke_extents(long /*int*/ cr, double[] x1, double[] y1, double[] x2, double[] y2) { + lock.lock(); + try { + _cairo_stroke_extents(cr, x1, y1, x2, y2); +@@ -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); ++public static final void cairo_stroke_preserve(long /*int*/ cr) { + lock.lock(); + try { + _cairo_stroke_preserve(cr); +@@ -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); ++public static final long /*int*/ cairo_surface_create_similar(long /*int*/ other, int format, int width, int height) { + lock.lock(); + try { + return _cairo_surface_create_similar(other, format, width, height); +@@ -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); ++public static final void cairo_surface_destroy(long /*int*/ surface) { + lock.lock(); + try { + _cairo_surface_destroy(surface); +@@ -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); ++public static final void cairo_surface_finish(long /*int*/ surface) { + lock.lock(); + try { + _cairo_surface_finish(surface); +@@ -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); ++public static final int cairo_surface_get_type(long /*int*/ surface) { + lock.lock(); + try { + return _cairo_surface_get_type(surface); +@@ -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); ++public static final long /*int*/ cairo_surface_get_user_data(long /*int*/ surface, long /*int*/ key) { + lock.lock(); + try { + return _cairo_surface_get_user_data(surface, key); +@@ -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); ++public static final void cairo_surface_reference(long /*int*/ surface) { + lock.lock(); + try { + _cairo_surface_reference(surface); +@@ -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); ++public static final void cairo_surface_set_device_offset(long /*int*/ surface, double x_offset, double y_offset) { + lock.lock(); + try { + _cairo_surface_set_device_offset(surface, x_offset, y_offset); +@@ -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); ++public static final void cairo_surface_set_fallback_resolution(long /*int*/ surface, double x_pixels_per_inch, double y_pixels_per_inch) { + lock.lock(); + try { + _cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch); +@@ -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); ++public static final int cairo_surface_set_user_data(long /*int*/ surface, long /*int*/ key, long /*int*/ user_data, long /*int*/ destroy) { + lock.lock(); + try { + return _cairo_surface_set_user_data(surface, key, user_data, destroy); +@@ -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); ++public static final void cairo_text_extents(long /*int*/ cr, byte[] utf8, cairo_text_extents_t extents) { + lock.lock(); + try { + _cairo_text_extents(cr, utf8, extents); +@@ -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); ++public static final void cairo_text_path(long /*int*/ cr, byte[] utf8) { + lock.lock(); + try { + _cairo_text_path(cr, utf8); +@@ -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); ++public static final void cairo_transform(long /*int*/ cr, double[] matrix) { + lock.lock(); + try { + _cairo_transform(cr, matrix); +@@ -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); ++public static final void cairo_translate(long /*int*/ cr, double tx, double ty) { + lock.lock(); + try { + _cairo_translate(cr, tx, ty); +@@ -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); ++public static final void cairo_user_to_device(long /*int*/ cr, double[] x, double[] y) { + lock.lock(); + try { + _cairo_user_to_device(cr, x, y); +@@ -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); ++public static final void cairo_user_to_device_distance(long /*int*/ cr, double[] dx, double[] dy) { + lock.lock(); + try { + _cairo_user_to_device_distance(cr, dx, dy); +@@ -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); ++public static final long /*int*/ cairo_xlib_surface_create(long /*int*/ dpy, long /*int*/ drawable, long /*int*/ visual, int width, int height) { + lock.lock(); + try { + return _cairo_xlib_surface_create(dpy, drawable, visual, width, height); +@@ -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); ++public static final long /*int*/ cairo_xlib_surface_create_for_bitmap(long /*int*/ dpy, long /*int*/ pixmap, long /*int*/ screen, int width, int height) { + lock.lock(); + try { + return _cairo_xlib_surface_create_for_bitmap(dpy, pixmap, screen, width, height); +@@ -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); ++public static final void cairo_xlib_surface_set_size(long /*int*/ surface, int width, int height) { + lock.lock(); + try { + _cairo_xlib_surface_set_size(surface, width, height); +@@ -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_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 -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 -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; + int argCount; +- int /*long*/ address, errorResult; ++ long /*int*/ address, errorResult; + boolean isStatic, isArrayBased; + + static final String PTR_SIGNATURE = C.PTR_SIZEOF == 4 ? "I" : "J"; //$NON-NLS-1$ //$NON-NLS-2$ +@@ -88,7 +88,7 @@ + * @param isArrayBased true if the arguments should be passed in an array and false otherwise + * @param errorResult the return value if the java code throws an exception + */ +-public Callback (Object object, String method, int argCount, boolean isArrayBased, int /*long*/ errorResult) { ++public Callback (Object object, String method, int argCount, boolean isArrayBased, long /*int*/ errorResult) { + + /* Set the callback fields */ + this.object = object; +@@ -131,7 +131,7 @@ + * @param isArrayBased whether the callback's method is array based + * @param errorResult the callback's error result + */ +-static native synchronized int /*long*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, int /*long*/ errorResult); ++static native synchronized long /*int*/ bind (Callback callback, Object object, String method, String signature, int argCount, boolean isStatic, boolean isArrayBased, long /*int*/ errorResult); + + /** + * Releases the native level resources associated with the callback, +@@ -152,7 +152,7 @@ + * + * @return the callback address + */ +-public int /*long*/ getAddress () { ++public long /*int*/ getAddress () { + return address; + } + +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); ++public static final boolean DtAppInitialize(long /*int*/ appContext, long /*int*/ display, long /*int*/ topWiget, byte[] appName, byte[] appClass) { + lock.lock(); + try { + return _DtAppInitialize(appContext, display, topWiget, appName, appClass); +@@ -51,8 +51,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _DtDtsDataTypeNames(); +-public static final int /*long*/ DtDtsDataTypeNames() { ++public static final native long /*int*/ _DtDtsDataTypeNames(); ++public static final long /*int*/ DtDtsDataTypeNames() { + lock.lock(); + try { + return _DtDtsDataTypeNames(); +@@ -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); ++public static final long /*int*/ DtDtsFileToDataType(byte[] fileName) { + lock.lock(); + try { + return _DtDtsFileToDataType(fileName); +@@ -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); ++public static final long /*int*/ DtDtsDataTypeToAttributeValue(byte[] dataType, byte[] attrName, byte[] optName) { + lock.lock(); + try { + return _DtDtsDataTypeToAttributeValue(dataType, attrName, optName); +@@ -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); ++public static final void DtDtsFreeDataType(long /*int*/ dataType) { + lock.lock(); + try { + _DtDtsFreeDataType(dataType); +@@ -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); ++public static final void DtDtsFreeDataTypeNames(long /*int*/ dataTypeList) { + lock.lock(); + try { + _DtDtsFreeDataTypeNames(dataTypeList); +@@ -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); ++public static final void DtDtsFreeAttributeValue(long /*int*/ attrValue) { + lock.lock(); + try { + _DtDtsFreeAttributeValue(attrValue); +@@ -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); ++public static final 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) { + lock.lock(); + try { + return _DtActionInvoke(topWidget, action, args, argCount, termOpts, execHost, contextDir, useIndicator, callback, clientData); +@@ -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(); ++public static final long /*int*/ topLevelShellWidgetClass() { + lock.lock(); + try { + return _topLevelShellWidgetClass(); +@@ -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); ++public static final long /*int*/ XtAppCreateShell(byte[] appName, byte[] appClass, long /*int*/ widgetClass, long /*int*/ display, long /*int*/ [] argList, int argCount) { + lock.lock(); + try { + return _XtAppCreateShell(appName, appClass, widgetClass, display, argList, argCount); +@@ -168,8 +168,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _XtCreateApplicationContext(); +-public static final int /*long*/ XtCreateApplicationContext() { ++public static final native long /*int*/ _XtCreateApplicationContext(); ++public static final long /*int*/ XtCreateApplicationContext() { + lock.lock(); + try { + return _XtCreateApplicationContext(); +@@ -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); ++public static final void XtDisplayInitialize(long /*int*/ appContext, long /*int*/ display, byte[] appName, byte[] appClass, long /*int*/ options, int num_options, long /*int*/ [] argc, int argv) { + lock.lock(); + try { + _XtDisplayInitialize(appContext, display, appName, appClass, options, num_options, argc, argv); +@@ -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); ++public static final void XtRealizeWidget(long /*int*/ widget) { + lock.lock(); + try { + _XtRealizeWidget(widget); +@@ -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); ++public static final void XtResizeWidget(long /*int*/ widget, int width, int height, int borderWidth) { + lock.lock(); + try { + _XtResizeWidget(widget, width, height, borderWidth); +@@ -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); ++public static final void XtSetMappedWhenManaged(long /*int*/ widget, boolean flag) { + lock.lock(); + try { + _XtSetMappedWhenManaged(widget, flag); +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 -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 void free (long /*int*/ ptr); + /** @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 -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 @@ + } + + public static char [] mbcsToWcs (String codePage, byte [] buffer) { +- int /*long*/ [] items_written = new int /*long*/ [1]; +- int /*long*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null); ++ long /*int*/ [] items_written = new long /*int*/ [1]; ++ long /*int*/ ptr = OS.g_utf8_to_utf16 (buffer, buffer.length, null, items_written, null); + if (ptr == 0) return EmptyCharArray; + int length = (int)/*64*/items_written [0]; + char [] chars = new char [length]; +@@ -55,12 +55,12 @@ + } + + public static byte [] wcsToMbcs (String codePage, char [] buffer, boolean terminate) { +- int /*long*/ [] items_read = new int /*long*/ [1], items_written = new int /*long*/ [1]; ++ long /*int*/ [] items_read = new long /*int*/ [1], items_written = new long /*int*/ [1]; + /* + * Note that g_utf16_to_utf8() stops converting + * when it finds the first NULL. + */ +- int /*long*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null); ++ long /*int*/ ptr = OS.g_utf16_to_utf8 (buffer, buffer.length, items_read, items_written, null); + if (ptr == 0) return terminate ? NullByteArray : EmptyByteArray; + int written = (int)/*64*/items_written [0]; + byte [] bytes = new byte [written + (terminate ? 1 : 0)]; +diff -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); ++public static final void g_free(long /*int*/ mem) { + lock.lock(); + try { + _g_free(mem); +@@ -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); ++public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ data) { + lock.lock(); + try { + return _g_list_append(list, data); +@@ -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); ++public static final void g_list_free(long /*int*/ list) { + lock.lock(); + try { + _g_list_free(list); +@@ -68,8 +68,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _g_list_next(int /*long*/ list); +-public static final int /*long*/ g_list_next(int /*long*/ list) { ++public static final native long /*int*/ _g_list_next(long /*int*/ list); ++public static final long /*int*/ g_list_next(long /*int*/ list) { + lock.lock(); + try { + return _g_list_next(list); +@@ -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); ++public static final void g_object_unref(long /*int*/ object) { + lock.lock(); + try { + _g_object_unref(object); +@@ -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); ++public static final 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) { + lock.lock(); + try { + return _gnome_icon_lookup(icon_theme, thumbnail_factory, file_uri, custom_icon, file_info, mime_type, flags, result); +@@ -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); ++public static final long /*int*/ gnome_icon_theme_lookup_icon(long /*int*/ theme, long /*int*/ icon_name, int size, long /*int*/[] icon_data, int[] base_size) { + lock.lock(); + try { + return _gnome_icon_theme_lookup_icon(theme, icon_name, size, icon_data, base_size); +@@ -120,8 +120,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gnome_icon_theme_new(); +-public static final int /*long*/ gnome_icon_theme_new() { ++public static final native long /*int*/ _gnome_icon_theme_new(); ++public static final long /*int*/ gnome_icon_theme_new() { + lock.lock(); + try { + return _gnome_icon_theme_new(); +@@ -129,8 +129,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gnome_vfs_get_registered_mime_types(); +-public static final int /*long*/ gnome_vfs_get_registered_mime_types() { ++public static final native long /*int*/ _gnome_vfs_get_registered_mime_types(); ++public static final long /*int*/ gnome_vfs_get_registered_mime_types() { + lock.lock(); + try { + return _gnome_vfs_get_registered_mime_types(); +@@ -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); ++public static final long /*int*/ gnome_vfs_make_uri_from_input(byte[] uri) { + lock.lock(); + try { + return _gnome_vfs_make_uri_from_input(uri); +@@ -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); ++public static final long /*int*/ gnome_vfs_make_uri_from_input_with_dirs(byte[] uri, int dirs) { + lock.lock(); + try { + return _gnome_vfs_make_uri_from_input_with_dirs(uri, dirs); +@@ -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); ++public static final void gnome_vfs_mime_application_free(long /*int*/ application) { + lock.lock(); + try { + _gnome_vfs_mime_application_free(application); +@@ -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); ++public static final int gnome_vfs_mime_application_launch(long /*int*/ application, long /*int*/ uris) { + lock.lock(); + try { + return _gnome_vfs_mime_application_launch(application, uris); +@@ -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); ++public static final void gnome_vfs_mime_extensions_list_free(long /*int*/ list) { + lock.lock(); + try { + _gnome_vfs_mime_extensions_list_free(list); +@@ -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); ++public static final long /*int*/ gnome_vfs_mime_get_default_application(byte[] mimeType) { + lock.lock(); + try { + return _gnome_vfs_mime_get_default_application(mimeType); +@@ -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); ++public static final long /*int*/ gnome_vfs_mime_get_extensions_list(long /*int*/ mime_type) { + lock.lock(); + try { + return _gnome_vfs_mime_get_extensions_list(mime_type); +@@ -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); ++public static final void gnome_vfs_mime_registered_mime_type_list_free(long /*int*/ list) { + lock.lock(); + try { + _gnome_vfs_mime_registered_mime_type_list_free(list); +@@ -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); ++public static final long /*int*/ gnome_vfs_mime_type_from_name(byte[] file) { + lock.lock(); + try { + return _gnome_vfs_mime_type_from_name(file); +@@ -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); ++public static final int gnome_vfs_url_show(long /*int*/ url) { + lock.lock(); + try { + return _gnome_vfs_url_show(url); +@@ -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 -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 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 -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 -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; + /** @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; + /** @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 -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; + /** @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 -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; + /** @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; + /** @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; + /** @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; + /** @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; + /** @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; + /** @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; + /** @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; + /** @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 -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 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 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; + /** @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; + /** @field cast=(gint) */ +@@ -35,9 +35,9 @@ + /** @field cast=(guint16) */ + public short bits_per_pixel; + /** @field cast=(gpointer) */ +- public int /*long*/ mem; ++ 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 -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; + public int x, y; + public int width; + public int height; + public int wclass; + /** @field cast=(GdkVisual *) */ +- public int /*long*/ visual; ++ 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 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 -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 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 -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 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 -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 long /*int*/ render; + /** @field cast=(void(*)()) */ +- public int /*long*/ get_size; ++ public long /*int*/ get_size; + } +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 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 -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 long /*int*/ entry; + /** @field cast=(GtkWidget *) */ +- public int /*long*/ list; ++ public long /*int*/ list; + } +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 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 -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 -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 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 -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; + /** @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; + /** @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 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 -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 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 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 -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; + /** @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 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_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; +@@ -679,7 +679,7 @@ + public static final int GraphicsExpose = 13; + public static final int NoExpose = 14; + public static final int ExposureMask = 1 << 15; +-public static final int /*long*/ NoEventMask = 0; ++public static final long /*int*/ NoEventMask = 0; + public static final int NotifyNormal = 0; + public static final int NotifyGrab = 1; + public static final int NotifyHint = 1; +@@ -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; +-public static final native int _Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/ arg2); +-public static final int Call(int /*long*/ proc, int /*long*/ arg1, int /*long*/ arg2) { ++public static final native int _Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2); ++public static final int Call(long /*int*/ proc, long /*int*/ arg1, long /*int*/ arg2) { + lock.lock(); + try { + return _Call(proc, arg1, arg2); +@@ -704,8 +704,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6); +-public static final int /*long*/ call (int /*long*/ function, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ arg3, int /*long*/ arg4, int /*long*/ arg5, int /*long*/ arg6) { ++public static final native long /*int*/ _call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6); ++public static final long /*int*/ call (long /*int*/ function, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6) { + lock.lock(); + try { + return _call(function, arg0, arg1, arg2, arg3, arg4, arg5, arg6); +@@ -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); ++public static final long /*int*/ GDK_PIXMAP_XID(long /*int*/ pixmap) { + lock.lock(); + try { + return _GDK_PIXMAP_XID(pixmap); +@@ -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); ++public static final boolean XCheckMaskEvent(long /*int*/ display, long /*int*/ event_mask, long /*int*/ event_return) { + lock.lock(); + try { + return _XCheckMaskEvent(display, event_mask, event_return); +@@ -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); ++public static final boolean XCheckWindowEvent(long /*int*/ display, long /*int*/ window, long /*int*/ event_mask, long /*int*/ event_return) { + lock.lock(); + try { + return _XCheckWindowEvent(display, window, event_mask, event_return); +@@ -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); ++public static final boolean XCheckIfEvent(long /*int*/ display, long /*int*/ event_return, long /*int*/ predicate, long /*int*/ arg) { + lock.lock(); + try { + return _XCheckIfEvent(display, event_return, predicate, arg); +@@ -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); ++public static final int XDefaultScreen(long /*int*/ display) { + lock.lock(); + try { + return _XDefaultScreen(display); +@@ -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); ++public static final long /*int*/ XDefaultRootWindow(long /*int*/ display) { + lock.lock(); + try { + return _XDefaultRootWindow(display); +@@ -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); ++public static final void XFlush(long /*int*/ display) { + lock.lock(); + try { + _XFlush(display); +@@ -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); ++public static final void XFree(long /*int*/ address) { + lock.lock(); + try { + _XFree(address); +@@ -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); ++public static final long /*int*/ XGetSelectionOwner(long /*int*/ display, long /*int*/ selection) { + lock.lock(); + try { + return _XGetSelectionOwner(display, selection); +@@ -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); ++public static final long /*int*/ XInternAtom(long /*int*/ display, byte[] name, boolean ifExists) { + lock.lock(); + try { + return _XInternAtom(display, name, ifExists); +@@ -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); ++public static final int XQueryPointer(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) { + 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); +@@ -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); ++public static final int XQueryTree(long /*int*/ display, long /*int*/ w, long /*int*/[] root_return, long /*int*/[] parent_return, long /*int*/[] children_return, int[] nchildren_return) { + lock.lock(); + try { + return _XQueryTree(display, w, root_return, parent_return, children_return, nchildren_return); +@@ -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); ++public static final int XKeysymToKeycode(long /*int*/ display, long /*int*/ keysym) { + lock.lock(); + try { + return _XKeysymToKeycode(display, keysym); +@@ -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); ++public static final long /*int*/ XListProperties(long /*int*/ display, long /*int*/ window, int[] num_prop_return) { + lock.lock(); + try { + return _XListProperties(display, window, num_prop_return); +@@ -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); ++public static final int XReconfigureWMWindow(long /*int*/ display, long /*int*/ window, int screen, int valueMask, XWindowChanges values) { + lock.lock(); + try { + return _XReconfigureWMWindow(display, window, screen, valueMask, values); +@@ -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); ++public static final int XSendEvent(long /*int*/ display, long /*int*/ w, boolean propogate, long /*int*/ event_mask, long /*int*/ event_send) { + lock.lock(); + try { + return _XSendEvent(display, w, propogate, event_mask, event_send); +@@ -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); ++public static final long /*int*/ XSetIOErrorHandler(long /*int*/ handler) { + lock.lock(); + try { + return _XSetIOErrorHandler(handler); +@@ -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); ++public static final long /*int*/ XSetErrorHandler(long /*int*/ handler) { + lock.lock(); + try { + return _XSetErrorHandler(handler); +@@ -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); ++public static final int XSetInputFocus(long /*int*/ display, long /*int*/ window, int revert, int time) { + lock.lock(); + try { + return _XSetInputFocus(display, window, revert, time); +@@ -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); ++public static final int XSetTransientForHint(long /*int*/ display, long /*int*/ w, long /*int*/ prop_window) { + lock.lock(); + try { + return _XSetTransientForHint(display, w, prop_window); +@@ -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); ++public static final long /*int*/ XSynchronize(long /*int*/ display, boolean onoff) { + lock.lock(); + try { + return _XSynchronize(display, onoff); +@@ -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); ++public static final void XTestFakeButtonEvent(long /*int*/ display, int button, boolean is_press, long /*int*/ delay) { + lock.lock(); + try { + _XTestFakeButtonEvent(display, button, is_press, delay); +@@ -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); ++public static final void XTestFakeKeyEvent(long /*int*/ display, int keycode, boolean is_press, long /*int*/ delay) { + lock.lock(); + try { + _XTestFakeKeyEvent(display, keycode, is_press, delay); +@@ -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); ++public static final void XTestFakeMotionEvent(long /*int*/ display, int screen_number, int x, int y, long /*int*/ delay) { + lock.lock(); + try { + _XTestFakeMotionEvent(display, screen_number, x, y, delay); +@@ -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); ++public static final int XWarpPointer(long /*int*/ display, long /*int*/ sourceWindow, long /*int*/ destWindow, int sourceX, int sourceY, int sourceWidth, int sourceHeight, int destX, int destY) { + lock.lock(); + try { + return _XWarpPointer(display, sourceWindow, destWindow, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY); +@@ -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); ++public static final long /*int*/ gdk_x11_atom_to_xatom(long /*int*/ atom) { + lock.lock(); + try { + return _gdk_x11_atom_to_xatom(atom); +@@ -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); ++public static final long /*int*/ gdk_x11_colormap_get_xcolormap(long /*int*/ colormap) { + lock.lock(); + try { + return _gdk_x11_colormap_get_xcolormap(colormap); +@@ -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); ++public static final long /*int*/ gdk_x11_drawable_get_xdisplay(long /*int*/ drawable) { + lock.lock(); + try { + return _gdk_x11_drawable_get_xdisplay(drawable); +@@ -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); ++public static final long /*int*/ gdk_x11_drawable_get_xid(long /*int*/ drawable) { + lock.lock(); + try { + return _gdk_x11_drawable_get_xid(drawable); +@@ -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); ++public static final long /*int*/ gdk_x11_screen_lookup_visual(long /*int*/ screen, int xvisualid) { + lock.lock(); + try { + return _gdk_x11_screen_lookup_visual(screen, xvisualid); +@@ -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); ++public static final long /*int*/ gdk_x11_screen_get_window_manager_name(long /*int*/ screen) { + lock.lock(); + try { + return _gdk_x11_screen_get_window_manager_name(screen); +@@ -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); ++public static final long /*int*/ gdk_x11_visual_get_xvisual(long /*int*/ visual) { + lock.lock(); + try { + return _gdk_x11_visual_get_xvisual(visual); +@@ -1117,8 +1117,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_pixmap_foreign_new(int /*long*/ anid); +-public static final int /*long*/ gdk_pixmap_foreign_new(int /*long*/ anid) { ++public static final native long /*int*/ _gdk_pixmap_foreign_new(long /*int*/ anid); ++public static final long /*int*/ gdk_pixmap_foreign_new(long /*int*/ anid) { + lock.lock(); + try { + return _gdk_pixmap_foreign_new(anid); +@@ -1126,8 +1126,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_window_lookup(int /*long*/ xid); +-public static final int /*long*/ gdk_window_lookup(int /*long*/ xid) { ++public static final native long /*int*/ _gdk_window_lookup(long /*int*/ xid); ++public static final long /*int*/ gdk_window_lookup(long /*int*/ xid) { + lock.lock(); + try { + return _gdk_window_lookup(xid); +@@ -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); ++public static final void gdk_window_add_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data) { + lock.lock(); + try { + _gdk_window_add_filter(window, function, data); +@@ -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); ++public static final void gdk_window_remove_filter(long /*int*/ window, long /*int*/ function, long /*int*/ data) { + lock.lock(); + try { + _gdk_window_remove_filter(window, function, data); +@@ -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(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; +@@ -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); ++public static final boolean XRenderQueryExtension(long /*int*/ display, int[] event_basep, int[] error_basep) { + lock.lock(); + try { + return _XRenderQueryExtension(display, event_basep, error_basep); +@@ -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); ++public static final int XRenderQueryVersion(long /*int*/ display, int[] major_versionp, int[] minor_versionp) { + lock.lock(); + try { + return _XRenderQueryVersion(display, major_versionp, minor_versionp); +@@ -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); ++public static final long /*int*/ XRenderCreatePicture(long /*int*/ display, long /*int*/ drawable, long /*int*/ format, long /*int*/ valuemask, XRenderPictureAttributes attributes) { + lock.lock(); + try { + return _XRenderCreatePicture(display, drawable, format, valuemask, attributes); +@@ -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); ++public static final void XRenderSetPictureClipRectangles(long /*int*/ display, long /*int*/ picture, int xOrigin, int yOrigin, short[] rects, int count) { + lock.lock(); + try { + _XRenderSetPictureClipRectangles(display, picture, xOrigin, yOrigin, rects, count); +@@ -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); ++public static final void XRenderSetPictureTransform(long /*int*/ display, long /*int*/ picture, int[] transform) { + lock.lock(); + try { + _XRenderSetPictureTransform(display, picture, transform); +@@ -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); ++public static final void XRenderFreePicture(long /*int*/ display, long /*int*/ picture) { + lock.lock(); + try { + _XRenderFreePicture(display, picture); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _XRenderComposite(display, op, src, mask, dst, src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height); +@@ -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); ++public static final long /*int*/ XRenderFindStandardFormat(long /*int*/ display, int format) { + lock.lock(); + try { + return _XRenderFindStandardFormat(display, format); +@@ -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); ++public static final long /*int*/ XRenderFindVisualFormat(long /*int*/ display, long /*int*/ visual) { + lock.lock(); + try { + return _XRenderFindVisualFormat(display, visual); +@@ -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(); +@@ -1340,8 +1340,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _GDK_ROOT_PARENT(); +-public static final int /*long*/ GDK_ROOT_PARENT() { ++public static final native long /*int*/ _GDK_ROOT_PARENT(); ++public static final long /*int*/ GDK_ROOT_PARENT() { + lock.lock(); + try { + return _GDK_ROOT_PARENT(); +@@ -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(); ++public static final long /*int*/ GDK_TYPE_COLOR() { + lock.lock(); + try { + return _GDK_TYPE_COLOR(); +@@ -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(); ++public static final long /*int*/ GDK_TYPE_PIXBUF() { + lock.lock(); + try { + return _GDK_TYPE_PIXBUF(); +@@ -1369,8 +1369,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_BUTTON(int /*long*/ obj); +-public static final boolean GTK_IS_BUTTON(int /*long*/ obj) { ++public static final native boolean _GTK_IS_BUTTON(long /*int*/ obj); ++public static final boolean GTK_IS_BUTTON(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_BUTTON(obj); +@@ -1378,8 +1378,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_WINDOW(int /*long*/ obj); +-public static final boolean GTK_IS_WINDOW(int /*long*/ obj) { ++public static final native boolean _GTK_IS_WINDOW(long /*int*/ obj); ++public static final boolean GTK_IS_WINDOW(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_WINDOW(obj); +@@ -1387,8 +1387,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj); +-public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(int /*long*/ obj) { ++public static final native boolean _GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj); ++public static final boolean GTK_IS_CELL_RENDERER_PIXBUF(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_CELL_RENDERER_PIXBUF(obj); +@@ -1396,8 +1396,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj); +-public static final boolean GTK_IS_CELL_RENDERER_TEXT(int /*long*/ obj) { ++public static final native boolean _GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj); ++public static final boolean GTK_IS_CELL_RENDERER_TEXT(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_CELL_RENDERER_TEXT(obj); +@@ -1405,8 +1405,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj); +-public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(int /*long*/ obj) { ++public static final native boolean _GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj); ++public static final boolean GTK_IS_CELL_RENDERER_TOGGLE(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_CELL_RENDERER_TOGGLE(obj); +@@ -1414,8 +1414,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_CONTAINER(int /*long*/ obj); +-public static final boolean GTK_IS_CONTAINER(int /*long*/ obj) { ++public static final native boolean _GTK_IS_CONTAINER(long /*int*/ obj); ++public static final boolean GTK_IS_CONTAINER(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_CONTAINER(obj); +@@ -1423,8 +1423,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj); +-public static final boolean GTK_IS_IMAGE_MENU_ITEM(int /*long*/ obj) { ++public static final native boolean _GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj); ++public static final boolean GTK_IS_IMAGE_MENU_ITEM(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_IMAGE_MENU_ITEM(obj); +@@ -1432,8 +1432,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_MENU_ITEM(int /*long*/ obj); +-public static final boolean GTK_IS_MENU_ITEM(int /*long*/ obj) { ++public static final native boolean _GTK_IS_MENU_ITEM(long /*int*/ obj); ++public static final boolean GTK_IS_MENU_ITEM(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_MENU_ITEM(obj); +@@ -1441,8 +1441,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_IS_PLUG(int /*long*/ obj); +-public static final boolean GTK_IS_PLUG(int /*long*/ obj) { ++public static final native boolean _GTK_IS_PLUG(long /*int*/ obj); ++public static final boolean GTK_IS_PLUG(long /*int*/ obj) { + lock.lock(); + try { + return _GTK_IS_PLUG(obj); +@@ -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(); ++public static final long /*int*/ GTK_STOCK_CANCEL() { + lock.lock(); + try { + return _GTK_STOCK_CANCEL(); +@@ -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(); ++public static final long /*int*/ GTK_STOCK_OK() { + lock.lock(); + try { + return _GTK_STOCK_OK(); +@@ -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(); ++public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TEXT() { + lock.lock(); + try { + return _GTK_TYPE_CELL_RENDERER_TEXT(); +@@ -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(); ++public static final long /*int*/ GTK_TYPE_CELL_RENDERER_PIXBUF() { + lock.lock(); + try { + return _GTK_TYPE_CELL_RENDERER_PIXBUF(); +@@ -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(); ++public static final long /*int*/ GTK_TYPE_CELL_RENDERER_TOGGLE() { + lock.lock(); + try { + return _GTK_TYPE_CELL_RENDERER_TOGGLE(); +@@ -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(); ++public static final long /*int*/ GTK_TYPE_FIXED() { + lock.lock(); + try { + return _GTK_TYPE_FIXED(); +@@ -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(); ++public static final long /*int*/ GTK_TYPE_MENU() { + lock.lock(); + try { + return _GTK_TYPE_MENU(); +@@ -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(); ++public static final long /*int*/ GTK_TYPE_WIDGET() { + lock.lock(); + try { + return _GTK_TYPE_WIDGET(); +@@ -1539,8 +1539,8 @@ + lock.unlock(); + } + } +-public static final native int _GTK_WIDGET_FLAGS(int /*long*/ wid); +-public static final int GTK_WIDGET_FLAGS(int /*long*/ wid) { ++public static final native int _GTK_WIDGET_FLAGS(long /*int*/ wid); ++public static final int GTK_WIDGET_FLAGS(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_FLAGS(wid); +@@ -1548,8 +1548,8 @@ + lock.unlock(); + } + } +-public static final native int _GTK_WIDGET_STATE(int /*long*/ wid); +-public static final int GTK_WIDGET_STATE(int /*long*/ wid) { ++public static final native int _GTK_WIDGET_STATE(long /*int*/ wid); ++public static final int GTK_WIDGET_STATE(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_STATE(wid); +@@ -1557,8 +1557,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid); +-public static final boolean GTK_WIDGET_HAS_DEFAULT(int /*long*/ wid) { ++public static final native boolean _GTK_WIDGET_HAS_DEFAULT(long /*int*/ wid); ++public static final boolean GTK_WIDGET_HAS_DEFAULT(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_HAS_DEFAULT(wid); +@@ -1566,8 +1566,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_WIDGET_HAS_FOCUS(int /*long*/ wid); +-public static final boolean GTK_WIDGET_HAS_FOCUS(int /*long*/ wid) { ++public static final native boolean _GTK_WIDGET_HAS_FOCUS(long /*int*/ wid); ++public static final boolean GTK_WIDGET_HAS_FOCUS(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_HAS_FOCUS(wid); +@@ -1575,8 +1575,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_WIDGET_IS_SENSITIVE(int /*long*/ wid); +-public static final boolean GTK_WIDGET_IS_SENSITIVE(int /*long*/ wid) { ++public static final native boolean _GTK_WIDGET_IS_SENSITIVE(long /*int*/ wid); ++public static final boolean GTK_WIDGET_IS_SENSITIVE(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_IS_SENSITIVE(wid); +@@ -1584,8 +1584,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_WIDGET_MAPPED(int /*long*/ wid); +-public static final boolean GTK_WIDGET_MAPPED(int /*long*/ wid) { ++public static final native boolean _GTK_WIDGET_MAPPED(long /*int*/ wid); ++public static final boolean GTK_WIDGET_MAPPED(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_MAPPED(wid); +@@ -1593,8 +1593,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_WIDGET_SENSITIVE(int /*long*/ wid); +-public static final boolean GTK_WIDGET_SENSITIVE(int /*long*/ wid) { ++public static final native boolean _GTK_WIDGET_SENSITIVE(long /*int*/ wid); ++public static final boolean GTK_WIDGET_SENSITIVE(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_SENSITIVE(wid); +@@ -1602,8 +1602,8 @@ + lock.unlock(); + } + } +-public static final native void _GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag); +-public static final void GTK_WIDGET_SET_FLAGS(int /*long*/ wid, int flag) { ++public static final native void _GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag); ++public static final void GTK_WIDGET_SET_FLAGS(long /*int*/ wid, int flag) { + lock.lock(); + try { + _GTK_WIDGET_SET_FLAGS(wid, flag); +@@ -1611,8 +1611,8 @@ + lock.unlock(); + } + } +-public static final native void _GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag); +-public static final void GTK_WIDGET_UNSET_FLAGS(int /*long*/ wid, int flag) { ++public static final native void _GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag); ++public static final void GTK_WIDGET_UNSET_FLAGS(long /*int*/ wid, int flag) { + lock.lock(); + try { + _GTK_WIDGET_UNSET_FLAGS(wid, flag); +@@ -1620,8 +1620,8 @@ + lock.unlock(); + } + } +-public static final native boolean _GTK_WIDGET_VISIBLE(int /*long*/ wid); +-public static final boolean GTK_WIDGET_VISIBLE(int /*long*/ wid) { ++public static final native boolean _GTK_WIDGET_VISIBLE(long /*int*/ wid); ++public static final boolean GTK_WIDGET_VISIBLE(long /*int*/ wid) { + lock.lock(); + try { + return _GTK_WIDGET_VISIBLE(wid); +@@ -1629,8 +1629,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _G_OBJECT_CLASS (int /*long*/ klass); +-public static final int /*long*/ G_OBJECT_CLASS (int /*long*/ klass) { ++public static final native long /*int*/ _G_OBJECT_CLASS (long /*int*/ klass); ++public static final long /*int*/ G_OBJECT_CLASS (long /*int*/ klass) { + lock.lock(); + try { + return _G_OBJECT_CLASS(klass); +@@ -1638,8 +1638,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _G_OBJECT_GET_CLASS (int /*long*/ object); +-public static final int /*long*/ G_OBJECT_GET_CLASS (int /*long*/ object) { ++public static final native long /*int*/ _G_OBJECT_GET_CLASS (long /*int*/ object); ++public static final long /*int*/ G_OBJECT_GET_CLASS (long /*int*/ object) { + lock.lock(); + try { + return _G_OBJECT_GET_CLASS(object); +@@ -1647,8 +1647,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _G_OBJECT_TYPE_NAME (int /*long*/ object); +-public static final int /*long*/ G_OBJECT_TYPE_NAME (int /*long*/ object) { ++public static final native long /*int*/ _G_OBJECT_TYPE_NAME (long /*int*/ object); ++public static final long /*int*/ G_OBJECT_TYPE_NAME (long /*int*/ object) { + lock.lock(); + try { + return _G_OBJECT_TYPE_NAME(object); +@@ -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(); ++public static final long /*int*/ G_TYPE_BOOLEAN() { + lock.lock(); + try { + return _G_TYPE_BOOLEAN(); +@@ -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(); ++public static final long /*int*/ G_TYPE_INT() { + lock.lock(); + try { + return _G_TYPE_INT(); +@@ -1676,8 +1676,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _G_OBJECT_TYPE (int /*long*/ instance); +-public static final int /*long*/ G_OBJECT_TYPE (int /*long*/ instance) { ++public static final native long /*int*/ _G_OBJECT_TYPE (long /*int*/ instance); ++public static final long /*int*/ G_OBJECT_TYPE (long /*int*/ instance) { + lock.lock(); + try { + return _G_OBJECT_TYPE(instance); +@@ -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(); ++public static final long /*int*/ G_TYPE_STRING() { + lock.lock(); + try { + return _G_TYPE_STRING(); +@@ -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(); ++public static final long /*int*/ PANGO_TYPE_FONT_DESCRIPTION() { + lock.lock(); + try { + return _PANGO_TYPE_FONT_DESCRIPTION(); +@@ -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); ++public static final int dlclose(long /*int*/ handle) { + lock.lock(); + try { + return _dlclose(handle); +@@ -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); ++public static final long /*int*/ dlopen(byte[] filename, int flag) { + lock.lock(); + try { + return _dlopen(filename, flag); +@@ -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); ++public static final long /*int*/ dlsym(long /*int*/ handle, byte[] symbol) { + lock.lock(); + try { + return _dlsym(handle, symbol); +@@ -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); ++public static final long /*int*/ g_signal_add_emission_hook(int signal_id, int detail, long /*int*/ hook_func, long /*int*/ hook_data, long /*int*/ data_destroy) { + lock.lock(); + try { + return _g_signal_add_emission_hook(signal_id, detail, hook_func, hook_data, data_destroy); +@@ -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); ++public static final void g_signal_remove_emission_hook(int signal_id, long /*int*/ hook_id) { + lock.lock(); + try { + _g_signal_remove_emission_hook (signal_id, hook_id); +@@ -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); ++public static final long /*int*/ g_cclosure_new(long /*int*/ callback_func, long /*int*/ user_data, long /*int*/ destroy_data) { + lock.lock(); + try { + return _g_cclosure_new(callback_func, user_data, destroy_data); +@@ -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); ++public static final long /*int*/ g_closure_ref(long /*int*/ closure) { + lock.lock(); + try { + return _g_closure_ref(closure); +@@ -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); ++public static final void g_closure_unref(long /*int*/ closure) { + lock.lock(); + try { + _g_closure_unref(closure); +@@ -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); ++public static final boolean g_main_context_acquire(long /*int*/ context) { + lock.lock(); + try { + return _g_main_context_acquire(context); +@@ -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); ++public static final int g_main_context_check(long /*int*/ context, int max_priority, long /*int*/ fds, int n_fds) { + lock.lock(); + try { + return _g_main_context_check(context, max_priority, fds, n_fds); +@@ -1843,8 +1843,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _g_main_context_default(); +-public static final int /*long*/ g_main_context_default() { ++public static final native long /*int*/ _g_main_context_default(); ++public static final long /*int*/ g_main_context_default() { + lock.lock(); + try { + return _g_main_context_default(); +@@ -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); ++public static final boolean g_main_context_iteration(long /*int*/ context, boolean may_block) { + lock.lock(); + try { + return _g_main_context_iteration(context, may_block); +@@ -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); ++public static final boolean g_main_context_pending(long /*int*/ context) { + lock.lock(); + try { + return _g_main_context_pending(context); +@@ -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); ++public static final long /*int*/ g_main_context_get_poll_func(long /*int*/ context) { + lock.lock(); + try { + return _g_main_context_get_poll_func(context); +@@ -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); ++public static final boolean g_main_context_prepare(long /*int*/ context, int[] priority) { + lock.lock(); + try { + return _g_main_context_prepare(context, priority); +@@ -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); ++public static final int g_main_context_query(long /*int*/ context, int max_priority, int[] timeout_, long /*int*/ fds, int n_fds) { + lock.lock(); + try { + return _g_main_context_query(context, max_priority, timeout_, fds, n_fds); +@@ -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); ++public static final void g_main_context_release(long /*int*/ context) { + lock.lock(); + try { + _g_main_context_release(context); +@@ -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 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); +@@ -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); ++public static final long /*int*/ g_filename_to_uri(long /*int*/ filename, long /*int*/ hostname, long /*int*/[] error) { + lock.lock(); + try { + return _g_filename_to_uri(filename, hostname, error); +@@ -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); ++public static final long /*int*/ g_filename_from_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { + lock.lock(); + try { + return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error); +@@ -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); ++public static final long /*int*/ g_filename_from_uri(long /*int*/ uri, long /*int*/[] hostname, long /*int*/[] error) { + lock.lock(); + try { + return _g_filename_from_uri(uri, hostname, error); +@@ -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); ++public static final void g_free(long /*int*/ mem) { + lock.lock(); + try { + _g_free(mem); +@@ -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); ++public static final int g_idle_add(long /*int*/ function, long /*int*/ data) { + lock.lock(); + try { + return _g_idle_add(function, data); +@@ -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); ++public static final long /*int*/ g_list_append(long /*int*/ list, long /*int*/ data) { + lock.lock(); + try { + return _g_list_append(list, data); +@@ -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); ++public static final long /*int*/ g_list_data(long /*int*/ list) { + lock.lock(); + try { + return _g_list_data(list); +@@ -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); ++public static final void g_list_free(long /*int*/ list) { + lock.lock(); + try { + _g_list_free(list); +@@ -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); ++public static final void g_list_free_1(long /*int*/ list) { + lock.lock(); + try { + _g_list_free_1(list); +@@ -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); ++public static final int g_list_length(long /*int*/ list) { + lock.lock(); + try { + return _g_list_length(list); +@@ -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); ++public static final void g_list_set_next(long /*int*/ list, long /*int*/ llist) { + lock.lock(); + try { + _g_list_set_next(list, llist); +@@ -2066,8 +2066,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _g_list_next(int /*long*/ list); +-public static final int /*long*/ g_list_next(int /*long*/ list) { ++public static final native long /*int*/ _g_list_next(long /*int*/ list); ++public static final long /*int*/ g_list_next(long /*int*/ list) { + lock.lock(); + try { + return _g_list_next(list); +@@ -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); ++public static final long /*int*/ g_list_nth(long /*int*/ list, int n) { + lock.lock(); + try { + return _g_list_nth(list, n); +@@ -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); ++public static final long /*int*/ g_list_nth_data(long /*int*/ list, int n) { + lock.lock(); + try { + return _g_list_nth_data(list, n); +@@ -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); ++public static final long /*int*/ g_list_prepend(long /*int*/ list, long /*int*/ data) { + lock.lock(); + try { + return _g_list_prepend(list, data); +@@ -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); ++public static final void g_list_set_previous(long /*int*/ list, long /*int*/ llist) { + lock.lock(); + try { + _g_list_set_previous(list, llist); +@@ -2127,8 +2127,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _g_list_previous(int /*long*/ list); +-public static final int /*long*/ g_list_previous(int /*long*/ list) { ++public static final native long /*int*/ _g_list_previous(long /*int*/ list); ++public static final long /*int*/ g_list_previous(long /*int*/ list) { + lock.lock(); + try { + return _g_list_previous(list); +@@ -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); ++public static final long /*int*/ g_list_remove_link(long /*int*/ list, long /*int*/ link) { + lock.lock(); + try { + return _g_list_remove_link(list, link); +@@ -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); ++public static final long /*int*/ g_list_reverse(long /*int*/ list) { + lock.lock(); + try { + return _g_list_reverse(list); +@@ -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); ++public static final long /*int*/ g_locale_from_utf8(long /*int*/ utf8string, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { + lock.lock(); + try { + return _g_locale_from_utf8(utf8string, len, bytes_read, bytes_written, error); +@@ -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); ++public static final long /*int*/ g_locale_to_utf8(long /*int*/ opsysstring, long /*int*/ len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) { + lock.lock(); + try { + return _g_locale_to_utf8(opsysstring, len, bytes_read, bytes_written, error); +@@ -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); ++public static final void g_log_default_handler(long /*int*/ log_domain, int log_levels, long /*int*/ message, long /*int*/ unused_data) { + lock.lock(); + try { + _g_log_default_handler(log_domain, log_levels, message, unused_data); +@@ -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); ++public static final int g_log_set_handler(byte[] log_domain, int log_levels, long /*int*/ log_func, long /*int*/ user_data) { + lock.lock(); + try { + return _g_log_set_handler(log_domain, log_levels, log_func, user_data); +@@ -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); ++public static final long /*int*/ g_malloc(long /*int*/ size) { + lock.lock(); + try { + return _g_malloc(size); +@@ -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); ++public static final void g_object_get(long /*int*/ object, byte[] first_property_name, int[] value, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_get(object, first_property_name, value, terminator); +@@ -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); ++public static final long /*int*/ g_object_get_qdata(long /*int*/ object, int quark) { + lock.lock(); + try { + return _g_object_get_qdata(object, quark); +@@ -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); ++public static final long /*int*/ g_object_new (long /*int*/ type, long /*int*/ first_property_name) { + lock.lock(); + try { + return _g_object_new(type, first_property_name); +@@ -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); ++public static final long /*int*/ g_object_ref(long /*int*/ object) { + lock.lock(); + try { + return _g_object_ref(object); +@@ -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); ++public static final void g_object_set(long /*int*/ object, byte[] first_property_name, boolean data, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_set(object, first_property_name, data, terminator); +@@ -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); ++public static final void g_object_set(long /*int*/ object, byte[] first_property_name, GdkColor data, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_set(object, first_property_name, data, terminator); +@@ -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); ++public static final void g_object_set(long /*int*/ object, byte[] first_property_name, int data, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_set(object, first_property_name, data, terminator); +@@ -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); ++public static final void g_object_set(long /*int*/ object, byte[] first_property_name, float data, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_set(object, first_property_name, data, terminator); +@@ -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); ++public static final void g_object_set(long /*int*/ object, byte[] first_property_name, long data, long /*int*/ terminator) { + lock.lock(); + try { + _g_object_set(object, first_property_name, data, terminator); +@@ -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); ++public static final void g_object_set_qdata(long /*int*/ object, int quark, long /*int*/ data) { + lock.lock(); + try { + _g_object_set_qdata(object, quark, data); +@@ -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); ++public static final void g_object_unref(long /*int*/ object) { + lock.lock(); + try { + _g_object_unref(object); +@@ -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); ++public static final int g_signal_connect(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data) { + lock.lock(); + try { + return _g_signal_connect(instance, detailed_signal, proc, data); +@@ -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); ++public static final int g_signal_connect_closure(long /*int*/ instance, byte[] detailed_signal, long /*int*/ closure, boolean after) { + lock.lock(); + try { + return _g_signal_connect_closure(instance, detailed_signal, closure, after); +@@ -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); ++public static final int g_signal_connect_closure_by_id(long /*int*/ instance, int signal_id, int detail, long /*int*/ closure, boolean after) { + lock.lock(); + try { + return _g_signal_connect_closure_by_id(instance, signal_id, detail, closure, after); +@@ -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); ++public static final int g_signal_connect_after(long /*int*/ instance, byte[] detailed_signal, long /*int*/ proc, long /*int*/ data) { + lock.lock(); + try { + return _g_signal_connect_after(instance, detailed_signal, proc, data); +@@ -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); ++public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal) { + lock.lock(); + try { + _g_signal_emit_by_name(instance, detailed_signal); +@@ -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); ++public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data) { + lock.lock(); + try { + _g_signal_emit_by_name(instance, detailed_signal, data); +@@ -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); ++public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, long /*int*/ data1, long /*int*/ data2) { + lock.lock(); + try { + _g_signal_emit_by_name(instance, detailed_signal, data1, data2); +@@ -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); ++public static final void g_signal_emit_by_name(long /*int*/ instance, byte[] detailed_signal, byte [] data) { + lock.lock(); + try { + _g_signal_emit_by_name(instance, detailed_signal, data); +@@ -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); ++public static final void g_signal_handler_disconnect(long /*int*/ instance, int handler_id) { + lock.lock(); + try { + _g_signal_handler_disconnect(instance, handler_id); +@@ -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); ++public static final int g_signal_handlers_block_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) { + lock.lock(); + try { + return _g_signal_handlers_block_matched(instance, mask, signal_id, detail, closure, func, data); +@@ -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); ++public static final 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) { + lock.lock(); + try { + return _g_signal_handlers_disconnect_matched(instance, mask, signal_id, detail, closure, func, data); +@@ -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); ++public static final int g_signal_handlers_unblock_matched(long /*int*/ instance, int mask, int signal_id, int detail, long /*int*/ closure, long /*int*/ func, long /*int*/ data) { + lock.lock(); + try { + return _g_signal_handlers_unblock_matched(instance, mask, signal_id, detail, closure, func, data); +@@ -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); ++public static final int g_signal_lookup (byte[] name, long /*int*/ itype) { + lock.lock(); + try { + return _g_signal_lookup(name, itype); +@@ -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); ++public static final void g_signal_stop_emission_by_name(long /*int*/ instance, byte[] detailed_signal) { + lock.lock(); + try { + _g_signal_stop_emission_by_name(instance, detailed_signal); +@@ -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); ++public static final boolean /*long*/ g_source_remove (long /*int*/ tag) { + lock.lock(); + try { + return _g_source_remove(tag); +@@ -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); ++public static final long /*int*/ g_slist_data (long /*int*/ list) { + lock.lock(); + try { + return _g_slist_data(list); +@@ -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); ++public static final void g_slist_free (long /*int*/ list) { + lock.lock(); + try { + _g_slist_free(list); +@@ -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); ++public static final long /*int*/ g_slist_next (long /*int*/ list) { + lock.lock(); + try { + return _g_slist_next(list); +@@ -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); ++public static final int g_slist_length (long /*int*/ list) { + lock.lock(); + try { + return _g_slist_length(list); +@@ -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); ++public static final void g_strfreev(long /*int*/ string_array) { + lock.lock(); + try { + _g_strfreev(string_array); +@@ -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); ++public static final double g_strtod(long /*int*/ str, long /*int*/[] endptr) { + lock.lock(); + try { + return _g_strtod(str, endptr); +@@ -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); ++public static final void g_type_add_interface_static (long /*int*/ instance_type, long /*int*/ interface_type, long /*int*/ info) { + lock.lock(); + try { + _g_type_add_interface_static(instance_type, interface_type, info); +@@ -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); ++public static final long /*int*/ g_type_class_peek (long /*int*/ g_class) { + lock.lock(); + try { + return _g_type_class_peek(g_class); +@@ -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); ++public static final long /*int*/ g_type_class_peek_parent (long /*int*/ g_class) { + lock.lock(); + try { + return _g_type_class_peek_parent(g_class); +@@ -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); ++public static final long /*int*/ g_type_from_name (byte[] name) { + lock.lock(); + try { + return _g_type_from_name(name); +@@ -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); ++public static final long /*int*/ g_type_interface_peek_parent (long /*int*/ iface) { + lock.lock(); + try { + return _g_type_interface_peek_parent(iface); +@@ -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); ++public static final boolean g_type_is_a (long /*int*/ type, long /*int*/ is_a_type) { + lock.lock(); + try { + return _g_type_is_a(type, is_a_type); +@@ -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); ++public static final long /*int*/ g_type_name (long /*int*/ handle) { + lock.lock(); + try { + return _g_type_name(handle); +@@ -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); ++public static final long /*int*/ g_type_parent (long /*int*/ type) { + lock.lock(); + try { + return _g_type_parent(type); +@@ -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); ++public static final void g_type_query (long /*int*/ type, long /*int*/ query) { + lock.lock(); + try { + _g_type_query(type, query); +@@ -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); ++public static final long /*int*/ g_type_register_static (long /*int*/ parent_type, byte[] type_name, long /*int*/ info, int flags) { + lock.lock(); + try { + return _g_type_register_static(parent_type, type_name, info, flags); +@@ -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); ++public static final void g_thread_init(long /*int*/ vtable) { + lock.lock(); + try { + _g_thread_init(vtable); +@@ -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); ++public static final long /*int*/ g_utf16_to_utf8(char[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { + lock.lock(); + try { + return _g_utf16_to_utf8(str, len, items_read, items_written, error); +@@ -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); ++public static final long /*int*/ g_utf8_offset_to_pointer(long /*int*/ str, long /*int*/ offset) { + lock.lock(); + try { + return _g_utf8_offset_to_pointer(str, offset); +@@ -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); ++public static final long /*int*/ g_utf8_pointer_to_offset(long /*int*/ str, long /*int*/ pos) { + lock.lock(); + try { + return _g_utf8_pointer_to_offset(str, pos); +@@ -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); ++public static final long /*int*/ g_utf8_strlen(long /*int*/ str, long /*int*/ max) { + lock.lock(); + try { + return _g_utf8_strlen(str, max); +@@ -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); ++public static final long /*int*/ g_utf8_to_utf16(byte[] str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { + lock.lock(); + try { + return _g_utf8_to_utf16(str, len, items_read, items_written, error); +@@ -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); ++public static final long /*int*/ g_utf8_to_utf16(long /*int*/ str, long /*int*/ len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) { + lock.lock(); + try { + return _g_utf8_to_utf16(str, len, items_read, items_written, error); +@@ -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); ++public static final long /*int*/ g_value_peek_pointer (long /*int*/ value) { + lock.lock(); + try { + return _g_value_peek_pointer(value); +@@ -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); ++public static final long /*int*/ gdk_atom_intern(byte[] atom_name, boolean only_if_exists) { + lock.lock(); + try { + return _gdk_atom_intern(atom_name, only_if_exists); +@@ -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); ++public static final long /*int*/ gdk_atom_name(long /*int*/ atom) { + lock.lock(); + try { + return _gdk_atom_name(atom); +@@ -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); ++public static final long /*int*/ gdk_bitmap_create_from_data(long /*int*/ window, byte[] data, int width, int height) { + lock.lock(); + try { + return _gdk_bitmap_create_from_data(window, data, width, height); +@@ -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); ++public static final void gdk_cairo_region(long /*int*/ cairo, long /*int*/ region) { + lock.lock(); + try { + _gdk_cairo_region(cairo, region); +@@ -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); ++public static final void gdk_cairo_set_source_color(long /*int*/ cairo, GdkColor color) { + lock.lock(); + try { + _gdk_cairo_set_source_color(cairo, color); +@@ -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); ++public static final boolean gdk_color_white(long /*int*/ colormap, GdkColor color) { + lock.lock(); + try { + return _gdk_color_white(colormap, color); +@@ -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); ++public static final boolean gdk_colormap_alloc_color(long /*int*/ colormap, GdkColor color, boolean writeable, boolean best_match) { + lock.lock(); + try { + return _gdk_colormap_alloc_color(colormap, color, writeable, best_match); +@@ -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); ++public static final void gdk_colormap_free_colors(long /*int*/ colormap, GdkColor colors, int ncolors) { + lock.lock(); + try { + _gdk_colormap_free_colors(colormap, colors, ncolors); +@@ -3058,8 +3058,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_colormap_get_system(); +-public static final int /*long*/ gdk_colormap_get_system() { ++public static final native long /*int*/ _gdk_colormap_get_system(); ++public static final long /*int*/ gdk_colormap_get_system() { + lock.lock(); + try { + return _gdk_colormap_get_system(); +@@ -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); ++public static final void gdk_colormap_query_color(long /*int*/ colormap, long /*int*/ pixel, GdkColor result) { + lock.lock(); + try { + _gdk_colormap_query_color(colormap, pixel, result); +@@ -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); ++public static final void gdk_cursor_destroy(long /*int*/ cursor) { + lock.lock(); + try { + _gdk_cursor_destroy(cursor); +@@ -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); ++public static final long /*int*/ gdk_cursor_new(long /*int*/ cursor_type) { + lock.lock(); + try { + return _gdk_cursor_new(cursor_type); +@@ -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); ++public static final long /*int*/ gdk_cursor_new_from_pixmap(long /*int*/ source, long /*int*/ mask, GdkColor fg, GdkColor bg, int x, int y) { + lock.lock(); + try { + return _gdk_cursor_new_from_pixmap(source, mask, fg, bg, x, y); +@@ -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); ++public static final long /*int*/ gdk_cursor_new_from_pixbuf(long /*int*/ display, long /*int*/ pixbuf, int x, int y) { + lock.lock(); + try { + return _gdk_cursor_new_from_pixbuf(display, pixbuf, x, y); +@@ -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(); ++public static final long /*int*/ gdk_display_get_default() { + lock.lock(); + try { + return _gdk_display_get_default(); +@@ -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); ++public static final boolean gdk_display_supports_cursor_color(long /*int*/ display) { + lock.lock(); + try { + return _gdk_display_supports_cursor_color(display); +@@ -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); ++public static final void gdk_drag_status(long /*int*/ context, int action, int time) { + lock.lock(); + try { + _gdk_drag_status(context, action, time); +@@ -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); ++public static final void gdk_draw_arc(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height, int angle1, int angle2) { + lock.lock(); + try { + _gdk_draw_arc(drawable, gc, filled, x, y, width, height, angle1, angle2); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gdk_draw_drawable(drawable, gc, src, xsrc, ysrc, xdest, ydest, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gdk_draw_image(drawable, gc, image, xsrc, ysrc, xdest, ydest, width, height); +@@ -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); ++public static final void gdk_draw_layout(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout) { + lock.lock(); + try { + _gdk_draw_layout(drawable, gc, x, y, layout); +@@ -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); ++public static final void gdk_draw_layout_with_colors(long /*int*/ drawable, long /*int*/ gc, int x, int y, long /*int*/ layout, GdkColor foreground, GdkColor background) { + lock.lock(); + try { + _gdk_draw_layout_with_colors(drawable, gc, x, y, layout, foreground, background); +@@ -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); ++public static final void gdk_draw_line(long /*int*/ drawable, long /*int*/ gc, int x1, int y1, int x2, int y2) { + lock.lock(); + try { + _gdk_draw_line(drawable, gc, x1, y1, x2, y2); +@@ -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); ++public static final void gdk_draw_lines(long /*int*/ drawable, long /*int*/ gc, int[] points, int npoints) { + lock.lock(); + try { + _gdk_draw_lines(drawable, gc, points, npoints); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gdk_draw_pixbuf(drawable, gc, pixbuf, xsrc, ysrc, xdest, ydest, width, height, dither, x_dither, y_dither); +@@ -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); ++public static final void gdk_draw_point(long /*int*/ drawable, long /*int*/ gc, int x, int y) { + lock.lock(); + try { + _gdk_draw_point(drawable, gc, x, y); +@@ -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); ++public static final void gdk_draw_polygon(long /*int*/ drawable, long /*int*/ gc, int filled, int[] points, int npoints) { + lock.lock(); + try { + _gdk_draw_polygon(drawable, gc, filled, points, npoints); +@@ -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); ++public static final void gdk_draw_rectangle(long /*int*/ drawable, long /*int*/ gc, int filled, int x, int y, int width, int height) { + lock.lock(); + try { + _gdk_draw_rectangle(drawable, gc, filled, x, y, width, height); +@@ -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); ++public static final int gdk_drawable_get_depth(long /*int*/ drawable) { + lock.lock(); + try { + return _gdk_drawable_get_depth(drawable); +@@ -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); ++public static final long /*int*/ gdk_drawable_get_image(long /*int*/ drawable, int x, int y, int width, int height) { + lock.lock(); + try { + return _gdk_drawable_get_image(drawable, x, y, width, height); +@@ -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); ++public static final void gdk_drawable_get_size(long /*int*/ drawable, int[] width, int[] height) { + lock.lock(); + try { + _gdk_drawable_get_size(drawable, width, height); +@@ -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); ++public static final long /*int*/ gdk_drawable_get_visible_region(long /*int*/ drawable) { + lock.lock(); + try { + return _gdk_drawable_get_visible_region(drawable); +@@ -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); ++public static final long /*int*/ gdk_event_copy(long /*int*/ event) { + lock.lock(); + try { + return _gdk_event_copy(event); +@@ -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); ++public static final void gdk_event_free(long /*int*/ event) { + lock.lock(); + try { + _gdk_event_free(event); +@@ -3424,8 +3424,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_event_get(); +-public static final int /*long*/ gdk_event_get() { ++public static final native long /*int*/ _gdk_event_get(); ++public static final long /*int*/ gdk_event_get() { + lock.lock(); + try { + return _gdk_event_get(); +@@ -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); ++public static final boolean gdk_event_get_root_coords(long /*int*/ event, double[] px, double[] py) { + lock.lock(); + try { + return _gdk_event_get_root_coords(event, px, py); +@@ -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); ++public static final boolean gdk_event_get_coords(long /*int*/ event, double[] px, double[] py) { + lock.lock(); + try { + return _gdk_event_get_coords(event, px, py); +@@ -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); ++public static final long /*int*/ gdk_event_get_graphics_expose(long /*int*/ window) { + lock.lock(); + try { + return _gdk_event_get_graphics_expose(window); +@@ -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); ++public static final boolean gdk_event_get_state(long /*int*/ event, int[] pmod) { + lock.lock(); + try { + return _gdk_event_get_state(event, pmod); +@@ -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); ++public static final int gdk_event_get_time(long /*int*/ event) { + lock.lock(); + try { + return _gdk_event_get_time(event); +@@ -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); ++public static final void gdk_event_handler_set(long /*int*/ func, long /*int*/ data, long /*int*/ notify) { + lock.lock(); + try { + _gdk_event_handler_set(func, data, notify); +@@ -3508,8 +3508,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_event_new(int type); +-public static final int /*long*/ gdk_event_new(int type) { ++public static final native long /*int*/ _gdk_event_new(int type); ++public static final long /*int*/ gdk_event_new(int type) { + lock.lock(); + try { + return _gdk_event_new(type); +@@ -3517,8 +3517,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_event_peek(); +-public static final int /*long*/ gdk_event_peek() { ++public static final native long /*int*/ _gdk_event_peek(); ++public static final long /*int*/ gdk_event_peek() { + lock.lock(); + try { + return _gdk_event_peek(); +@@ -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); ++public static final void gdk_event_put(long /*int*/ event) { + lock.lock(); + try { + _gdk_event_put(event); +@@ -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); ++public static final void gdk_free_text_list(long /*int*/ list) { + lock.lock(); + try { + _gdk_free_text_list(list); +@@ -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); ++public static final void gdk_gc_get_values(long /*int*/ gc, GdkGCValues values) { + lock.lock(); + try { + _gdk_gc_get_values(gc, values); +@@ -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); ++public static final long /*int*/ gdk_gc_new(long /*int*/ window) { + lock.lock(); + try { + return _gdk_gc_new(window); +@@ -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); ++public static final void gdk_gc_set_background(long /*int*/ gc, GdkColor color) { + lock.lock(); + try { + _gdk_gc_set_background(gc, color); +@@ -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); ++public static final void gdk_gc_set_clip_mask(long /*int*/ gc, long /*int*/ mask) { + lock.lock(); + try { + _gdk_gc_set_clip_mask(gc, mask); +@@ -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); ++public static final void gdk_gc_set_clip_origin(long /*int*/ gc, int x, int y) { + lock.lock(); + try { + _gdk_gc_set_clip_origin(gc, x, y); +@@ -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); ++public static final void gdk_gc_set_clip_rectangle(long /*int*/ gc, GdkRectangle rectangle) { + lock.lock(); + try { + _gdk_gc_set_clip_rectangle(gc, rectangle); +@@ -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); ++public static final void gdk_gc_set_clip_region(long /*int*/ gc, long /*int*/ region) { + lock.lock(); + try { + _gdk_gc_set_clip_region(gc, region); +@@ -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); ++public static final void gdk_gc_set_dashes(long /*int*/ gc, int dash_offset, byte[] dash_list, int n) { + lock.lock(); + try { + _gdk_gc_set_dashes(gc, dash_offset, dash_list, n); +@@ -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); ++public static final void gdk_gc_set_exposures(long /*int*/ gc, boolean exposures) { + lock.lock(); + try { + _gdk_gc_set_exposures(gc, exposures); +@@ -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); ++public static final void gdk_gc_set_fill(long /*int*/ gc, int fill) { + lock.lock(); + try { + _gdk_gc_set_fill(gc, fill); +@@ -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); ++public static final void gdk_gc_set_foreground(long /*int*/ gc, GdkColor color) { + lock.lock(); + try { + _gdk_gc_set_foreground(gc, color); +@@ -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); ++public static final void gdk_gc_set_function(long /*int*/ gc, long /*int*/ function) { + lock.lock(); + try { + _gdk_gc_set_function(gc, function); +@@ -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); ++public static final void gdk_gc_set_line_attributes(long /*int*/ gc, int line_width, int line_style, int cap_style, int join_style) { + lock.lock(); + try { + _gdk_gc_set_line_attributes(gc, line_width, line_style, cap_style, join_style); +@@ -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); ++public static final void gdk_gc_set_stipple(long /*int*/ gc, long /*int*/ stipple) { + lock.lock(); + try { + _gdk_gc_set_stipple(gc, stipple); +@@ -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); ++public static final void gdk_gc_set_subwindow(long /*int*/ gc, long /*int*/ mode) { + lock.lock(); + try { + _gdk_gc_set_subwindow(gc, mode); +@@ -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); ++public static final void gdk_gc_set_tile(long /*int*/ gc, long /*int*/ tile) { + lock.lock(); + try { + _gdk_gc_set_tile(gc, tile); +@@ -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); ++public static final void gdk_gc_set_ts_origin(long /*int*/ gc, int x, int y) { + lock.lock(); + try { + _gdk_gc_set_ts_origin(gc, x, y); +@@ -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); ++public static final void gdk_gc_set_values(long /*int*/ gc, GdkGCValues values, int values_mask) { + lock.lock(); + try { + _gdk_gc_set_values(gc, values, values_mask); +@@ -3817,8 +3817,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_keymap_get_default(); +-public static final int /*long*/ gdk_keymap_get_default() { ++public static final native long /*int*/ _gdk_keymap_get_default(); ++public static final long /*int*/ gdk_keymap_get_default() { + lock.lock(); + try { + return _gdk_keymap_get_default(); +@@ -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); ++public static final boolean gdk_keymap_translate_keyboard_state (long /*int*/ keymap, int hardware_keycode, int state, int group, int[] keyval, int[] effective_group, int[] level, int[] consumed_modifiers) { + lock.lock(); + try { + return _gdk_keymap_translate_keyboard_state(keymap, hardware_keycode, state, group, keyval, effective_group, level, consumed_modifiers); +@@ -3861,8 +3861,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_pango_context_get(); +-public static final int /*long*/ gdk_pango_context_get() { ++public static final native long /*int*/ _gdk_pango_context_get(); ++public static final long /*int*/ gdk_pango_context_get() { + lock.lock(); + try { + return _gdk_pango_context_get(); +@@ -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); ++public static final void gdk_pango_context_set_colormap(long /*int*/ context, long /*int*/ colormap) { + lock.lock(); + try { + _gdk_pango_context_set_colormap(context, colormap); +@@ -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); ++public static final long /*int*/ gdk_pango_layout_get_clip_region(long /*int*/ layout, int x_origin, int y_origin, int[] index_ranges, int n_ranges) { + lock.lock(); + try { + return _gdk_pango_layout_get_clip_region(layout, x_origin, y_origin, index_ranges, n_ranges); +@@ -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); ++public static final void gdk_pixbuf_copy_area(long /*int*/ src_pixbuf, int src_x, int src_y, int width, int height, long /*int*/ dest_pixbuf, int dest_x, int dest_y) { + lock.lock(); + try { + _gdk_pixbuf_copy_area(src_pixbuf, src_x, src_y, width, height, dest_pixbuf, dest_x, dest_y); +@@ -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); ++public static final 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) { + lock.lock(); + try { + return _gdk_pixbuf_get_from_drawable(dest, src, cmap, src_x, src_y, dest_x, dest_y, width, height); +@@ -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); ++public static final boolean gdk_pixbuf_get_has_alpha(long /*int*/ pixbuf) { + lock.lock(); + try { + return _gdk_pixbuf_get_has_alpha(pixbuf); +@@ -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); ++public static final int gdk_pixbuf_get_height(long /*int*/ pixbuf) { + lock.lock(); + try { + return _gdk_pixbuf_get_height(pixbuf); +@@ -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); ++public static final long /*int*/ gdk_pixbuf_get_pixels(long /*int*/ pixbuf) { + lock.lock(); + try { + return _gdk_pixbuf_get_pixels(pixbuf); +@@ -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); ++public static final int gdk_pixbuf_get_rowstride(long /*int*/ pixbuf) { + lock.lock(); + try { + return _gdk_pixbuf_get_rowstride(pixbuf); +@@ -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); ++public static final int gdk_pixbuf_get_width(long /*int*/ pixbuf) { + lock.lock(); + try { + return _gdk_pixbuf_get_width(pixbuf); +@@ -3970,8 +3970,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_pixbuf_loader_new(); +-public static final int /*long*/ gdk_pixbuf_loader_new() { ++public static final native long /*int*/ _gdk_pixbuf_loader_new(); ++public static final long /*int*/ gdk_pixbuf_loader_new() { + lock.lock(); + try { + return _gdk_pixbuf_loader_new(); +@@ -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); ++public static final boolean gdk_pixbuf_loader_close(long /*int*/ loader, long /*int*/ [] error) { + lock.lock(); + try { + return _gdk_pixbuf_loader_close(loader, error); +@@ -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); ++public static final long /*int*/ gdk_pixbuf_loader_get_pixbuf(long /*int*/ loader) { + lock.lock(); + try { + return _gdk_pixbuf_loader_get_pixbuf(loader); +@@ -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); ++public static final boolean gdk_pixbuf_loader_write(long /*int*/ loader, long /*int*/ buffer, int count, long /*int*/ [] error) { + lock.lock(); + try { + return _gdk_pixbuf_loader_write(loader, buffer, count, error); +@@ -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); ++public static final long /*int*/ gdk_pixbuf_new(int colorspace, boolean has_alpha, int bits_per_sample, int width, int height) { + lock.lock(); + try { + return _gdk_pixbuf_new(colorspace, has_alpha, bits_per_sample, width, height); +@@ -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); ++public static final long /*int*/ gdk_pixbuf_new_from_file(byte[] filename, long /*int*/ [] error) { + lock.lock(); + try { + return _gdk_pixbuf_new_from_file(filename, error); +@@ -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); ++public static final 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) { + 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); +@@ -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); ++public static final 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) { + 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); +@@ -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); ++public static final void gdk_pixbuf_render_pixmap_and_mask(long /*int*/ pixbuf, long /*int*/[] pixmap_return, long /*int*/[] mask_return, int alpha_threshold) { + lock.lock(); + try { + _gdk_pixbuf_render_pixmap_and_mask(pixbuf, pixmap_return, mask_return, alpha_threshold); +@@ -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_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); ++public static final 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) { + 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); +@@ -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); ++public static final long /*int*/ gdk_pixbuf_scale_simple(long /*int*/ src, int dest_width, int dest_height, int interp_type) { + lock.lock(); + try { + return _gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type); +@@ -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); ++public static final long /*int*/ gdk_pixmap_new(long /*int*/ window, int width, int height, int depth) { + lock.lock(); + try { + return _gdk_pixmap_new(window, width, height, depth); +@@ -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); ++public static final int gdk_pointer_grab(long /*int*/ window, boolean owner_events, int event_mask, long /*int*/ confine_to, long /*int*/ cursor, int time) { + lock.lock(); + try { + return _gdk_pointer_grab(window, owner_events, event_mask, confine_to, cursor, time); +@@ -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); ++public static final boolean gdk_property_get(long /*int*/ window, long /*int*/ property, long /*int*/ type, long /*int*/ offset, long /*int*/ length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data) { + lock.lock(); + try { + return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data); +@@ -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); ++public static final void gdk_region_destroy(long /*int*/ region) { + lock.lock(); + try { + _gdk_region_destroy(region); +@@ -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); ++public static final boolean gdk_region_empty(long /*int*/ region) { + lock.lock(); + try { + return _gdk_region_empty(region); +@@ -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); ++public static final void gdk_region_get_clipbox(long /*int*/ region, GdkRectangle rectangle) { + lock.lock(); + try { + _gdk_region_get_clipbox(region, rectangle); +@@ -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); ++public static final void gdk_region_get_rectangles(long /*int*/ region, long /*int*/[] rectangles, int[] n_rectangles) { + lock.lock(); + try { + _gdk_region_get_rectangles(region, rectangles, n_rectangles); +@@ -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); ++public static final void gdk_region_intersect(long /*int*/ source1, long /*int*/ source2) { + lock.lock(); + try { + _gdk_region_intersect(source1, source2); +@@ -4265,8 +4265,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_region_new(); +-public static final int /*long*/ gdk_region_new() { ++public static final native long /*int*/ _gdk_region_new(); ++public static final long /*int*/ gdk_region_new() { + lock.lock(); + try { + return _gdk_region_new(); +@@ -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); ++public static final void gdk_region_offset(long /*int*/ region, int dx, int dy) { + lock.lock(); + try { + _gdk_region_offset(region, dx, dy); +@@ -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); ++public static final boolean gdk_region_point_in(long /*int*/ region, int x, int y) { + lock.lock(); + try { + return _gdk_region_point_in(region, x, y); +@@ -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); ++public static final long /*int*/ gdk_region_polygon(int[] points, int npoints, int fill_rule) { + lock.lock(); + try { + return _gdk_region_polygon(points, npoints, fill_rule); +@@ -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); ++public static final long /*int*/ gdk_region_rectangle(GdkRectangle rectangle) { + lock.lock(); + try { + return _gdk_region_rectangle(rectangle); +@@ -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); ++public static final long /*int*/ gdk_region_rect_in(long /*int*/ region, GdkRectangle rect) { + lock.lock(); + try { + return _gdk_region_rect_in(region, rect); +@@ -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); ++public static final void gdk_region_subtract(long /*int*/ source1, long /*int*/ source2) { + lock.lock(); + try { + _gdk_region_subtract(source1, source2); +@@ -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); ++public static final void gdk_region_union(long /*int*/ source1, long /*int*/ source2) { + lock.lock(); + try { + _gdk_region_union(source1, source2); +@@ -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); ++public static final void gdk_region_union_with_rect(long /*int*/ region, GdkRectangle rect) { + lock.lock(); + try { + _gdk_region_union_with_rect(region, rect); +@@ -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(); ++public static final long /*int*/ gdk_screen_get_default() { + lock.lock(); + try { + return _gdk_screen_get_default(); +@@ -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); ++public static final int gdk_screen_get_monitor_at_point (long /*int*/ screen, int x, int y) { + lock.lock(); + try { + return _gdk_screen_get_monitor_at_point (screen, x, y); +@@ -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); ++public static final int gdk_screen_get_monitor_at_window(long /*int*/ screen, long /*int*/ window) { + lock.lock(); + try { + return _gdk_screen_get_monitor_at_window(screen, window); +@@ -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); ++public static final void gdk_screen_get_monitor_geometry (long /*int*/ screen, int monitor_num, GdkRectangle dest) { + lock.lock(); + try { + _gdk_screen_get_monitor_geometry(screen, monitor_num, dest); +@@ -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); ++public static final int gdk_screen_get_n_monitors(long /*int*/ screen) { + lock.lock(); + try { + return _gdk_screen_get_n_monitors(screen); +@@ -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); ++public static final int gdk_screen_get_number(long /*int*/ screen) { + lock.lock(); + try { + return _gdk_screen_get_number(screen); +@@ -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); ++public static final boolean gdk_utf8_to_compound_text(byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) { + lock.lock(); + try { + return _gdk_utf8_to_compound_text(str, encoding, format, ctext, length); +@@ -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); ++public static final long /*int*/ gdk_utf8_to_string_target(byte[] str) { + lock.lock(); + try { + return _gdk_utf8_to_string_target(str); +@@ -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); ++public static final int gdk_text_property_to_utf8_list (long /*int*/ encoding, int format, long /*int*/ text, int length, long /*int*/[] list) { + lock.lock(); + try { + return _gdk_text_property_to_utf8_list(encoding, format, text, length, list); +@@ -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); ++public static final void gtk_tooltip_trigger_tooltip_query (long /*int*/ display){ + lock.lock(); + try { + _gtk_tooltip_trigger_tooltip_query (display); +@@ -4565,8 +4565,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gdk_visual_get_system(); +-public static final int /*long*/ gdk_visual_get_system() { ++public static final native long /*int*/ _gdk_visual_get_system(); ++public static final long /*int*/ gdk_visual_get_system() { + lock.lock(); + try { + return _gdk_visual_get_system(); +@@ -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); ++public static final long /*int*/ gdk_window_at_pointer(int[] win_x, int[] win_y) { + lock.lock(); + try { + return _gdk_window_at_pointer(win_x, win_y); +@@ -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); ++public static final void gdk_window_begin_paint_rect(long /*int*/ window, GdkRectangle rectangle) { + lock.lock(); + try { + _gdk_window_begin_paint_rect(window, rectangle); +@@ -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); ++public static final void gdk_window_clear_area(long /*int*/ window, int x, int y, int width, int height) { + lock.lock(); + try { + _gdk_window_clear_area(window, x, y, width, height); +@@ -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); ++public static final void gdk_window_destroy(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_destroy(window); +@@ -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); ++public static final void gdk_window_end_paint(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_end_paint(window); +@@ -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); ++public static final long /*int*/ gdk_window_get_children(long /*int*/ window) { + lock.lock(); + try { + return _gdk_window_get_children(window); +@@ -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); ++public static final int gdk_window_get_events(long /*int*/ window) { + lock.lock(); + try { + return _gdk_window_get_events(window); +@@ -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); ++public static final void gdk_window_focus(long /*int*/ window, int timestamp) { + lock.lock(); + try { + _gdk_window_focus(window, timestamp); +@@ -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); ++public static final void gdk_window_freeze_updates(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_freeze_updates(window); +@@ -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); ++public static final void gdk_window_get_frame_extents(long /*int*/ window, GdkRectangle rect) { + lock.lock(); + try { + _gdk_window_get_frame_extents(window, rect); +@@ -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); ++public static final void gdk_window_get_internal_paint_info(long /*int*/ window, long /*int*/ [] real_drawable, int[] x_offset, int[] y_offset) { + lock.lock(); + try { + _gdk_window_get_internal_paint_info(window, real_drawable, x_offset, y_offset); +@@ -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); ++public static final int gdk_window_get_origin(long /*int*/ window, int[] x, int[] y) { + lock.lock(); + try { + return _gdk_window_get_origin(window, x, y); +@@ -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); ++public static final long /*int*/ gdk_window_get_parent(long /*int*/ window) { + lock.lock(); + try { + return _gdk_window_get_parent(window); +@@ -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); ++public static final long /*int*/ gdk_window_get_pointer(long /*int*/ window, int[] x, int[] y, int[] mask) { + lock.lock(); + try { + return _gdk_window_get_pointer(window, x, y, mask); +@@ -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); ++public static final void gdk_window_get_position(long /*int*/ window, int[] x, int[] y) { + lock.lock(); + try { + _gdk_window_get_position(window, x, y); +@@ -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); ++public static final void gdk_window_get_user_data(long /*int*/ window, long /*int*/[] data) { + lock.lock(); + try { + _gdk_window_get_user_data(window, data); +@@ -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); ++public static final void gdk_window_hide(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_hide(window); +@@ -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); ++public static final void gdk_window_invalidate_rect(long /*int*/ window, GdkRectangle rectangle, boolean invalidate_children) { + lock.lock(); + try { + _gdk_window_invalidate_rect(window, rectangle, invalidate_children); +@@ -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); ++public static final void gdk_window_invalidate_region(long /*int*/ window, long /*int*/ region, boolean invalidate_children) { + lock.lock(); + try { + _gdk_window_invalidate_region(window, region, invalidate_children); +@@ -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); ++public static final boolean gdk_window_is_visible(long /*int*/ window) { + lock.lock(); + try { + return _gdk_window_is_visible(window); +@@ -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); ++public static final void gdk_window_move(long /*int*/ window, int x, int y) { + lock.lock(); + try { + _gdk_window_move(window, x, y); +@@ -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); ++public static final long /*int*/ gdk_window_new(long /*int*/ parent, GdkWindowAttr attributes, int attributes_mask) { + lock.lock(); + try { + return _gdk_window_new(parent, attributes, attributes_mask); +@@ -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); ++public static final void gdk_window_lower(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_lower(window); +@@ -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); ++public static final void gdk_window_process_updates(long /*int*/ window, boolean update_children) { + lock.lock(); + try { + _gdk_window_process_updates(window, update_children); +@@ -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); ++public static final void gdk_window_raise(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_raise(window); +@@ -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); ++public static final void gdk_window_resize(long /*int*/ window, int width, int height) { + lock.lock(); + try { + _gdk_window_resize(window, width, height); +@@ -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); ++public static final void gdk_window_scroll(long /*int*/ window, int dx, int dy) { + lock.lock(); + try { + _gdk_window_scroll(window, dx, dy); +@@ -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); ++public static final void gdk_window_set_accept_focus(long /*int*/ window, boolean accept_focus) { + lock.lock(); + try { + _gdk_window_set_accept_focus(window, accept_focus); +@@ -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); ++public static final void gdk_window_set_back_pixmap(long /*int*/ window, long /*int*/ pixmap, boolean parent_relative) { + lock.lock(); + try { + _gdk_window_set_back_pixmap(window, pixmap, parent_relative); +@@ -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); ++public static final void gdk_window_set_cursor(long /*int*/ window, long /*int*/ cursor) { + lock.lock(); + try { + _gdk_window_set_cursor(window, cursor); +@@ -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); ++public static final void gdk_window_set_decorations(long /*int*/ window, int decorations) { + lock.lock(); + try { + _gdk_window_set_decorations(window, decorations); +@@ -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); ++public static final void gdk_window_set_events(long /*int*/ window, int event_mask) { + lock.lock(); + try { + _gdk_window_set_events(window, event_mask); +@@ -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); ++public static final void gdk_window_set_icon(long /*int*/ window, long /*int*/ icon_window, long /*int*/ pixmap, long /*int*/ mask) { + lock.lock(); + try { + _gdk_window_set_icon(window, icon_window, pixmap, mask); +@@ -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); ++public static final void gdk_window_set_icon_list(long /*int*/ window, long /*int*/ pixbufs) { + lock.lock(); + try { + _gdk_window_set_icon_list(window, pixbufs); +@@ -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); ++public static final void gdk_window_set_keep_above(long /*int*/ window, boolean setting) { + lock.lock(); + try { + _gdk_window_set_keep_above(window, setting); +@@ -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); ++public static final void gdk_window_set_override_redirect(long /*int*/ window, boolean override_redirect) { + lock.lock(); + try { + _gdk_window_set_override_redirect(window, override_redirect); +@@ -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); ++public static final void gdk_window_set_user_data(long /*int*/ window, long /*int*/ user_data) { + lock.lock(); + try { + _gdk_window_set_user_data(window, user_data); +@@ -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); ++public static final void gdk_window_shape_combine_region (long /*int*/ window, long /*int*/ shape_region, int offset_x, int offset_y) { + lock.lock(); + try { + _gdk_window_shape_combine_region(window, shape_region, offset_x, offset_y); +@@ -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); ++public static final void gdk_window_show(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_show(window); +@@ -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); ++public static final void gdk_window_show_unraised(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_show_unraised(window); +@@ -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); ++public static final void gdk_window_thaw_updates(long /*int*/ window) { + lock.lock(); + try { + _gdk_window_thaw_updates(window); +@@ -5082,8 +5082,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_accel_group_new(); +-public static final int /*long*/ gtk_accel_group_new() { ++public static final native long /*int*/ _gtk_accel_group_new(); ++public static final long /*int*/ gtk_accel_group_new() { + lock.lock(); + try { + return _gtk_accel_group_new(); +@@ -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); ++public static final boolean gtk_accel_groups_activate(long /*int*/ accelGroup, int accelKey, int accelMods) { + lock.lock(); + try { + return _gtk_accel_groups_activate(accelGroup, accelKey, accelMods); +@@ -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); ++public static final void gtk_accel_label_set_accel_widget(long /*int*/ accel_label, long /*int*/ accel_widget) { + lock.lock(); + try { + _gtk_accel_label_set_accel_widget(accel_label, accel_widget); +@@ -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); ++public static final void gtk_adjustment_changed(long /*int*/ adjustment) { + lock.lock(); + try { + _gtk_adjustment_changed(adjustment); +@@ -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); ++public static final long /*int*/ gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size) { + lock.lock(); + try { + return _gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size); +@@ -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); ++public static final void gtk_adjustment_set_value(long /*int*/ adjustment, double value) { + lock.lock(); + try { + _gtk_adjustment_set_value(adjustment, value); +@@ -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); ++public static final void gtk_adjustment_value_changed(long /*int*/ adjustment) { + lock.lock(); + try { + _gtk_adjustment_value_changed(adjustment); +@@ -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); ++public static final long /*int*/ gtk_arrow_new(int arrow_type, int shadow_type) { + lock.lock(); + try { + return _gtk_arrow_new(arrow_type, shadow_type); +@@ -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); ++public static final void gtk_arrow_set(long /*int*/ arrow, int arrow_type, int shadow_type) { + lock.lock(); + try { + _gtk_arrow_set(arrow, arrow_type, shadow_type); +@@ -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); ++public static final long /*int*/ gtk_bin_get_child(long /*int*/ bin) { + lock.lock(); + try { + return _gtk_bin_get_child(bin); +@@ -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); ++public static final void gtk_box_set_spacing(long /*int*/ box, int spacing) { + lock.lock(); + try { + _gtk_box_set_spacing(box, spacing); +@@ -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); ++public static final void gtk_box_set_child_packing(long /*int*/ box, long /*int*/ child, boolean expand, boolean fill, int padding, int pack_type) { + lock.lock(); + try { + _gtk_box_set_child_packing(box, child, expand, fill, padding, pack_type); +@@ -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); ++public static final void gtk_button_clicked(long /*int*/ button) { + lock.lock(); + try { + _gtk_button_clicked(button); +@@ -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); ++public static final int gtk_button_get_relief(long /*int*/ button) { + lock.lock(); + try { + return _gtk_button_get_relief(button); +@@ -5257,8 +5257,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_button_new(); +-public static final int /*long*/ gtk_button_new() { ++public static final native long /*int*/ _gtk_button_new(); ++public static final long /*int*/ gtk_button_new() { + lock.lock(); + try { + return _gtk_button_new(); +@@ -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); ++public static final void gtk_button_set_relief(long /*int*/ button, int newstyle) { + lock.lock(); + try { + _gtk_button_set_relief(button, newstyle); +@@ -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(); ++public static final long /*int*/ gtk_calendar_new() { + lock.lock(); + try { + return _gtk_calendar_new(); +@@ -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); ++public static final boolean /*long*/ gtk_calendar_select_month(long /*int*/ calendar, int month, int year) { + lock.lock(); + try { + return _gtk_calendar_select_month(calendar, month, year); +@@ -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); ++public static final void gtk_calendar_select_day(long /*int*/ calendar, int day) { + lock.lock(); + try { + _gtk_calendar_select_day(calendar, day); +@@ -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); ++public static final void gtk_calendar_set_display_options(long /*int*/ calendar, int flags) { + lock.lock(); + try { + _gtk_calendar_set_display_options(calendar, flags); +@@ -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); ++public static final void gtk_calendar_display_options(long /*int*/ calendar, int flags) { + lock.lock(); + try { + _gtk_calendar_display_options(calendar, flags); +@@ -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); ++public static final void gtk_calendar_get_date(long /*int*/ calendar, int[] year, int[] month, int[] day) { + lock.lock(); + try { + _gtk_calendar_get_date(calendar, year, month, day); +@@ -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); ++public static final void gtk_cell_layout_clear(long /*int*/ cell_layout) { + lock.lock(); + try { + _gtk_cell_layout_clear(cell_layout); +@@ -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); ++public static final void gtk_cell_layout_set_attributes(long /*int*/ cell_layout, long /*int*/ cell, byte[] attribute, int column, long /*int*/ sentinel) { + lock.lock(); + try { + _gtk_cell_layout_set_attributes(cell_layout, cell, attribute, column, sentinel); +@@ -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); ++public static final void gtk_cell_layout_pack_start(long /*int*/ cell_layout, long /*int*/ cell, boolean expand) { + lock.lock(); + try { + _gtk_cell_layout_pack_start(cell_layout, cell, expand); +@@ -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); ++public static final void gtk_cell_renderer_get_size(long /*int*/ cell, long /*int*/ widget, GdkRectangle area, int[] x_offset, int[] y_offset, int[] width, int[] height) { + lock.lock(); + try { + _gtk_cell_renderer_get_size(cell, widget, area, x_offset, y_offset, width, height); +@@ -5410,8 +5410,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_cell_renderer_pixbuf_new(); +-public static final int /*long*/ gtk_cell_renderer_pixbuf_new() { ++public static final native long /*int*/ _gtk_cell_renderer_pixbuf_new(); ++public static final long /*int*/ gtk_cell_renderer_pixbuf_new() { + lock.lock(); + try { + return _gtk_cell_renderer_pixbuf_new(); +@@ -5419,8 +5419,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_cell_renderer_text_new(); +-public static final int /*long*/ gtk_cell_renderer_text_new() { ++public static final native long /*int*/ _gtk_cell_renderer_text_new(); ++public static final long /*int*/ gtk_cell_renderer_text_new() { + lock.lock(); + try { + return _gtk_cell_renderer_text_new(); +@@ -5428,8 +5428,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_cell_renderer_toggle_new(); +-public static final int /*long*/ gtk_cell_renderer_toggle_new() { ++public static final native long /*int*/ _gtk_cell_renderer_toggle_new(); ++public static final long /*int*/ gtk_cell_renderer_toggle_new() { + lock.lock(); + try { + return _gtk_cell_renderer_toggle_new(); +@@ -5437,8 +5437,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_check_button_new(); +-public static final int /*long*/ gtk_check_button_new() { ++public static final native long /*int*/ _gtk_check_button_new(); ++public static final long /*int*/ gtk_check_button_new() { + lock.lock(); + try { + return _gtk_check_button_new(); +@@ -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); ++public static final boolean gtk_check_menu_item_get_active(long /*int*/ check_menu_item) { + lock.lock(); + try { + return _gtk_check_menu_item_get_active(check_menu_item); +@@ -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); ++public static final long /*int*/ gtk_check_menu_item_new_with_label(byte[] label) { + lock.lock(); + try { + return _gtk_check_menu_item_new_with_label(label); +@@ -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); ++public static final void gtk_check_menu_item_set_active(long /*int*/ wid, boolean active) { + lock.lock(); + try { + _gtk_check_menu_item_set_active(wid, active); +@@ -5479,8 +5479,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_check_version(int required_major, int required_minor, int required_micro); +-public static final int /*long*/ gtk_check_version(int required_major, int required_minor, int required_micro) { ++public static final native long /*int*/ _gtk_check_version(int required_major, int required_minor, int required_micro); ++public static final long /*int*/ gtk_check_version(int required_major, int required_minor, int required_micro) { + lock.lock(); + try { + return _gtk_check_version(required_major, required_minor, required_micro); +@@ -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); ++public static final void gtk_clipboard_clear(long /*int*/ clipboard) { + lock.lock(); + try { + _gtk_clipboard_clear(clipboard); +@@ -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); ++public static final long /*int*/ gtk_clipboard_get(long /*int*/ selection) { + lock.lock(); + try { + return _gtk_clipboard_get(selection); +@@ -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); ++public static final 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) { + lock.lock(); + try { + return _gtk_clipboard_set_with_data(clipboard, target, n_targets, get_func, clear_func, user_data); +@@ -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); ++public static final long /*int*/ gtk_clipboard_wait_for_contents(long /*int*/ clipboard, long /*int*/ target) { + lock.lock(); + try { + return _gtk_clipboard_wait_for_contents(clipboard, target); +@@ -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); ++public static final long /*int*/ gtk_color_selection_dialog_new(byte[] title) { + lock.lock(); + try { + return _gtk_color_selection_dialog_new(title); +@@ -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); ++public static final void gtk_color_selection_get_current_color(long /*int*/ colorsel, GdkColor color) { + lock.lock(); + try { + _gtk_color_selection_get_current_color(colorsel, color); +@@ -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); ++public static final void gtk_color_selection_set_current_color(long /*int*/ colorsel, GdkColor color) { + lock.lock(); + try { + _gtk_color_selection_set_current_color(colorsel, color); +@@ -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); ++public static final void gtk_color_selection_set_has_palette(long /*int*/ colorsel, boolean has_palette) { + lock.lock(); + try { + _gtk_color_selection_set_has_palette(colorsel, has_palette); +@@ -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); ++public static final void gtk_combo_disable_activate(long /*int*/ combo) { + lock.lock(); + try { + _gtk_combo_disable_activate(combo); +@@ -5594,8 +5594,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_combo_new(); +-public static final int /*long*/ gtk_combo_new() { ++public static final native long /*int*/ _gtk_combo_new(); ++public static final long /*int*/ gtk_combo_new() { + lock.lock(); + try { + return _gtk_combo_new(); +@@ -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); ++public static final void gtk_combo_set_case_sensitive(long /*int*/ combo, boolean val) { + lock.lock(); + try { + _gtk_combo_set_case_sensitive(combo, val); +@@ -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); ++public static final void gtk_combo_box_set_focus_on_click(long /*int*/ combo, boolean val) { + lock.lock(); + try { + _gtk_combo_box_set_focus_on_click(combo, val); +@@ -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); ++public static final void gtk_combo_set_popdown_strings(long /*int*/ combo, long /*int*/ strings) { + lock.lock(); + try { + _gtk_combo_set_popdown_strings(combo, strings); +@@ -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(); ++public static final long /*int*/ gtk_combo_box_entry_new_text() { + lock.lock(); + try { + return _gtk_combo_box_entry_new_text(); +@@ -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(); ++public static final long /*int*/ gtk_combo_box_new_text() { + lock.lock(); + try { + return _gtk_combo_box_new_text(); +@@ -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); ++public static final void gtk_combo_box_insert_text(long /*int*/ combo_box, int position, byte[] text) { + lock.lock(); + try { + _gtk_combo_box_insert_text(combo_box, position, text); +@@ -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); ++public static final void gtk_combo_box_remove_text(long /*int*/ combo_box, int position) { + lock.lock(); + try { + _gtk_combo_box_remove_text(combo_box, position); +@@ -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); ++public static final int gtk_combo_box_get_active(long /*int*/ combo_box) { + lock.lock(); + try { + return _gtk_combo_box_get_active(combo_box); +@@ -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); ++public static final long /*int*/ gtk_combo_box_get_model(long /*int*/ combo_box) { + lock.lock(); + try { + return _gtk_combo_box_get_model(combo_box); +@@ -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); ++public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int index) { + lock.lock(); + try { + _gtk_combo_box_set_active(combo_box, index); +@@ -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); ++public static final void gtk_combo_box_popup(long /*int*/ combo_box) { + lock.lock(); + try { + _gtk_combo_box_popup(combo_box); +@@ -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); ++public static final void gtk_combo_box_popdown(long /*int*/ combo_box) { + lock.lock(); + try { + _gtk_combo_box_popdown(combo_box); +@@ -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); ++public static final void gtk_container_add(long /*int*/ container, long /*int*/ widget) { + lock.lock(); + try { + _gtk_container_add(container, widget); +@@ -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); ++public static final void gtk_container_forall(long /*int*/ container, long /*int*/ callback, long /*int*/ callback_data) { + lock.lock(); + try { + _gtk_container_forall(container, callback, callback_data); +@@ -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); ++public static final int gtk_container_get_border_width(long /*int*/ container) { + lock.lock(); + try { + return _gtk_container_get_border_width(container); +@@ -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); ++public static final long /*int*/ gtk_container_get_children(long /*int*/ container) { + lock.lock(); + try { + return _gtk_container_get_children(container); +@@ -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); ++public static final void gtk_container_remove(long /*int*/ container, long /*int*/ widget) { + lock.lock(); + try { + _gtk_container_remove(container, widget); +@@ -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); ++public static final void gtk_container_resize_children(long /*int*/ container) { + lock.lock(); + try { + _gtk_container_resize_children(container); +@@ -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); ++public static final void gtk_container_set_border_width(long /*int*/ container, int border_width) { + lock.lock(); + try { + _gtk_container_set_border_width(container, border_width); +@@ -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); ++public static final long /*int*/ gtk_dialog_add_button(long /*int*/ dialog, byte[] button_text, int response_id) { + lock.lock(); + try { + return _gtk_dialog_add_button(dialog, button_text, response_id); +@@ -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); ++public static final int gtk_dialog_run(long /*int*/ dialog) { + lock.lock(); + try { + return _gtk_dialog_run(dialog); +@@ -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); ++public static final long /*int*/ gtk_drag_begin(long /*int*/ widget, long /*int*/ targets, int actions, int button, long /*int*/ event) { + lock.lock(); + try { + return _gtk_drag_begin(widget, targets, actions, button, event); +@@ -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); ++public static final boolean gtk_drag_check_threshold(long /*int*/ widget, int start_x, int start_y, int current_x, int current_y) { + lock.lock(); + try { + return _gtk_drag_check_threshold(widget, start_x, start_y, current_x, current_y); +@@ -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); ++public static final long /*int*/ gtk_drag_dest_find_target(long /*int*/ widget, long /*int*/ context, long /*int*/ target_list) { + lock.lock(); + try { + return _gtk_drag_dest_find_target(widget, context, target_list); +@@ -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); ++public static final void gtk_drag_dest_set(long /*int*/ widget, int flags, long /*int*/ targets, int n_targets, int actions) { + lock.lock(); + try { + _gtk_drag_dest_set(widget, flags, targets, n_targets, actions); +@@ -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); ++public static final void gtk_drag_dest_unset(long /*int*/ widget) { + lock.lock(); + try { + _gtk_drag_dest_unset(widget); +@@ -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); ++public static final void gtk_drag_finish(long /*int*/ context, boolean success, boolean delete, int time) { + lock.lock(); + try { + _gtk_drag_finish(context, success, delete, time); +@@ -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); ++public static final void gtk_drag_get_data(long /*int*/ widget, long /*int*/ context, long /*int*/ target, int time) { + lock.lock(); + try { + _gtk_drag_get_data(widget, context, target, time); +@@ -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); ++public static final void gtk_drag_set_icon_pixbuf(long /*int*/ context, long /*int*/ pixbuf, int hot_x, int hot_y) { + lock.lock(); + try { + _gtk_drag_set_icon_pixbuf(context, pixbuf, hot_x, hot_y); +@@ -5951,8 +5951,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_drawing_area_new(); +-public static final int /*long*/ gtk_drawing_area_new() { ++public static final native long /*int*/ _gtk_drawing_area_new(); ++public static final long /*int*/ gtk_drawing_area_new() { + lock.lock(); + try { + return _gtk_drawing_area_new(); +@@ -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); ++public static final void gtk_editable_copy_clipboard(long /*int*/ editable) { + lock.lock(); + try { + _gtk_editable_copy_clipboard(editable); +@@ -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); ++public static final void gtk_editable_cut_clipboard(long /*int*/ editable) { + lock.lock(); + try { + _gtk_editable_cut_clipboard(editable); +@@ -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); ++public static final void gtk_editable_delete_selection(long /*int*/ editable) { + lock.lock(); + try { + _gtk_editable_delete_selection(editable); +@@ -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); ++public static final void gtk_editable_delete_text(long /*int*/ editable, int start_pos, int end_pos) { + lock.lock(); + try { + _gtk_editable_delete_text(editable, start_pos, end_pos); +@@ -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); ++public static final long /*int*/ gtk_editable_get_chars(long /*int*/ editable, int start_pos, int end_pos) { + lock.lock(); + try { + return _gtk_editable_get_chars(editable, start_pos, end_pos); +@@ -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); ++public static final boolean gtk_editable_get_editable(long /*int*/ editable) { + lock.lock(); + try { + return _gtk_editable_get_editable(editable); +@@ -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); ++public static final int gtk_editable_get_position(long /*int*/ editable) { + lock.lock(); + try { + return _gtk_editable_get_position(editable); +@@ -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); ++public static final boolean gtk_editable_get_selection_bounds(long /*int*/ editable, int[] start, int[] end) { + lock.lock(); + try { + return _gtk_editable_get_selection_bounds(editable, start, end); +@@ -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); ++public static final void gtk_editable_insert_text(long /*int*/ editable, byte[] new_text, int new_text_length, int[] position) { + lock.lock(); + try { + _gtk_editable_insert_text(editable, new_text, new_text_length, position); +@@ -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); ++public static final void gtk_editable_paste_clipboard(long /*int*/ editable) { + lock.lock(); + try { + _gtk_editable_paste_clipboard(editable); +@@ -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); ++public static final void gtk_editable_select_region(long /*int*/ editable, int start, int end) { + lock.lock(); + try { + _gtk_editable_select_region(editable, start, end); +@@ -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); ++public static final void gtk_editable_set_editable(long /*int*/ entry, boolean editable) { + lock.lock(); + try { + _gtk_editable_set_editable(entry, editable); +@@ -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); ++public static final void gtk_editable_set_position(long /*int*/ editable, int position) { + lock.lock(); + try { + _gtk_editable_set_position(editable, position); +@@ -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); ++public static final char gtk_entry_get_invisible_char(long /*int*/ entry) { + lock.lock(); + try { + return _gtk_entry_get_invisible_char(entry); +@@ -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); ++public static final long /*int*/ gtk_entry_get_layout (long /*int*/ entry) { + lock.lock(); + try { + return _gtk_entry_get_layout(entry); +@@ -6148,8 +6148,8 @@ + } + } + /** @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(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); ++public static final int gtk_entry_text_index_to_layout_index (long /*int*/ entry, int index) { + lock.lock(); + try { + return _gtk_entry_text_index_to_layout_index(entry, index); +@@ -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); ++public static final int gtk_entry_get_max_length(long /*int*/ entry) { + lock.lock(); + try { + return _gtk_entry_get_max_length(entry); +@@ -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); ++public static final long /*int*/ gtk_entry_get_text(long /*int*/ entry) { + lock.lock(); + try { + return _gtk_entry_get_text(entry); +@@ -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); ++public static final boolean FcConfigAppFontAddFile(long /*int*/ config, byte[] file) { + lock.lock(); + try { + return _FcConfigAppFontAddFile(config, file); +@@ -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); ++public static final boolean gtk_entry_get_visibility(long /*int*/ entry) { + lock.lock(); + try { + return _gtk_entry_get_visibility(entry); +@@ -6207,8 +6207,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_entry_new(); +-public static final int /*long*/ gtk_entry_new() { ++public static final native long /*int*/ _gtk_entry_new(); ++public static final long /*int*/ gtk_entry_new() { + lock.lock(); + try { + return _gtk_entry_new(); +@@ -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); ++public static final void gtk_entry_set_activates_default(long /*int*/ entry, boolean setting) { + lock.lock(); + try { + _gtk_entry_set_activates_default(entry, setting); +@@ -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); ++public static final void gtk_entry_set_alignment(long /*int*/ entry, float xalign) { + lock.lock(); + try { + _gtk_entry_set_alignment(entry, xalign); +@@ -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); ++public static final void gtk_entry_set_has_frame(long /*int*/ entry, boolean setting) { + lock.lock(); + try { + _gtk_entry_set_has_frame(entry, setting); +@@ -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); ++public static final void gtk_entry_set_invisible_char(long /*int*/ entry, char ch) { + lock.lock(); + try { + _gtk_entry_set_invisible_char(entry, ch); +@@ -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); ++public static final void gtk_entry_set_max_length(long /*int*/ entry, int max) { + lock.lock(); + try { + _gtk_entry_set_max_length(entry, max); +@@ -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); ++public static final void gtk_entry_set_text(long /*int*/ entry, byte[] text) { + lock.lock(); + try { + _gtk_entry_set_text(entry, text); +@@ -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); ++public static final void gtk_entry_set_visibility(long /*int*/ entry, boolean visible) { + lock.lock(); + try { + _gtk_entry_set_visibility(entry, visible); +@@ -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); ++public static final boolean gtk_expander_get_expanded(long /*int*/ expander) { + lock.lock(); + try { + return _gtk_expander_get_expanded(expander); +@@ -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); ++public static final long /*int*/ gtk_expander_get_label_widget(long /*int*/ expander) { + lock.lock(); + try { + return _gtk_expander_get_label_widget(expander); +@@ -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); ++public static final long /*int*/ gtk_expander_new(byte[] label) { + lock.lock(); + try { + return _gtk_expander_new(label); +@@ -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); ++public static final void gtk_expander_set_expanded(long /*int*/ expander, boolean expanded) { + lock.lock(); + try { + _gtk_expander_set_expanded(expander, expanded); +@@ -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); ++public static final void gtk_expander_set_label(long /*int*/ expander, byte[] label) { + lock.lock(); + try { + _gtk_expander_set_label(expander, label); +@@ -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); ++public static final void gtk_expander_set_label_widget(long /*int*/ expander, long /*int*/ label_widget) { + lock.lock(); + try { + _gtk_expander_set_label_widget(expander, label_widget); +@@ -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); ++public static final void gtk_file_chooser_add_filter(long /*int*/ chooser, long /*int*/ filter) { + lock.lock(); + try { + _gtk_file_chooser_add_filter(chooser, filter); +@@ -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); ++public static final long /*int*/ gtk_file_chooser_dialog_new(byte[] title, long /*int*/ parent, int action, long /*int*/ first_button_text, int first_button_id, long /*int*/ second_button_text, int second_button_id, long /*int*/ terminator) { + 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); +@@ -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); ++public static final long /*int*/ gtk_file_chooser_get_current_folder(long /*int*/ chooser) { + lock.lock(); + try { + return _gtk_file_chooser_get_current_folder(chooser); +@@ -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); ++public static final long /*int*/ gtk_file_chooser_get_filename(long /*int*/ chooser) { + lock.lock(); + try { + return _gtk_file_chooser_get_filename(chooser); +@@ -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); ++public static final long /*int*/ gtk_file_chooser_get_filenames(long /*int*/ chooser) { + lock.lock(); + try { + return _gtk_file_chooser_get_filenames(chooser); +@@ -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); ++public static final long /*int*/ gtk_file_chooser_get_filter(long /*int*/ chooser) { + lock.lock(); + try { + return _gtk_file_chooser_get_filter(chooser); +@@ -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); ++public static final void gtk_file_chooser_set_current_folder(long /*int*/ chooser, long /*int*/ filename) { + lock.lock(); + try { + _gtk_file_chooser_set_current_folder(chooser, filename); +@@ -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); ++public static final void gtk_file_chooser_set_current_name(long /*int*/ chooser, byte[] name) { + lock.lock(); + try { + _gtk_file_chooser_set_current_name(chooser, name); +@@ -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); ++public static final void gtk_file_chooser_set_do_overwrite_confirmation(long /*int*/ chooser, boolean do_overwrite_confirmation) { + lock.lock(); + try { + _gtk_file_chooser_set_do_overwrite_confirmation(chooser, do_overwrite_confirmation); +@@ -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); ++public static final void gtk_file_chooser_set_extra_widget(long /*int*/ chooser, long /*int*/ extra_widget) { + lock.lock(); + try { + _gtk_file_chooser_set_extra_widget(chooser, extra_widget); +@@ -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); ++public static final void gtk_file_chooser_set_filename(long /*int*/ chooser, long /*int*/ name) { + lock.lock(); + try { + _gtk_file_chooser_set_filename(chooser, name); +@@ -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); ++public static final void gtk_file_chooser_set_filter(long /*int*/ chooser, long /*int*/ filter) { + lock.lock(); + try { + _gtk_file_chooser_set_filter(chooser, filter); +@@ -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); ++public static final void gtk_file_chooser_set_select_multiple(long /*int*/ chooser, boolean select_multiple) { + lock.lock(); + try { + _gtk_file_chooser_set_select_multiple(chooser, select_multiple); +@@ -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); ++public static final void gtk_file_filter_add_pattern(long /*int*/ filter, byte[] pattern) { + lock.lock(); + try { + _gtk_file_filter_add_pattern(filter, pattern); +@@ -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(); ++public static final long /*int*/ gtk_file_filter_new() { + lock.lock(); + try { + return _gtk_file_filter_new(); +@@ -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); ++public static final long /*int*/ gtk_file_filter_get_name(long /*int*/ filter) { + lock.lock(); + try { + return _gtk_file_filter_get_name(filter); +@@ -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); ++public static final void gtk_file_filter_set_name(long /*int*/ filter, byte[] name) { + lock.lock(); + try { + _gtk_file_filter_set_name(filter, name); +@@ -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); ++public static final long /*int*/ gtk_file_selection_get_filename(long /*int*/ filesel) { + lock.lock(); + try { + return _gtk_file_selection_get_filename(filesel); +@@ -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); ++public static final long /*int*/ gtk_file_selection_get_selections(long /*int*/ filesel) { + lock.lock(); + try { + return _gtk_file_selection_get_selections(filesel); +@@ -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); ++public static final void gtk_file_selection_hide_fileop_buttons(long /*int*/ filesel) { + lock.lock(); + try { + _gtk_file_selection_hide_fileop_buttons(filesel); +@@ -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); ++public static final long /*int*/ gtk_file_selection_new(byte[] title) { + lock.lock(); + try { + return _gtk_file_selection_new(title); +@@ -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); ++public static final void gtk_file_selection_set_filename(long /*int*/ filesel, long /*int*/ filename) { + lock.lock(); + try { + _gtk_file_selection_set_filename(filesel, filename); +@@ -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); ++public static final void gtk_file_selection_set_select_multiple(long /*int*/ filesel, boolean select_multiple) { + lock.lock(); + try { + _gtk_file_selection_set_select_multiple(filesel, select_multiple); +@@ -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); ++public static final void gtk_fixed_move(long /*int*/ fixed, long /*int*/ widget, int x, int y) { + lock.lock(); + try { + _gtk_fixed_move(fixed, widget, x, y); +@@ -6684,8 +6684,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_fixed_new(); +-public static final int /*long*/ gtk_fixed_new() { ++public static final native long /*int*/ _gtk_fixed_new(); ++public static final long /*int*/ gtk_fixed_new() { + lock.lock(); + try { + return _gtk_fixed_new(); +@@ -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); ++public static final void gtk_fixed_set_has_window(long /*int*/ fixed, boolean has_window) { + lock.lock(); + try { + _gtk_fixed_set_has_window(fixed, has_window); +@@ -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); ++public static final long /*int*/ gtk_font_selection_dialog_get_font_name(long /*int*/ fsd) { + lock.lock(); + try { + return _gtk_font_selection_dialog_get_font_name(fsd); +@@ -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); ++public static final long /*int*/ gtk_font_selection_dialog_new(byte[] title) { + lock.lock(); + try { + return _gtk_font_selection_dialog_new(title); +@@ -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); ++public static final boolean gtk_font_selection_dialog_set_font_name(long /*int*/ fsd, byte[] fontname) { + lock.lock(); + try { + return _gtk_font_selection_dialog_set_font_name(fsd, fontname); +@@ -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); ++public static final long /*int*/ gtk_frame_new(byte[] label) { + lock.lock(); + try { + return _gtk_frame_new(label); +@@ -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); ++public static final long /*int*/ gtk_frame_get_label_widget(long /*int*/ frame) { + lock.lock(); + try { + return _gtk_frame_get_label_widget(frame); +@@ -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); ++public static final void gtk_frame_set_label(long /*int*/ frame, byte[] label) { + lock.lock(); + try { + _gtk_frame_set_label(frame, label); +@@ -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); ++public static final void gtk_frame_set_label_widget(long /*int*/ frame, long /*int*/ label_widget) { + lock.lock(); + try { + _gtk_frame_set_label_widget(frame, label_widget); +@@ -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); ++public static final void gtk_frame_set_shadow_type(long /*int*/ frame, int type) { + lock.lock(); + try { + _gtk_frame_set_shadow_type(frame, type); +@@ -6798,8 +6798,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_get_current_event(); +-public static final int /*long*/ gtk_get_current_event() { ++public static final native long /*int*/ _gtk_get_current_event(); ++public static final long /*int*/ gtk_get_current_event() { + lock.lock(); + try { + return _gtk_get_current_event(); +@@ -6826,8 +6826,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_get_default_language(); +-public static final int /*long*/ gtk_get_default_language() { ++public static final native long /*int*/ _gtk_get_default_language(); ++public static final long /*int*/ gtk_get_default_language() { + lock.lock(); + try { + return _gtk_get_default_language(); +@@ -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); ++public static final long /*int*/ gtk_get_event_widget(long /*int*/ event) { + lock.lock(); + try { + return _gtk_get_event_widget(event); +@@ -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); ++public static final void gtk_grab_add(long /*int*/ widget) { + lock.lock(); + try { + _gtk_grab_add(widget); +@@ -6855,8 +6855,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_grab_get_current(); +-public static final int /*long*/ gtk_grab_get_current() { ++public static final native long /*int*/ _gtk_grab_get_current(); ++public static final long /*int*/ gtk_grab_get_current() { + lock.lock(); + try { + return _gtk_grab_get_current(); +@@ -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); ++public static final void gtk_grab_remove(long /*int*/ widget) { + lock.lock(); + try { + _gtk_grab_remove(widget); +@@ -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); ++public static final long /*int*/ gtk_hbox_new(boolean homogeneous, int spacing) { + lock.lock(); + try { + return _gtk_hbox_new(homogeneous, spacing); +@@ -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); ++public static final long /*int*/ gtk_hscale_new(long /*int*/ adjustment) { + lock.lock(); + try { + return _gtk_hscale_new(adjustment); +@@ -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); ++public static final long /*int*/ gtk_hscrollbar_new(long /*int*/ adjustment) { + lock.lock(); + try { + return _gtk_hscrollbar_new(adjustment); +@@ -6907,8 +6907,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_hseparator_new(); +-public static final int /*long*/ gtk_hseparator_new() { ++public static final native long /*int*/ _gtk_hseparator_new(); ++public static final long /*int*/ gtk_hseparator_new() { + lock.lock(); + try { + return _gtk_hseparator_new(); +@@ -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); ++public static final long /*int*/ gtk_icon_factory_lookup_default(byte[] stock_id) { + lock.lock(); + try { + return _gtk_icon_factory_lookup_default(stock_id); +@@ -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); ++public static final void gtk_icon_source_free(long /*int*/ source) { + lock.lock(); + try { + _gtk_icon_source_free(source); +@@ -6936,8 +6936,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_icon_source_new(); +-public static final int /*long*/ gtk_icon_source_new() { ++public static final native long /*int*/ _gtk_icon_source_new(); ++public static final long /*int*/ gtk_icon_source_new() { + lock.lock(); + try { + return _gtk_icon_source_new(); +@@ -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); ++public static final void gtk_icon_source_set_pixbuf(long /*int*/ source, long /*int*/ pixbuf) { + lock.lock(); + try { + _gtk_icon_source_set_pixbuf(source, pixbuf); +@@ -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); ++public static final 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) { + lock.lock(); + try { + return _gtk_icon_set_render_icon(icon_set, style, direction, state, size, widget, detail); +@@ -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); ++public static final boolean gtk_im_context_filter_keypress(long /*int*/ context, long /*int*/ event) { + lock.lock(); + try { + return _gtk_im_context_filter_keypress(context, event); +@@ -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); ++public static final void gtk_im_context_focus_in(long /*int*/ context) { + lock.lock(); + try { + _gtk_im_context_focus_in(context); +@@ -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); ++public static final void gtk_im_context_focus_out(long /*int*/ context) { + lock.lock(); + try { + _gtk_im_context_focus_out(context); +@@ -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); ++public static final void gtk_im_context_get_preedit_string(long /*int*/ context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) { + lock.lock(); + try { + _gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos); +@@ -7024,8 +7024,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_im_context_get_type(); +-public static final int /*long*/ gtk_im_context_get_type() { ++public static final native long /*int*/ _gtk_im_context_get_type(); ++public static final long /*int*/ gtk_im_context_get_type() { + lock.lock(); + try { + return _gtk_im_context_get_type(); +@@ -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); ++public static final void gtk_im_context_reset(long /*int*/ context) { + lock.lock(); + try { + _gtk_im_context_reset(context); +@@ -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); ++public static final void gtk_im_context_set_client_window(long /*int*/ context, long /*int*/ window) { + lock.lock(); + try { + _gtk_im_context_set_client_window(context, window); +@@ -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); ++public static final void gtk_im_context_set_cursor_location(long /*int*/ context, GdkRectangle area) { + lock.lock(); + try { + _gtk_im_context_set_cursor_location(context, area); +@@ -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); ++public static final void gtk_im_multicontext_append_menuitems (long /*int*/ context, long /*int*/ menushell) { + lock.lock(); + try { + _gtk_im_multicontext_append_menuitems(context, menushell); +@@ -7082,8 +7082,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_im_multicontext_new(); +-public static final int /*long*/ gtk_im_multicontext_new() { ++public static final native long /*int*/ _gtk_im_multicontext_new(); ++public static final long /*int*/ gtk_im_multicontext_new() { + lock.lock(); + try { + return _gtk_im_multicontext_new(); +@@ -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); ++public static final long /*int*/ gtk_image_menu_item_new_with_label(byte[] label) { + lock.lock(); + try { + return _gtk_image_menu_item_new_with_label(label); +@@ -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); ++public static final void gtk_image_menu_item_set_image(long /*int*/ menu_item, long /*int*/ image) { + lock.lock(); + try { + _gtk_image_menu_item_set_image(menu_item, image); +@@ -7114,8 +7114,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_image_new(); +-public static final int /*long*/ gtk_image_new() { ++public static final native long /*int*/ _gtk_image_new(); ++public static final long /*int*/ gtk_image_new() { + lock.lock(); + try { + return _gtk_image_new(); +@@ -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); ++public static final long /*int*/ gtk_image_new_from_pixbuf(long /*int*/ pixbuf) { + lock.lock(); + try { + return _gtk_image_new_from_pixbuf(pixbuf); +@@ -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); ++public static final long /*int*/ gtk_image_new_from_pixmap(long /*int*/ pixmap, long /*int*/ mask) { + lock.lock(); + try { + return _gtk_image_new_from_pixmap(pixmap, mask); +@@ -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); ++public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*int*/ pixbuf) { + lock.lock(); + try { + _gtk_image_set_from_pixbuf(image, pixbuf); +@@ -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); ++public static final void gtk_image_set_from_pixmap(long /*int*/ image, long /*int*/ pixmap, long /*int*/ mask) { + lock.lock(); + try { + _gtk_image_set_from_pixmap(image, pixmap, mask); +@@ -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); ++public static final boolean gtk_init_check(long /*int*/[] argc, long /*int*/[] argv) { + lock.lock(); + try { + return _gtk_init_check(argc, argv); +@@ -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); ++public static final long /*int*/ gtk_label_get_layout(long /*int*/ label) { + lock.lock(); + try { + return _gtk_label_get_layout(label); +@@ -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); ++public static final int gtk_label_get_mnemonic_keyval(long /*int*/ label) { + lock.lock(); + try { + return _gtk_label_get_mnemonic_keyval(label); +@@ -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); ++public static final long /*int*/ gtk_label_new(byte[] label) { + lock.lock(); + try { + return _gtk_label_new(label); +@@ -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); ++public static final long /*int*/ gtk_label_new_with_mnemonic(byte[] str) { + lock.lock(); + try { + return _gtk_label_new_with_mnemonic(str); +@@ -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); ++public static final void gtk_label_set_attributes(long /*int*/ label, long /*int*/ attrs) { + lock.lock(); + try { + _gtk_label_set_attributes(label, attrs); +@@ -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); ++public static final void gtk_label_set_justify(long /*int*/ label, int jtype) { + lock.lock(); + try { + _gtk_label_set_justify(label, jtype); +@@ -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); ++public static final void gtk_label_set_line_wrap(long /*int*/ label, boolean wrap) { + lock.lock(); + try { + _gtk_label_set_line_wrap(label, wrap); +@@ -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); ++public static final void gtk_label_set_line_wrap_mode(long /*int*/ label, int wrap_mode) { + lock.lock(); + try { + _gtk_label_set_line_wrap_mode(label, wrap_mode); +@@ -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); ++public static final void gtk_label_set_text(long /*int*/ label, long /*int*/ str) { + lock.lock(); + try { + _gtk_label_set_text(label, str); +@@ -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); ++public static final void gtk_label_set_text(long /*int*/ label, byte[] str) { + lock.lock(); + try { + _gtk_label_set_text(label, str); +@@ -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); ++public static final void gtk_label_set_text_with_mnemonic(long /*int*/ label, byte[] str) { + lock.lock(); + try { + _gtk_label_set_text_with_mnemonic(label, str); +@@ -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); ++public static final void gtk_list_append_items(long /*int*/ list, long /*int*/ items) { + lock.lock(); + try { + _gtk_list_append_items(list, items); +@@ -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); ++public static final void gtk_list_clear_items(long /*int*/ list, int start, int end) { + lock.lock(); + try { + _gtk_list_clear_items(list, start, end); +@@ -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); ++public static final void gtk_list_insert_items(long /*int*/ list, long /*int*/ items, int position) { + lock.lock(); + try { + _gtk_list_insert_items(list, items, position); +@@ -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); ++public static final long /*int*/ gtk_list_item_new_with_label(byte[] label) { + lock.lock(); + try { + return _gtk_list_item_new_with_label(label); +@@ -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); ++public static final void gtk_list_remove_items(long /*int*/ list, long /*int*/ items) { + lock.lock(); + try { + _gtk_list_remove_items(list, items); +@@ -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); ++public static final void gtk_list_select_item(long /*int*/ list, int item) { + lock.lock(); + try { + _gtk_list_select_item(list, item); +@@ -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); ++public static final void gtk_list_unselect_all(long /*int*/ list) { + lock.lock(); + try { + _gtk_list_unselect_all(list); +@@ -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); ++public static final void gtk_list_unselect_item(long /*int*/ list, int item) { + lock.lock(); + try { + _gtk_list_unselect_item(list, item); +@@ -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); ++public static final void gtk_list_store_append(long /*int*/ list_store, long /*int*/ iter) { + lock.lock(); + try { + _gtk_list_store_append(list_store, iter); +@@ -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); ++public static final void gtk_list_store_clear(long /*int*/ store) { + lock.lock(); + try { + _gtk_list_store_clear(store); +@@ -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); ++public static final void gtk_list_store_insert(long /*int*/ list_store, long /*int*/ iter, int position) { + lock.lock(); + try { + _gtk_list_store_insert(list_store, iter, position); +@@ -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); ++public static final long /*int*/ gtk_list_store_newv(int numColumns, long /*int*/[] types) { + lock.lock(); + try { + return _gtk_list_store_newv(numColumns, types); +@@ -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); ++public static final void gtk_list_store_remove(long /*int*/ list_store, long /*int*/ iter) { + lock.lock(); + try { + _gtk_list_store_remove(list_store, iter); +@@ -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); ++public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, byte[] value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_list_store_set(store, iter, column, value, terminator); +@@ -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); ++public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, int value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_list_store_set(store, iter, column, value, terminator); +@@ -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); ++public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, long value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_list_store_set(store, iter, column, value, terminator); +@@ -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); ++public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, GdkColor value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_list_store_set(store, iter, column, value, terminator); +@@ -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); ++public static final void gtk_list_store_set(long /*int*/ store, long /*int*/ iter, int column, boolean value, long /*int*/ terminator) { + lock.lock(); + try { + _gtk_list_store_set(store, iter, column, value, terminator); +@@ -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); ++public static final void gtk_main_do_event(long /*int*/ event) { + lock.lock(); + try { + _gtk_main_do_event(event); +@@ -7590,8 +7590,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_menu_bar_new(); +-public static final int /*long*/ gtk_menu_bar_new() { ++public static final native long /*int*/ _gtk_menu_bar_new(); ++public static final long /*int*/ gtk_menu_bar_new() { + lock.lock(); + try { + return _gtk_menu_bar_new(); +@@ -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); ++public static final void gtk_menu_item_remove_submenu(long /*int*/ menu_item) { + lock.lock(); + try { + _gtk_menu_item_remove_submenu(menu_item); +@@ -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); ++public static final long /*int*/ gtk_menu_item_get_submenu(long /*int*/ menu_item) { + lock.lock(); + try { + return _gtk_menu_item_get_submenu(menu_item); +@@ -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); ++public static final void gtk_menu_item_set_submenu(long /*int*/ menu_item, long /*int*/ submenu) { + lock.lock(); + try { + _gtk_menu_item_set_submenu(menu_item, submenu); +@@ -7642,8 +7642,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_menu_new(); +-public static final int /*long*/ gtk_menu_new() { ++public static final native long /*int*/ _gtk_menu_new(); ++public static final long /*int*/ gtk_menu_new() { + lock.lock(); + try { + return _gtk_menu_new(); +@@ -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); ++public static final void gtk_menu_popdown(long /*int*/ menu) { + lock.lock(); + try { + _gtk_menu_popdown(menu); +@@ -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); ++public static final void gtk_menu_popup(long /*int*/ menu, long /*int*/ parent_menu_shell, long /*int*/ parent_menu_item, long /*int*/ func, long /*int*/ data, int button, int activate_time) { + lock.lock(); + try { + _gtk_menu_popup(menu, parent_menu_shell, parent_menu_item, func, data, button, activate_time); +@@ -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); ++public static final void gtk_menu_shell_deactivate(long /*int*/ menu_shell) { + lock.lock(); + try { + _gtk_menu_shell_deactivate(menu_shell); +@@ -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); ++public static final void gtk_menu_shell_insert(long /*int*/ menu_shell, long /*int*/ child, int position) { + lock.lock(); + try { + _gtk_menu_shell_insert(menu_shell, child, position); +@@ -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); ++public static final void gtk_menu_shell_select_item(long /*int*/ menu_shell, long /*int*/ menu_item) { + lock.lock(); + try { + _gtk_menu_shell_select_item(menu_shell, menu_item); +@@ -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); ++public static final void gtk_menu_shell_set_take_focus(long /*int*/ menu_shell, boolean take_focus) { + lock.lock(); + try { + _gtk_menu_shell_set_take_focus(menu_shell, take_focus); +@@ -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); ++public static final long /*int*/ gtk_message_dialog_new(long /*int*/ parent, int flags, int type, int buttons, byte[] message_format) { + lock.lock(); + try { + return _gtk_message_dialog_new(parent, flags, type, buttons, message_format); +@@ -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); ++public static final void gtk_misc_set_alignment(long /*int*/ misc, float xalign, float yalign) { + lock.lock(); + try { + _gtk_misc_set_alignment(misc, xalign, yalign); +@@ -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); ++public static final int gtk_notebook_get_current_page(long /*int*/ notebook) { + lock.lock(); + try { + return _gtk_notebook_get_current_page(notebook); +@@ -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); ++public static final boolean gtk_notebook_get_scrollable(long /*int*/ notebook) { + lock.lock(); + try { + return _gtk_notebook_get_scrollable(notebook); +@@ -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); ++public static final void gtk_notebook_insert_page(long /*int*/ notebook, long /*int*/ child, long /*int*/ tab_label, int position) { + lock.lock(); + try { + _gtk_notebook_insert_page(notebook, child, tab_label, position); +@@ -7795,8 +7795,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_notebook_new(); +-public static final int /*long*/ gtk_notebook_new() { ++public static final native long /*int*/ _gtk_notebook_new(); ++public static final long /*int*/ gtk_notebook_new() { + lock.lock(); + try { + return _gtk_notebook_new(); +@@ -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); ++public static final void gtk_notebook_next_page(long /*int*/ notebook) { + lock.lock(); + try { + _gtk_notebook_next_page(notebook); +@@ -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); ++public static final void gtk_notebook_prev_page(long /*int*/ notebook) { + lock.lock(); + try { + _gtk_notebook_prev_page(notebook); +@@ -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); ++public static final void gtk_notebook_remove_page(long /*int*/ notebook, int page_num) { + lock.lock(); + try { + _gtk_notebook_remove_page(notebook, page_num); +@@ -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); ++public static final void gtk_notebook_set_current_page(long /*int*/ notebook, int page_num) { + lock.lock(); + try { + _gtk_notebook_set_current_page(notebook, page_num); +@@ -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); ++public static final void gtk_notebook_set_scrollable(long /*int*/ notebook, boolean scrollable) { + lock.lock(); + try { + _gtk_notebook_set_scrollable(notebook, scrollable); +@@ -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); ++public static final void gtk_notebook_set_show_tabs(long /*int*/ notebook, boolean show_tabs) { + lock.lock(); + try { + _gtk_notebook_set_show_tabs(notebook, show_tabs); +@@ -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); ++public static final void gtk_notebook_set_tab_pos(long /*int*/ notebook, int pos) { + lock.lock(); + try { + _gtk_notebook_set_tab_pos(notebook, pos); +@@ -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); ++public static final void gtk_object_sink(long /*int*/ object) { + lock.lock(); + try { + _gtk_object_sink(object); +@@ -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 (); ++public static final long /*int*/ gtk_page_setup_new () { + lock.lock(); + try { + return _gtk_page_setup_new (); +@@ -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); ++public static final int gtk_page_setup_get_orientation(long /*int*/ setup) { + lock.lock(); + try { + return _gtk_page_setup_get_orientation(setup); +@@ -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); ++public static final void gtk_page_setup_set_orientation(long /*int*/ setup, int orientation) { + lock.lock(); + try { + _gtk_page_setup_set_orientation(setup, orientation); +@@ -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); ++public static final long /*int*/ gtk_page_setup_get_paper_size(long /*int*/ setup) { + lock.lock(); + try { + return _gtk_page_setup_get_paper_size(setup); +@@ -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); ++public static final void gtk_page_setup_set_paper_size(long /*int*/ setup, long /*int*/ size) { + lock.lock(); + try { + _gtk_page_setup_set_paper_size(setup, size); +@@ -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); ++public static final double gtk_page_setup_get_top_margin(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_top_margin(setup, unit); +@@ -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); ++public static final void gtk_page_setup_set_top_margin(long /*int*/ setup, double margin, int unit) { + lock.lock(); + try { + _gtk_page_setup_set_top_margin(setup, margin, unit); +@@ -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); ++public static final double gtk_page_setup_get_bottom_margin(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_bottom_margin(setup, unit); +@@ -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); ++public static final void gtk_page_setup_set_bottom_margin(long /*int*/ setup, double margin, int unit) { + lock.lock(); + try { + _gtk_page_setup_set_bottom_margin(setup, margin, unit); +@@ -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); ++public static final double gtk_page_setup_get_left_margin(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_left_margin(setup, unit); +@@ -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); ++public static final void gtk_page_setup_set_left_margin(long /*int*/ setup, double margin, int unit) { + lock.lock(); + try { + _gtk_page_setup_set_left_margin(setup, margin, unit); +@@ -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); ++public static final double gtk_page_setup_get_right_margin(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_right_margin(setup, unit); +@@ -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); ++public static final void gtk_page_setup_set_right_margin(long /*int*/ setup, double margin, int unit) { + lock.lock(); + try { + _gtk_page_setup_set_right_margin(setup, margin, unit); +@@ -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); ++public static final double gtk_page_setup_get_paper_width(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_paper_width(setup, unit); +@@ -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); ++public static final double gtk_page_setup_get_paper_height(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_paper_height(setup, unit); +@@ -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); ++public static final double gtk_page_setup_get_page_width(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_page_width(setup, unit); +@@ -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); ++public static final double gtk_page_setup_get_page_height(long /*int*/ setup, int unit) { + lock.lock(); + try { + return _gtk_page_setup_get_page_height(setup, unit); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_handle(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_flat_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_focus(style, window, state_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_option(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_slider(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_tab(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_arrow(style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + 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); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_check(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_expander(style, window, state_type, area, widget, detail, x, y, expander_style); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_extension(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_hline(style, window, state_type, area, widget, detail, x1, x2, y); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_layout(style, window, state_type, use_text, area, widget, detail, x, y, layout); +@@ -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); ++public static final 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) { + 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); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_shadow(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); +@@ -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); ++public static final 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) { + lock.lock(); + try { + _gtk_paint_vline(style, window, state_type, area, widget, detail, y1, y2, x); +@@ -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); ++public static final void gtk_paper_size_free(long /*int*/ size) { + lock.lock(); + try { + _gtk_paper_size_free(size); +@@ -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); ++public static final long /*int*/ gtk_paper_size_new(byte [] name) { + lock.lock(); + try { + return _gtk_paper_size_new(name); +@@ -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); ++public static final long /*int*/ gtk_paper_size_new_from_ppd(byte [] ppd_name, byte [] ppd_display_name, double width, double height) { + lock.lock(); + try { + return _gtk_paper_size_new_from_ppd(ppd_name, ppd_display_name, width, height); +@@ -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); ++public static final long /*int*/ gtk_paper_size_new_custom(byte [] name, byte [] display_name, double width, double height, int unit) { + lock.lock(); + try { + return _gtk_paper_size_new_custom(name, display_name, width, height, unit); +@@ -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); ++public static final long /*int*/ gtk_paper_size_get_name(long /*int*/ size) { + lock.lock(); + try { + return _gtk_paper_size_get_name(size); +@@ -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); ++public static final long /*int*/ gtk_paper_size_get_display_name(long /*int*/ size) { + lock.lock(); + try { + return _gtk_paper_size_get_display_name(size); +@@ -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); ++public static final long /*int*/ gtk_paper_size_get_ppd_name(long /*int*/ size) { + lock.lock(); + try { + return _gtk_paper_size_get_ppd_name(size); +@@ -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); ++public static final double gtk_paper_size_get_width(long /*int*/ size, int unit) { + lock.lock(); + try { + return _gtk_paper_size_get_width(size, unit); +@@ -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); ++public static final double gtk_paper_size_get_height(long /*int*/ size, int unit) { + lock.lock(); + try { + return _gtk_paper_size_get_height(size, unit); +@@ -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); ++public static final boolean gtk_paper_size_is_custom(long /*int*/ size) { + lock.lock(); + try { + return _gtk_paper_size_is_custom(size); +@@ -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); ++public static final long /*int*/ gtk_plug_get_id(long /*int*/ plug) { + lock.lock(); + try { + return _gtk_plug_get_id(plug); +@@ -8438,8 +8438,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_plug_new(int /*long*/ socket_id); +-public static final int /*long*/ gtk_plug_new(int /*long*/ socket_id) { ++public static final native long /*int*/ _gtk_plug_new(long /*int*/ socket_id); ++public static final long /*int*/ gtk_plug_new(long /*int*/ socket_id) { + lock.lock(); + try { + return _gtk_plug_new(socket_id); +@@ -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); ++public static final long /*int*/ gtk_printer_get_backend(long /*int*/ printer) { + lock.lock(); + try { + return _gtk_printer_get_backend(printer); +@@ -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); ++public static final long /*int*/ gtk_printer_get_name(long /*int*/ printer) { + lock.lock(); + try { + return _gtk_printer_get_name(printer); +@@ -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); ++public static final boolean gtk_printer_is_default(long /*int*/ printer) { + lock.lock(); + try { + return _gtk_printer_is_default(printer); +@@ -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); ++public static final void gtk_enumerate_printers(long /*int*/ func, long /*int*/data, long /*int*/ destroy, boolean wait) { + lock.lock(); + try { + _gtk_enumerate_printers(func, data, destroy, wait); +@@ -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); ++public static final long /*int*/ gtk_print_job_new(byte[] title, long /*int*/ printer, long /*int*/ settings, long /*int*/ page_setup) { + lock.lock(); + try { + return _gtk_print_job_new(title, printer, settings, page_setup); +@@ -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); ++public static final long /*int*/ gtk_print_job_get_settings(long /*int*/ job) { + lock.lock(); + try { + return _gtk_print_job_get_settings(job); +@@ -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); ++public static final long /*int*/ gtk_print_job_get_printer(long /*int*/ job) { + lock.lock(); + try { + return _gtk_print_job_get_printer(job); +@@ -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); ++public static final long /*int*/ gtk_print_job_get_title(long /*int*/ job) { + lock.lock(); + try { + return _gtk_print_job_get_title(job); +@@ -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); ++public static final int gtk_print_job_get_status(long /*int*/ job) { + lock.lock(); + try { + return _gtk_print_job_get_status(job); +@@ -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[]); ++public static final boolean gtk_print_job_set_source_file(long /*int*/ job, byte[] filename, long /*int*/ error[]) { + lock.lock(); + try { + return _gtk_print_job_set_source_file(job, filename, error); +@@ -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[]); ++public static final long /*int*/ gtk_print_job_get_surface(long /*int*/ job, long /*int*/ error[]) { + lock.lock(); + try { + return _gtk_print_job_get_surface(job, error); +@@ -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); ++public static final void gtk_print_job_send(long /*int*/ job, long /*int*/ callback, long /*int*/ user_data, long /*int*/ dnotify) { + lock.lock(); + try { + _gtk_print_job_send(job, callback, user_data, dnotify); +@@ -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(); ++public static final long /*int*/ gtk_print_settings_new() { + lock.lock(); + try { + return _gtk_print_settings_new(); +@@ -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); ++public static final void gtk_print_settings_foreach(long /*int*/ settings, long /*int*/ func, long /*int*/ data) { + lock.lock(); + try { + _gtk_print_settings_foreach(settings, func, data); +@@ -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); ++public static final long /*int*/ gtk_print_settings_get(long /*int*/ settings, byte [] key) { + lock.lock(); + try { + return _gtk_print_settings_get(settings, key); +@@ -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); ++public static final void gtk_print_settings_set(long /*int*/ settings, byte [] key, byte [] value) { + lock.lock(); + try { + _gtk_print_settings_set(settings, key, value); +@@ -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); ++public static final long /*int*/ gtk_print_settings_get_printer(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_printer(settings); +@@ -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); ++public static final void gtk_print_settings_set_printer(long /*int*/ settings, byte[] printer) { + lock.lock(); + try { + _gtk_print_settings_set_printer(settings, printer); +@@ -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); ++public static final int gtk_print_settings_get_orientation(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_orientation(settings); +@@ -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); ++public static final void gtk_print_settings_set_orientation(long /*int*/ settings, int orientation) { + lock.lock(); + try { + _gtk_print_settings_set_orientation(settings, orientation); +@@ -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); ++public static final boolean gtk_print_settings_get_collate(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_collate(settings); +@@ -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); ++public static final void gtk_print_settings_set_collate(long /*int*/ settings, boolean collate) { + lock.lock(); + try { + _gtk_print_settings_set_collate(settings, collate); +@@ -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); ++public static final int gtk_print_settings_get_n_copies(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_n_copies(settings); +@@ -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); ++public static final void gtk_print_settings_set_n_copies(long /*int*/ settings, int num_copies) { + lock.lock(); + try { + _gtk_print_settings_set_n_copies(settings, num_copies); +@@ -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); ++public static final int gtk_print_settings_get_print_pages(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_print_pages(settings); +@@ -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); ++public static final void gtk_print_settings_set_print_pages(long /*int*/ settings, int pages) { + lock.lock(); + try { + _gtk_print_settings_set_print_pages(settings, pages); +@@ -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); ++public static final long /*int*/ gtk_print_settings_get_page_ranges(long /*int*/ settings, int[] num_ranges) { + lock.lock(); + try { + return _gtk_print_settings_get_page_ranges(settings, num_ranges); +@@ -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); ++public static final void gtk_print_settings_set_page_ranges(long /*int*/ settings, int[] page_ranges, int num_ranges) { + lock.lock(); + try { + _gtk_print_settings_set_page_ranges(settings, page_ranges, num_ranges); +@@ -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); ++public static final double gtk_print_settings_get_paper_width(long /*int*/ settings, int unit) { + lock.lock(); + try { + return _gtk_print_settings_get_paper_width(settings, unit); +@@ -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); ++public static final double gtk_print_settings_get_paper_height(long /*int*/ settings, int unit) { + lock.lock(); + try { + return _gtk_print_settings_get_paper_height(settings, unit); +@@ -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); ++public static final int gtk_print_settings_get_resolution(long /*int*/ settings) { + lock.lock(); + try { + return _gtk_print_settings_get_resolution(settings); +@@ -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); ++public static final long /*int*/ gtk_print_unix_dialog_new(byte[] title, long /*int*/ parent) { + lock.lock(); + try { + return _gtk_print_unix_dialog_new(title, parent); +@@ -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); ++public static final void gtk_print_unix_dialog_set_page_setup(long /*int*/ dialog, long /*int*/ page_setup) { + lock.lock(); + try { + _gtk_print_unix_dialog_set_page_setup(dialog, page_setup); +@@ -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); ++public static final long /*int*/ gtk_print_unix_dialog_get_page_setup(long /*int*/ dialog) { + lock.lock(); + try { + return _gtk_print_unix_dialog_get_page_setup(dialog); +@@ -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); ++public static final void gtk_print_unix_dialog_set_current_page(long /*int*/ dialog, int current_page) { + lock.lock(); + try { + _gtk_print_unix_dialog_set_current_page(dialog, current_page); +@@ -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); ++public static final int gtk_print_unix_dialog_get_current_page(long /*int*/ dialog) { + lock.lock(); + try { + return _gtk_print_unix_dialog_get_current_page(dialog); +@@ -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); ++public static final void gtk_print_unix_dialog_set_settings(long /*int*/ dialog, long /*int*/ settings) { + lock.lock(); + try { + _gtk_print_unix_dialog_set_settings(dialog, settings); +@@ -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); ++public static final long /*int*/ gtk_print_unix_dialog_get_settings(long /*int*/ dialog) { + lock.lock(); + try { + return _gtk_print_unix_dialog_get_settings(dialog); +@@ -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); ++public static final long /*int*/ gtk_print_unix_dialog_get_selected_printer(long /*int*/ dialog) { + lock.lock(); + try { + return _gtk_print_unix_dialog_get_selected_printer(dialog); +@@ -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); ++public static final void gtk_print_unix_dialog_set_manual_capabilities(long /*int*/ dialog, long /*int*/ capabilities) { + lock.lock(); + try { + _gtk_print_unix_dialog_set_manual_capabilities(dialog, capabilities); +@@ -8895,8 +8895,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_progress_bar_new(); +-public static final int /*long*/ gtk_progress_bar_new() { ++public static final native long /*int*/ _gtk_progress_bar_new(); ++public static final long /*int*/ gtk_progress_bar_new() { + lock.lock(); + try { + return _gtk_progress_bar_new(); +@@ -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); ++public static final void gtk_progress_bar_pulse(long /*int*/ pbar) { + lock.lock(); + try { + _gtk_progress_bar_pulse(pbar); +@@ -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); ++public static final void gtk_progress_bar_set_fraction(long /*int*/ pbar, double fraction) { + lock.lock(); + try { + _gtk_progress_bar_set_fraction(pbar, fraction); +@@ -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); ++public static final void gtk_progress_bar_set_orientation(long /*int*/ pbar, int orientation) { + lock.lock(); + try { + _gtk_progress_bar_set_orientation(pbar, orientation); +@@ -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); ++public static final long /*int*/ gtk_radio_button_get_group(long /*int*/ radio_button) { + lock.lock(); + try { + return _gtk_radio_button_get_group(radio_button); +@@ -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); ++public static final long /*int*/ gtk_radio_button_new(long /*int*/ group) { + lock.lock(); + try { + return _gtk_radio_button_new(group); +@@ -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); ++public static final long /*int*/ gtk_radio_menu_item_get_group(long /*int*/ radio_menu_item) { + lock.lock(); + try { + return _gtk_radio_menu_item_get_group(radio_menu_item); +@@ -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); ++public static final long /*int*/ gtk_radio_menu_item_new(long /*int*/ group) { + lock.lock(); + try { + return _gtk_radio_menu_item_new(group); +@@ -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); ++public static final long /*int*/ gtk_radio_menu_item_new_with_label(long /*int*/ group, byte[] label) { + lock.lock(); + try { + return _gtk_radio_menu_item_new_with_label(group, label); +@@ -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); ++public static final long /*int*/ gtk_range_get_adjustment(long /*int*/ range) { + lock.lock(); + try { + return _gtk_range_get_adjustment(range); +@@ -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); ++public static final void gtk_range_set_increments(long /*int*/ range, double step, double page) { + lock.lock(); + try { + _gtk_range_set_increments(range, step, page); +@@ -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); ++public static final void gtk_range_set_inverted(long /*int*/ range, boolean setting) { + lock.lock(); + try { + _gtk_range_set_inverted(range, setting); +@@ -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); ++public static final void gtk_range_set_range(long /*int*/ range, double min, double max) { + lock.lock(); + try { + _gtk_range_set_range(range, min, max); +@@ -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); ++public static final void gtk_range_set_value(long /*int*/ range, double value) { + lock.lock(); + try { + _gtk_range_set_value(range, value); +@@ -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); ++public static final long /*int*/ gtk_rc_style_get_bg_pixmap_name(long /*int*/ style, int index) { + lock.lock(); + try { + return _gtk_rc_style_get_bg_pixmap_name(style, index); +@@ -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); ++public static final int gtk_rc_style_get_color_flags(long /*int*/ style, int index) { + lock.lock(); + try { + return _gtk_rc_style_get_color_flags(style, index); +@@ -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); ++public static final void gtk_rc_style_set_bg(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_rc_style_set_bg(style, index, color); +@@ -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); ++public static final void gtk_rc_style_set_bg_pixmap_name(long /*int*/ style, int index, long /*int*/ name) { + lock.lock(); + try { + _gtk_rc_style_set_bg_pixmap_name(style, index, name); +@@ -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); ++public static final void gtk_rc_style_set_color_flags(long /*int*/ style, int index, int flag) { + lock.lock(); + try { + _gtk_rc_style_set_color_flags(style, index, flag); +@@ -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); ++public static final void gtk_scale_set_digits(long /*int*/ scale, int digits) { + lock.lock(); + try { + _gtk_scale_set_digits(scale, digits); +@@ -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); ++public static final void gtk_scale_set_draw_value(long /*int*/ scale, boolean draw_value) { + lock.lock(); + try { + _gtk_scale_set_draw_value(scale, draw_value); +@@ -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); ++public static final void gtk_rc_style_set_fg(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_rc_style_set_fg(style, index, color); +@@ -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); ++public static final void gtk_rc_style_set_text(long /*int*/ style, int index, GdkColor color) { + lock.lock(); + try { + _gtk_rc_style_set_text(style, index, color); +@@ -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); ++public static final void gtk_scrolled_window_add_with_viewport(long /*int*/ scrolled_window, long /*int*/ child) { + lock.lock(); + try { + _gtk_scrolled_window_add_with_viewport(scrolled_window, child); +@@ -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); ++public static final long /*int*/ gtk_scrolled_window_get_hadjustment(long /*int*/ scrolled_window) { + lock.lock(); + try { + return _gtk_scrolled_window_get_hadjustment(scrolled_window); +@@ -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); ++public static final void gtk_scrolled_window_get_policy(long /*int*/ scrolled_window, int[] hscrollbar_policy, int[] vscrollbar_policy) { + lock.lock(); + try { + _gtk_scrolled_window_get_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy); +@@ -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); ++public static final int gtk_scrolled_window_get_shadow_type(long /*int*/ scrolled_window) { + lock.lock(); + try { + return _gtk_scrolled_window_get_shadow_type(scrolled_window); +@@ -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); ++public static final long /*int*/ gtk_scrolled_window_get_vadjustment(long /*int*/ scrolled_window) { + lock.lock(); + try { + return _gtk_scrolled_window_get_vadjustment(scrolled_window); +@@ -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); ++public static final long /*int*/ gtk_scrolled_window_new(long /*int*/ hadjustment, long /*int*/ vadjustment) { + lock.lock(); + try { + return _gtk_scrolled_window_new(hadjustment, vadjustment); +@@ -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); ++public static final void gtk_scrolled_window_set_placement(long /*int*/ scrolled_window, int placement) { + lock.lock(); + try { + _gtk_scrolled_window_set_placement(scrolled_window, placement); +@@ -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); ++public static final void gtk_scrolled_window_set_policy(long /*int*/ scrolled_window, int hscrollbar_policy, int vscrollbar_policy) { + lock.lock(); + try { + _gtk_scrolled_window_set_policy(scrolled_window, hscrollbar_policy, vscrollbar_policy); +@@ -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); ++public static final void gtk_scrolled_window_set_shadow_type(long /*int*/ scrolled_window, int type) { + lock.lock(); + try { + _gtk_scrolled_window_set_shadow_type(scrolled_window, type); +@@ -9271,8 +9271,8 @@ + lock.unlock(); + } + } +-public static final native int /*long*/ _gtk_settings_get_default(); +-public static final int /*long*/ gtk_settings_get_default() { ++public static final native long /*int*/ _gtk_settings_get_default(); ++public static final long /*int*/ gtk_settings_get_default() { + lock.lock(); + try { + return _gtk_settings_get_default(); +@@ -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); ++public static final void gtk_selection_data_free(long /*int*/ selection_data) { + lock.lock(); + try { + _gtk_selection_data_free(selection_data); +@@ -9297,8 +9297,8 @@ + * @para